Version bump, remove old.

Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

5 files changed, 89 insertions, 96 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index ae0b5af340d9..2af0438e1af6 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libproxy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.68 2011/08/06 09:05:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.69 2011/10/18 19:05:58 pacho Exp $
+
+*libproxy-0.4.7 (18 Oct 2011)
+
+  18 Oct 2011; Pacho Ramos <pacho@gentoo.org> +libproxy-0.4.7.ebuild,
+  -libproxy-0.4.6.ebuild, metadata.xml:
+  Version bump, remove old.
 
   06 Aug 2011; Zac Medico <zmedico@gentoo.org> libproxy-0.4.6-r3.ebuild:
   Add ~x86-linux keyword.
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 08271884fab6..8a524054d1a1 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -6,14 +6,15 @@ AUX libproxy-0.4.6-flags-mixing.patch 415 RMD160 41dfeee7ec15c58b3e65326b71f959c
 AUX libproxy-0.4.6-mozjs-link_directory.patch 1365 RMD160 4ba7b7f923a8d48575db2f13c86482d78e54ae1c SHA1 0a083243f29571e5e971de6df6e4c81b9cf6444f SHA256 783bc34d685ddf3ba6e6c85003417412f2bb87e9fc87c4ca5c9c56bf5e99aea5
 AUX libproxy-0.4.6-xulrunner-2.patch 4763 RMD160 66210bdb6497b14358fd73037b6e9813ffd55de3 SHA1 a0ee71fc9b6cd15176b53601655ee6c0d760651b SHA256 e4bd9cb3c43249593015c1fe2b6630e999627e01ca1091455a70ec32d0233525
 DIST libproxy-0.4.6.tar.gz 82483 RMD160 f5f03c84ad2d87fe728869fadc669628737c639e SHA1 6e9745c87b774f34bf53f07a54284c0d72020e94 SHA256 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30
+DIST libproxy-0.4.7.tar.gz 91092 RMD160 a09c8320cbabed23c84ceddf3c9b572cf89c9c0e SHA1 b01ebbdf837babf63f38ee34e261d76f23dad319 SHA256 8fe0a58810139ba3c2e186deccf3e68adcd127aa0e972b0862b30b3dde493797
 EBUILD libproxy-0.4.6-r3.ebuild 2367 RMD160 706fcb7f64462a1e8537f44696c5d9f7dd6c1eb2 SHA1 3164e4e24d14beee34bd5df0261b9c903522d08d SHA256 ec7394d5f5423d15b06e91141f2961ef3a2f9a426dcd5d2552c6a4081063a76e
