summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2017-02-10 19:46:27 +0100
committerPacho Ramos <pacho@gentoo.org>2017-02-10 19:47:02 +0100
commit69362244e4a27aac1dcaf952e42f2bfac778a23e (patch)
treeefa8d97de0a65298907b5bf8b39071f2501ee509 /net-libs/libproxy
parentnet-libs/libproxy: Don't rdepend on old webkit-gtk automagically (#596194 by ... (diff)
downloadgentoo-69362244e4a27aac1dcaf952e42f2bfac778a23e.tar.gz
gentoo-69362244e4a27aac1dcaf952e42f2bfac778a23e.tar.bz2
gentoo-69362244e4a27aac1dcaf952e42f2bfac778a23e.zip
net-libs/libproxy: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-libs/libproxy')
-rw-r--r--net-libs/libproxy/Manifest1
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.11-macosx.patch86
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.11-mozjs.pc.patch23
-rw-r--r--net-libs/libproxy/libproxy-0.4.11-r2.ebuild94
4 files changed, 0 insertions, 204 deletions
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index ef970e3876b5..e7803f596c6d 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,2 +1 @@
-DIST libproxy-0.4.11.tar.gz 93757 SHA256 dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b SHA512 563a837946a73c41e0773cec93332c6308245c0b807a40a0fb052c2445deae4a117ba2780a350c799717fd11c4dbe410183a38ea050a4f04db0b1adcb6f9ad98 WHIRLPOOL 2165fcb9a43592e1112539ff7fdd79963fc6c00821edb5d5f04d92d7d1bd884362019a2a2cd12cb412dfaee25ad8e1554a568e9818910861000666bfe81ca479
DIST libproxy-0.4.13.tar.gz 89296 SHA256 d610bc0ef81a18ba418d759c5f4f87bf7102229a9153fb397d7d490987330ffd SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42 WHIRLPOOL 1b159efd7e03505c8fd7098a553ba22099cf90002730c3a6c929dbfecb95af3c175aebb93502e4286c66604f75a01d4205cd311144a97f51d425ef69f4345370
diff --git a/net-libs/libproxy/files/libproxy-0.4.11-macosx.patch b/net-libs/libproxy/files/libproxy-0.4.11-macosx.patch
deleted file mode 100644
index 09558e3c4d76..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.11-macosx.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://trac.macports.org/browser/trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff
-
-diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk
---- libproxy/cmake.orig/libproxy.cmk 2012-10-02 07:20:40.000000000 -0700
-+++ libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.000000000 -0700
-@@ -18,7 +18,7 @@
- set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
- PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
- # When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings.
--set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
-+set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1)
- set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
- install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
- install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR})
-diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk
---- libproxy/cmake.orig/modules/config_envvar.cmk 2010-06-14 10:40:47.000000000 -0700
-+++ libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.000000000 -0700
-@@ -1,3 +1,3 @@
--if (NOT WIN32 AND NOT APPLE)
-+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
- set(ENVVAR_FOUND 1)
--endif()
-\ No newline at end of file
-+endif()
-diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk
---- libproxy/cmake.orig/modules/config_gnome.cmk 2012-10-02 07:20:40.000000000 -0700
-+++ libproxy/cmake/modules/config_gnome.cmk 2012-10-19 13:45:42.000000000 -0700
-@@ -1,4 +1,4 @@
--if (NOT WIN32 AND NOT APPLE)
-+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
- option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF)
- option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON)
- if(WITH_GNOME3)
-diff -ur libproxy/cmake.orig/modules/config_kde4.cmk libproxy/cmake/modules/config_kde4.cmk
---- libproxy/cmake.orig/modules/config_kde4.cmk 2010-06-14 10:40:47.000000000 -0700
-+++ libproxy/cmake/modules/config_kde4.cmk 2012-10-19 13:45:42.000000000 -0700
-@@ -1,4 +1,4 @@
--if (NOT WIN32 AND NOT APPLE)
-+if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
- option(WITH_KDE4 "Search for KDE4 package" ON)
- if (WITH_KDE4)
- find_package(KDE4)
-@@ -16,4 +16,4 @@
- else()
- set(KDE4_FOUND 0)
- endif()
--endif()
-\ No newline at end of file
-+endif()
-diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk
---- libproxy/cmake.orig/modules/config_macosx.cmk 2010-06-14 10:40:47.000000000 -0700
-+++ libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.000000000 -0700
-@@ -1,4 +1,4 @@
--if(APPLE)
-+if(APPLE AND MP_MACOSX)
- find_library(SC_LIBRARIES SystemConfiguration)
- find_library(CF_LIBRARIES CoreFoundation)
- if(SC_LIBRARIES)
-@@ -7,4 +7,4 @@
- if(CF_LIBRARIES)
- set(CF_FOUND 1)
- endif()
--endif()
-\ No newline at end of file
-+endif()
-diff -ur libproxy/cmake.orig/modules/pacrunner_webkit.cmk libproxy/cmake/modules/pacrunner_webkit.cmk
---- libproxy/cmake.orig/modules/pacrunner_webkit.cmk 2012-10-02 07:20:40.000000000 -0700
-+++ libproxy/cmake/modules/pacrunner_webkit.cmk 2012-10-19 13:45:42.000000000 -0700
-@@ -6,7 +6,7 @@
- link_directories(WEBKIT_LIBRARIES)
- include_directories("${WEBKIT_INCLUDE_DIR}")
- endif()
--elseif(APPLE)
-+elseif(APPLE AND MP_MACOSX)
- find_library(WEBKIT_LIBRARIES JavaScriptCore)
- if(WEBKIT_LIBRARIES)
- set(WEBKIT_FOUND 1)
-diff -ur libproxy/cmake.orig/pkgconfig.cmk libproxy/cmake/pkgconfig.cmk
---- libproxy/cmake.orig/pkgconfig.cmk 2012-10-02 07:20:40.000000000 -0700
-+++ libproxy/cmake/pkgconfig.cmk 2012-10-19 13:45:42.000000000 -0700
-@@ -1,4 +1,4 @@
--if(NOT WIN32 AND NOT APPLE)
-+if(NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
- find_package(PkgConfig)
-
- # Define our magical px_check_modules function
diff --git a/net-libs/libproxy/files/libproxy-0.4.11-mozjs.pc.patch b/net-libs/libproxy/files/libproxy-0.4.11-mozjs.pc.patch
deleted file mode 100644
index 8d8d21e65136..000000000000
--- a/net-libs/libproxy/files/libproxy-0.4.11-mozjs.pc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- libproxy-0.4.11/libproxy/cmake/modules/pacrunner_mozjs.cmk.orig 2011-06-20 04:31:41.000000000 -0600
-+++ libproxy-0.4.11/libproxy/cmake/modules/pacrunner_mozjs.cmk 2013-03-24 19:20:17.910765954 -0600
-@@ -9,12 +9,18 @@
- elseif(NOT APPLE)
- option(WITH_MOZJS "Search for MOZJS package" ON)
- if (WITH_MOZJS)
-- pkg_search_module(MOZJS mozjs185>=1.8.5)
-+ pkg_search_module(MOZJS mozjs187)
- if(MOZJS_FOUND)
- include_directories(${MOZJS_INCLUDE_DIRS})
- link_directories(${MOZJS_LIBRARY_DIRS})
- else()
-- set(MOZJS_FOUND 0)
-+ pkg_search_module(MOZJS mozjs185)
-+ if(MOZJS_FOUND)
-+ include_directories(${MOZJS_INCLUDE_DIRS})
-+ link_directories(${MOZJS_LIBRARY_DIRS})
-+ else()
-+ set(MOZJS_FOUND 0)
-+ endif()
- endif()
- else()
- set(MOZJS_FOUND 0)
diff --git a/net-libs/libproxy/libproxy-0.4.11-r2.ebuild b/net-libs/libproxy/libproxy-0.4.11-r2.ebuild
deleted file mode 100644
index 35d54946dda6..000000000000
--- a/net-libs/libproxy/libproxy-0.4.11-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils flag-o-matic mono python-r1
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="https://code.google.com/p/libproxy/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# NOTE: mozjs/spidermonkey might still cause problems like #373397 ?
-# NOTE: webkit-gtk:3, not :2, needed for libjavascriptcoregtk support
-RDEPEND="gnome? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- kde? ( kde-frameworks/kdelibs:4 )
- mono? ( dev-lang/mono )
- networkmanager? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- spidermonkey? ( >=dev-lang/spidermonkey-1.8.5:0= )
- webkit? ( >=net-libs/webkit-gtk-1.6:3= )"
-DEPEND="${RDEPEND}
- kde? ( dev-util/automoc )
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-# avoid dependency loop, bug #467696
-PDEPEND="networkmanager? ( net-misc/networkmanager )"
-
-src_prepare() {
- # Gentoo's spidermonkey doesn't set Version: in mozjs18[57].pc
- epatch "${FILESDIR}/${P}-mozjs.pc.patch"
-
- # get-pac-test freezes when run by the ebuild, succeeds when building
- # manually; virtualx.eclass doesn't help :(
- epatch "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
-
- epatch "${FILESDIR}"/${P}-macosx.patch
-
- # prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
- epatch "${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch"
-}
-
-src_configure() {
- [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
- use python && python_setup
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- # WITH_VALA just copies the .vapi file over and needs no deps,
- # hence always enable it unconditionally
- local mycmakeargs=(
- -DPERL_VENDORINSTALL=ON
- -DCMAKE_C_FLAGS="${CFLAGS}"
- -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
- $(cmake-utils_use_with gnome GNOME3)
- $(multilib_is_native_abi && cmake-utils_use_with kde KDE4 \
- || echo -DWITH_KDE4=OFF)
- $(multilib_is_native_abi && cmake-utils_use_with mono DOTNET \
- || echo -DWITH_DOTNET=OFF)
- $(cmake-utils_use_with networkmanager NM)
- $(multilib_is_native_abi && cmake-utils_use_with perl PERL \
- || echo -DWITH_PERL=OFF)
- $(multilib_is_native_abi && cmake-utils_use_with python PYTHON \
- || echo -DWITH_PYTHON=OFF)
- $(multilib_is_native_abi && cmake-utils_use_with spidermonkey MOZJS \
- || echo -DWITH_MOZJS=OFF)
- $(multilib_is_native_abi && cmake-utils_use_with webkit WEBKIT \
- || echo -DWITH_WEBKIT=OFF)
- $(multilib_is_native_abi && cmake-utils_use_with webkit WEBKIT3 \
- || echo -DWITH_WEBKIT3=OFF)
- -DWITH_VALA=ON
- $(cmake-utils_use test BUILD_TESTING)
- )
- cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog NEWS README"
- einstalldocs
-
- if use python; then
- python_foreach_impl python_domodule bindings/python/libproxy.py || die
- fi
-}