old

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

8 files changed, 0 insertions, 317 deletions

diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 907481b65fc4..050f4be99e28 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,13 +1,5 @@
-AUX libproxy-0.2.3-fbsd.patch 2316 RMD160 961c67621cb34a3f08904d362bd76fbb754a928c SHA1 ca2ae2649f69f5b0988d0b06d1771befce074cc0 SHA256 c07673422ba2592c6092914c92fa932702838ddf0ac5345fb7785b624e66121d
-AUX libproxy-0.2.3-fix-as-needed-problem.patch 574 RMD160 dfd95508caf9a19a73fac5b12cc43fa697c91abd SHA1 63ff8823cedb350d7cd0a3ed26886c1079dddd18 SHA256 9bbc0275b1a78db7ba4966c8169af1269154dc3d9bf716035ba193861bf4869d
-AUX libproxy-0.2.3-fix-automagic-mozjs.patch 2332 RMD160 f89abdb6fb1cf7fb5682e6440bb1c489ede270f4 SHA1 88239372df7fd3c5dadf1f0bc0f61fc9163f250d SHA256 52691a7a910655a3c5c0015038311a325885b1552d94ee67d60bc8a138e197fe
-AUX libproxy-0.2.3-fix-dbus-includes.patch 1387 RMD160 ae39dca04f17f58f1a0c36208ceed8190af82d95 SHA1 f43e6d39ecaf7847c3f11255f56d205383e982e6 SHA256 31be2886acd191a80d86a75c9aec090998dd2b21ec23e64d0cda51e73b71d60e
-AUX libproxy-0.2.3-fix-python-automagic.patch 858 RMD160 ec182cb70c84ffbf7faa8a1ff8f68b95b2e57155 SHA1 842170203e449b6fcd704fa1183956d1a079bab8 SHA256 0d21b238b2476920c4fcdcff238526ddac4ab3022d359a918aab0e3315f105a4
-AUX libproxy-0.2.3-implicit-declaration.patch 206 RMD160 12d2d0507a2d0c163b7c2d16d7d42ab5d0d7eb8f SHA1 b17dabc232bf9140629a5d987279800b3d2d19d8 SHA256 1ff409011d9a826999dd1478632a5ac18f793bb3d0028e83f89f78463ee88bf5
 AUX libproxy-0.4.6-mozjs-link_directory.patch 1365 RMD160 4ba7b7f923a8d48575db2f13c86482d78e54ae1c SHA1 0a083243f29571e5e971de6df6e4c81b9cf6444f SHA256 783bc34d685ddf3ba6e6c85003417412f2bb87e9fc87c4ca5c9c56bf5e99aea5
-DIST libproxy-0.2.3.tar.gz 378773 RMD160 c86c4f8403cb879380e101d074af469c960b5c1c SHA1 2b2b00a179740548035a1145bbae600db9b0a2ce SHA256 59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
 DIST libproxy-0.4.6.tar.gz 82483 RMD160 f5f03c84ad2d87fe728869fadc669628737c639e SHA1 6e9745c87b774f34bf53f07a54284c0d72020e94 SHA256 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30