-EBUILD libproxy-0.4.6.ebuild 2158 RMD160 d43c8c283daea56e53712eda8f498a5be07eaf4c SHA1 41b655075b6ef6bc0b109f1b098857573cb02116 SHA256 a3bcf5ea0df5bc42d30907774ee1745c5b95adfbb7c99364845a19a6103422cf
-MISC ChangeLog 10743 RMD160 2665c3c2f904beb3c0a97e623d370ab3070f06d2 SHA1 975c363482770ca0493e574b1c342f5be0d9a043 SHA256 017960bfc17f55dc93069737a3cdda6dd39291b25e845168c41d75c0b2e56d27
-MISC metadata.xml 658 RMD160 21df7580031de423ef6647c07350806f9e6149dc SHA1 db7e4a8d582788c3af1629213ce8190b0d85626a SHA256 d16b934e849c02fa2ff14411ceb5242a68633a3d4b88848c92a5ca53c6c934f0
+EBUILD libproxy-0.4.7.ebuild 2200 RMD160 be4d006369595112aef0b0a54ea717cf4de02ace SHA1 1a8ff723896c192db49911e4367dbaba774db1a6 SHA256 82fd7c2a6d84054784d1ecd8e9f12395442868c9c5d1a971a3e534c1c6432dc4
+MISC ChangeLog 10911 RMD160 bc35d69c878737b79273681c1cc77c5134d3edab SHA1 e099713045bb92bb7808cdbc28c40d1b182da01d SHA256 b1cdcf015f35b260e095b49048bd8463c4faf9ce9a2a5bde72c1124c6c95ad01
+MISC metadata.xml 406 RMD160 5c499c2bfe217a922f13323d217726c7160deb94 SHA1 ea67953dc365e7657e55a8144936ef6234112b41 SHA256 cf35b0493dce3b4d725a8532a7fa4679241f81eb9e0560469d63409f44e9daef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk49A9wACgkQ/ejvha5XGaPpcgCg7FI4gphd/gPXGDETpu3Pv8QI
-efcAoLsSw1t15scrtCpk4P3zfIy4mkVJ
-=10Nb
+iEYEARECAAYFAk6dzh0ACgkQCaWpQKGI+9TGgwCfWlkZtx88CLaw3OIzdszfiCyb
+woUAn0Hi13cMjS2kpHF/O5o6ewOygwF2
+=mHbT
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libproxy/libproxy-0.4.6.ebuild b/net-libs/libproxy/libproxy-0.4.6.ebuild
deleted file mode 100644
index 5ffecf7990ed..000000000000
--- a/net-libs/libproxy/libproxy-0.4.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6.ebuild,v 1.16 2011/03/26 14:26:11 ssuominen Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit cmake-utils eutils multilib 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 mono networkmanager perl python test webkit xulrunner"
-
-RDEPEND="
-	gnome? ( gnome-base/gconf:2 )
-	kde? ( >=kde-base/kdelibs-4.3 )
-	mono? ( dev-lang/mono )
-	networkmanager? ( net-misc/networkmanager )
-	perl? (	dev-lang/perl )
-	webkit? ( net-libs/webkit-gtk:2 )
-	xulrunner? ( =net-libs/xulrunner-1.9*:1.9 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-PATCHES=( "${FILESDIR}"/${P}-mozjs-link_directory.patch )
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-			-DPERL_VENDORINSTALL=ON
-			-DCMAKE_C_FLAGS="${CFLAGS}"
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-			$(cmake-utils_use_with gnome GNOME)
-			$(cmake-utils_use_with kde KDE4)
-			$(cmake-utils_use_with mono DOTNET)
-			$(cmake-utils_use_with networkmanager NM)
-			$(cmake-utils_use_with perl PERL)
-			$(cmake-utils_use_with python PYTHON)
-			-DWITH_VALA=OFF
-			$(cmake-utils_use_with webkit WEBKIT)
-			$(cmake-utils_use_with xulrunner MOZJS)
-			$(cmake-utils_use test BUILD_TESTING)
-			)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# Prevent access violation when building with mono support
-	export MONO_SHARED_DIR="${T}/shared"
-	cmake-utils_src_compile
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libproxy.so.0
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libproxy.so.0
-
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize $(python_get_sitedir)/${PN}.py
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup $(python_get_sitedir)/${PN}.py
-	fi
-}
diff --git a/net-libs/libproxy/libproxy-0.4.7.ebuild b/net-libs/libproxy/libproxy-0.4.7.ebuild
new file mode 100644
index 000000000000..e2cc2c6b0593
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.7.ebuild,v 1.1 2011/10/18 19:05:58 pacho Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit cmake-utils mono python
+
+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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
+IUSE="gnome kde mono networkmanager perl python test"
+
+# FIXME: Disable webkit support due problems like bug #366791
+# FIXME: Also disable xulrunner support due bug #360893, will be readded
+# in the future when only spidermonkey mozjs is provided.
+
+RDEPEND="gnome? ( >=dev-libs/glib-2.26:2 )
+	kde? ( >=kde-base/kdelibs-4.4.5 )
+	mono? ( dev-lang/mono )
+	networkmanager? ( net-misc/networkmanager )
+	perl? (	dev-lang/perl )"
+#	xulrunner? ( >=net-libs/xulrunner-1.9.1:1.9 )
+#	webkit? ( net-libs/webkit-gtk:2 )
+# Since 0.4.7, webkit gtk3 support is also available
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+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 GNOME)
+			$(cmake-utils_use_with gnome GNOME3)
+			$(cmake-utils_use_with kde KDE4)
+			$(cmake-utils_use_with mono DOTNET)
+			$(cmake-utils_use_with networkmanager NM)
+			$(cmake-utils_use_with perl PERL)
+			$(cmake-utils_use_with python PYTHON)
+			-DWITH_VALA=ON
+			-DWITH_WEBKIT=OFF
+			-DWITH_WEBKIT3=OFF
+			-DWITH_MOZJS=OFF
+			$(cmake-utils_use test BUILD_TESTING)
+	)
+			#$(cmake-utils_use_with webkit WEBKIT)
+			#$(cmake-utils_use_with xulrunner MOZJS)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize ${PN}.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ${PN}.py
+}
diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml
index eb8c45914f70..17487fac55ae 100644
--- a/net-libs/libproxy/metadata.xml
+++ b/net-libs/libproxy/metadata.xml
@@ -7,11 +7,7 @@
 </maintainer>
 <use>
 	<flag name='gnome'>Enable support for reading proxy settings from
-		GNOME using <pkg>gnome-base/gconf</pkg></flag>
+		GNOME</flag>
 	<flag name='kde'>Enable support for reading proxy settings from KDE</flag>
-	<flag name='webkit'>Enable support for reading proxy settings from
-		<pkg>net-libs/webkit-gtk</pkg></flag>
-	<flag name='xulrunner'>Enable support for reading proxy settings from
-		<pkg>net-libs/xulrunner</pkg></flag>
 </use>
 </pkgmetadata>