-EBUILD libproxy-0.2.3-r3.ebuild 2677 RMD160 f234bb926d25459c3a65d2acd8a366f9c1918c2c SHA1 378b08d384ba2c6d846c7c3cf495e1e300b858ac SHA256 af1a37c687737148425cbdf45ced8bb715b3124b2b552f415df868d0fca463cd
 EBUILD libproxy-0.4.6-r1.ebuild 2213 RMD160 c77dee24cc090d4db43a4bc8f8fad6607b34058c SHA1 75b84514114eeb89e98e0f0c9cc68b9b93fbce71 SHA256 be6f75fe64ff144208c3dd50a5ab3c348daccce2b6a99794f8eb834d7927e8b4
 EBUILD libproxy-0.4.6.ebuild 2154 RMD160 832730ddcaa3eb59bddcfd874c3aeb90046c04de SHA1 41047b19a8dc020f294fe83624399d7af9475ed6 SHA256 aec2d3e00a3116ebc96350219558ca91959d9630e1d30f6d619b873bf8e718aa
 MISC ChangeLog 8448 RMD160 d7f3b796de88e96230cc37010317f5b1e336e38c SHA1 bbdf52f8f64cdb196b76082ba32bd53d2dc08298 SHA256 d2605e2f81703217e4e73e41fb49d4d0c5666cefee87ead8ed48dad601b6a40b
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fbsd.patch b/net-libs/libproxy/files/libproxy-0.2.3-fbsd.patch
deleted file mode 100644
index 8379b3997f45..000000000000
--- a/net-libs/libproxy/files/libproxy-0.2.3-fbsd.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Mix of various upstream commits to build on FreeBSD and be more POSIX compliant.
-Drop at next bump.
-
-
-Index: src/lib/url.c
-===================================================================
---- src/lib/url.c	(revision 308)
-+++ src/lib/url.c	(revision 309)
-@@ -26,6 +26,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
-+#include <netinet/in.h>
- 
- #include "misc.h"
- #include "url.h"
-Index: src/lib/proxy_factory.c
-===================================================================
---- src/lib/proxy_factory.c	(revision 308)
-+++ src/lib/proxy_factory.c	(revision 309)
-@@ -27,6 +27,7 @@
- #include <math.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
-+#include <netinet/in.h>
- #include <pthread.h>
- 
- 
-Index: src/plugins/pacrunner_webkit.c
-===================================================================
---- src/plugins/webkit.c	(revision 335)
-+++ src/plugins/webkit.c	(working copy)
-@@ -23,6 +23,7 @@
- #include <sys/socket.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-+#include <netinet/in.h>
- #define __USE_BSD
- #include <unistd.h>
- 
-Index: src/plugins/pacrunner_mozjs.c
-===================================================================
---- src/plugins/mozjs.c	(revision 335)
-+++ src/plugins/mozjs.c	(working copy)
-@@ -23,6 +23,7 @@
- #include <sys/socket.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-+#include <netinet/in.h>
- #define __USE_BSD
- #include <unistd.h>
- 
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 334)
-+++ configure.ac	(revision 335)
-@@ -199,7 +199,7 @@
- AC_TYPE_SIZE_T
- PLUGINDIR=$libdir/$PACKAGE_NAME/$PACKAGE_VERSION/plugins
- AC_SUBST(PLUGINDIR)
--CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=1"
-+CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=200112L"
- 
- ### Checks for library functions.
- AC_FUNC_MALLOC
-Index: src/bin/Makefile.am
-===================================================================
---- src/bin/Makefile.am	(revision 318)
-+++ src/bin/Makefile.am	(revision 319)
-@@ -3,5 +3,4 @@
- # Command line interface to libproxy
- proxy_SOURCES = proxy.c
- proxy_CFLAGS  = -I$(top_srcdir)/src/lib
--proxy_LDFLAGS = -ldl
- proxy_LDADD   = ../lib/libproxy.la
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch
deleted file mode 100644
index 55fec42b39c4..000000000000
--- a/net-libs/libproxy/files/libproxy-0.2.3-fix-as-needed-problem.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libproxy-0.2.3.orig/src/lib/Makefile.am libproxy-0.2.3/src/lib/Makefile.am
---- libproxy-0.2.3.orig/src/lib/Makefile.am	2008-06-06 02:26:15.000000000 +0530
-+++ libproxy-0.2.3/src/lib/Makefile.am	2009-01-30 13:47:53.365859960 +0530
-@@ -2,7 +2,7 @@
- libproxy_la_SOURCES = misc.c url.c pac.c dhcp.c dns.c slp.c wpad.c proxy_factory.c config_file.c \
- 						misc.h url.h pac.h dhcp.h dns.h slp.h wpad.h proxy_factory.h proxy.h config_file.h
- libproxy_la_CFLAGS  = -Wall
--libproxy_la_LDFLAGS = -lm
-+libproxy_la_LDFLAGS = -lm $(LIBDL)
- 
- include_HEADERS     = proxy.h
- 
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-automagic-mozjs.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-automagic-mozjs.patch
deleted file mode 100644
index 779591487bd0..000000000000
--- a/net-libs/libproxy/files/libproxy-0.2.3-fix-automagic-mozjs.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure.ac.orig	2009-06-29 11:15:29.169464423 +0300
-+++ configure.ac	2009-06-29 11:16:03.963593002 +0300
-@@ -17,9 +17,6 @@
- PKG_CHECK_MODULES(xmu, xmu, have_xmu=yes, have_xmu=no)
- PKG_CHECK_MODULES(gconf, gconf-2.0, have_gconf=yes, have_gconf=no)
- PKG_CHECK_MODULES(webkit, webkit-1.0, have_webkit=yes, have_webkit=no)
--PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, 
--		[PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
--		[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])
- PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
- 					have_networkmanager=yes, have_networkmanager=no)
- PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no)
-@@ -111,24 +108,32 @@
- 
- # Mozilla Javascript
- AC_ARG_WITH([mozjs],
--            [AS_HELP_STRING([--with-mozjs],
--            [build Mozilla JavaScript PAC runner plugin @<:@automatic@:>@])],
-+            [AS_HELP_STRING([--with-mozjs@<:@=xulrunner|firefox|mozilla|seamonkey|no@:>@],
-+            [build Mozilla JavaScript PAC runner plugin (autodetected by default)])],
-             [],
--            [test x$have_mozjs == xyes && with_mozjs=yes])
--if test x$with_mozjs = xyes; then
--	if test x$have_mozjs == xyes; then
--		MOZJS_CFLAGS="$mozjs_CFLAGS"
--		MOZJS_LIBS="$mozjs_LIBS"
--		AC_SUBST(MOZJS_CFLAGS)
--		AC_SUBST(MOZJS_LIBS)
--	else
--		echo "Mozilla JavaScript plugin requires: mozjs!"
--		exit 1
--	fi
-+            [with_mozjs=auto])
-+
-+if (test x$with_mozjs = xauto || test x$with_mozjs = xyes); then
-+	PKG_CHECK_MODULES(mozjs, xulrunner-js, with_mozjs=xulrunner, 
-+			[PKG_CHECK_MODULES(mozjs, firefox-js, with_mozjs=firefox,
-+			[PKG_CHECK_MODULES(mozjs, mozilla-js, with_mozjs=mozilla,
-+			[PKG_CHECK_MODULES(mozjs, seamonkey-js, with_mozjs=seamonkey,
-+				[test x$with_mozjs = xauto && with_mozjs = no || with_mozjs = error])])])])
-+elif test x$with_mozjs != xno; then
-+	PKG_CHECK_MODULES(mozjs, [$with_mozjs[]-js])
-+fi
-+
-+if test x$with_mozjs = xerror; then
-+	AC_MSG_ERROR([cannot find any mozjs provider])
- else
--	with_mozjs=no
-+	AC_MSG_RESULT([$with_mozjs])
-+	MOZJS_CFLAGS="$mozjs_CFLAGS"
-+	MOZJS_LIBS="$mozjs_LIBS"
-+	AC_SUBST(MOZJS_CFLAGS)
-+	AC_SUBST(MOZJS_LIBS)
- fi
--AM_CONDITIONAL([WITH_MOZJS], [test x$with_mozjs = xyes])
-+
-+AM_CONDITIONAL([WITH_MOZJS], [test x$with_mozjs != xno])
- 
- # NetworkManager
- AC_ARG_WITH([networkmanager],
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-dbus-includes.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-dbus-includes.patch
deleted file mode 100644
index e1148d341681..000000000000
--- a/net-libs/libproxy/files/libproxy-0.2.3-fix-dbus-includes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libproxy-0.2.3.orig/configure.ac	2008-06-06 02:26:16.000000000 +0530
-+++ libproxy-0.2.3/configure.ac	2009-01-25 15:12:45.720319398 +0530
-@@ -21,6 +22,7 @@
- 		[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])
- PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
- 					have_networkmanager=yes, have_networkmanager=no)
-+PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no)
- 
- # Environmental Variable
- AC_ARG_WITH([envvar],
-@@ -133,15 +135,15 @@
-             [AS_HELP_STRING([--with-networkmanager],
-             [build NetworkManager plugin @<:@automatic@:>@])],
-             [],
--            [test x$have_networkmanager == xyes && with_networkmanager=yes])
-+            [test x$have_networkmanager == xyes -a x$have_dbus == xyes && with_networkmanager=yes])
- if test x$with_networkmanager = xyes; then
--	if test x$have_networkmanager == xyes; then
--		NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS"
--		NETWORKMANAGER_LIBS="$NetworkManager_LIBS"
-+	if test x$have_networkmanager == xyes -a x$have_dbus == xyes; then
-+		NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS $dbus_CFLAGS"
-+		NETWORKMANAGER_LIBS="$NetworkManager_LIBS $dbus_LIBS"
- 		AC_SUBST(NETWORKMANAGER_CFLAGS)
- 		AC_SUBST(NETWORKMANAGER_LIBS)
- 	else
--		echo "NetworkManager plugin requires: NetworkManager!"
-+		echo "NetworkManager plugin requires: NetworkManager and dbus!"
- 		exit 1
- 	fi
- else
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-python-automagic.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-python-automagic.patch
deleted file mode 100644
index f33f73b41052..000000000000
--- a/net-libs/libproxy/files/libproxy-0.2.3-fix-python-automagic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur libproxy-0.2.3.orig/configure.ac libproxy-0.2.3/configure.ac
---- libproxy-0.2.3.orig/configure.ac	2008-06-06 02:26:16.000000000 +0530
-+++ libproxy-0.2.3/configure.ac	2009-01-25 13:56:15.335319374 +0530
-@@ -10,6 +10,7 @@
- AC_PROG_LIBTOOL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-+AM_PROG_CC_C_O
- 
- ### Checks for libraries for plugins.
- PKG_CHECK_MODULES(x11, x11, have_x11=yes, have_x11=no)
-@@ -154,8 +155,8 @@
- AC_ARG_WITH([python],
-             [AS_HELP_STRING([--with-python],
-             [build Python bindings @<:@automatic@:>@])],
--            [AM_PATH_PYTHON([2.5], with_python=yes)],
--            [AM_PATH_PYTHON([2.5], with_python=yes, with_python=no)])
-+            [AM_PATH_PYTHON([2.5], have_python=yes, have_python=no)],
-+            [have_python=yes && with_python=yes])
- AM_CONDITIONAL([WITH_PYTHON], [test x$with_python = xyes])
- 
- # Java
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-implicit-declaration.patch b/net-libs/libproxy/files/libproxy-0.2.3-implicit-declaration.patch
deleted file mode 100644
index 9ef13aa9ecc0..000000000000
--- a/net-libs/libproxy/files/libproxy-0.2.3-implicit-declaration.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/bin/proxy.c
-+++ src/bin/proxy.c
-@@ -21,6 +21,7 @@
- #include <stdlib.h>
- #include <assert.h>
- #include <unistd.h>
-+#define __USE_BSD /* For strdup() */
- #include <string.h>
- 
- // Import libproxy API
diff --git a/net-libs/libproxy/libproxy-0.2.3-r3.ebuild b/net-libs/libproxy/libproxy-0.2.3-r3.ebuild
deleted file mode 100644
index 1b31da0f567e..000000000000
--- a/net-libs/libproxy/libproxy-0.2.3-r3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.2.3-r3.ebuild,v 1.7 2010/07/15 15:57:31 jer Exp $
-
-EAPI="2"
-
-inherit autotools eutils python portability
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="http://code.google.com/p/libproxy/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="gnome kde networkmanager python webkit xulrunner"
-
-RDEPEND="
-	gnome? (
-		x11-libs/libX11
-		x11-libs/libXmu
-		gnome-base/gconf )
-	kde? (
-		x11-libs/libX11
-		x11-libs/libXmu )
-	networkmanager? ( net-misc/networkmanager )
-	python? ( >=dev-lang/python-2.5 )
-	webkit? ( net-libs/webkit-gtk )
-	xulrunner? ( >=net-libs/xulrunner-1.9.0.11-r1:1.9 )
-"
-# Since xulrunner-1.9.0.11-r1 its shipped mozilla-js.pc is fixed so we can use it
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19"
-
-src_prepare() {
-	# http://code.google.com/p/libproxy/issues/detail?id=23
-	epatch "${FILESDIR}/${P}-fix-dbus-includes.patch"
-
-	# http://code.google.com/p/libproxy/issues/detail?id=24
-	epatch "${FILESDIR}/${P}-fix-python-automagic.patch"
-
-	# http://code.google.com/p/libproxy/issues/detail?id=25
-	epatch "${FILESDIR}/${P}-fix-as-needed-problem.patch"
-
-	# Bug 275127 and 275318
-	epatch "${FILESDIR}/${P}-fix-automagic-mozjs.patch"
-
-	# Fix implicit declaration QA, bug #268546
-	epatch "${FILESDIR}/${P}-implicit-declaration.patch"
-
-	epatch "${FILESDIR}/${P}-fbsd.patch" # drop at next bump
-
-	# Fix test to follow POSIX (for x86-fbsd).
-	# FIXME: This doesn't actually fix all == instances when two are on the same line
-	sed -e 's/\(test.*\)==/\1=/g' -i configure.ac configure || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# xulrunner:1.9 => mozilla;
-	# xulrunner:1.8 => xulrunner; (firefox => mozilla-firefox[-xulrunner] ?)
-	if use xulrunner; then myconf="--with-mozjs=mozilla"
-	else myconf="--without-mozjs"
-	fi
-
-	econf --with-envvar \
-		--with-file \
-		--disable-static \
-		$(use_with gnome) \
-		$(use_with kde) \
-		$(use_with webkit) \
-		${myconf} \
-		$(use_with networkmanager) \
-		$(use_with python)
-}
-
-src_compile() {
-	emake LIBDL="$(dlopen_lib)" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDL="$(dlopen_lib)" install || die "emake install failed!"
-	dodoc AUTHORS NEWS README ChangeLog || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize "$(python_get_sitedir)/${PN}.py"
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}.py
-}