Add the automoc dependency to 0.4.10, make it conditional on USE=kde, remove 0.4.10-r1 ebuild since it differs from 0.4.10 only in the dependency list.

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

4 files changed, 17 insertions, 86 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index cb28510774a5..7f7fee194440 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libproxy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.87 2012/10/21 02:55:12 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.88 2012/10/21 03:44:48 tetromino Exp $
+
+  21 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libproxy-0.4.10.ebuild, -libproxy-0.4.10-r1.ebuild:
+  Add the automoc dependency to 0.4.10, make it conditional on USE=kde, remove
+  0.4.10-r1 ebuild since it differs from 0.4.10 only in the dependency list.
 
 *libproxy-0.4.10-r1 (21 Oct 2012)
 
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 4abe2c2ce2bc..0185e1a9e369 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -11,16 +11,19 @@ AUX libproxy-0.4.7-gcc-4.7.patch 2740 SHA256 ab7e1a21a884abdf6192718c5fe53c79feb
 DIST libproxy-0.4.10.tar.gz 378318 SHA256 023e3c1023c522333ac4c414e9cb6db05bc564d3e5d30570e2db07aac100c635 SHA512 d7400740290bffb66ced317692f6b6fdb3e9973e48af1287df51dd3813706164ac6ee6970bde0f7b28beed4a6b6086bf957d85ec8c543e4c0af7044defb88e82 WHIRLPOOL 9dc72362eddd2152a3dfb0185ccdeef4cdbae5c500a18d4ec64bfaacfb4ee66132c0175d837b8ed88cb210a35753546b06735a33a85f3fdd5bf12d5e71b57b06
 DIST libproxy-0.4.6.tar.gz 82483 SHA256 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30 SHA512 4ed64addf5a41b4c0e24cd0988707a73d608d57833d0f7da955bcb9a567ec8fa37b7407c2e9c2ff50057a24b56d17509c944325d2d1d8b7e5e6aa64e624fcd88 WHIRLPOOL 8f32238b57f6b4c142756664248d0449e292fb44a940b059bffc7c9408e825ed96a1dbe2f0e8c3a8caaf059449225999d7ec966812b54ad6b84037b83767c132
 DIST libproxy-0.4.7.tar.gz 91092 SHA256 8fe0a58810139ba3c2e186deccf3e68adcd127aa0e972b0862b30b3dde493797 SHA512 a0a5f4f8faa2724ca88fb52f3f683f7270235536151089bfb34dd0f4164923abc586c7b621eb70bf0f53a0bf5a9807d3b31061803a0891c70d8e6dad1bbfe48d WHIRLPOOL 665486341b517c324c15a06f37366b834b249b1820cbac6bc0aa39586b9933e0f6519e4963790ce0992eed95dd46bc965b76e2832e8ec4eaddb1e2e4e3e0fa20
-EBUILD libproxy-0.4.10-r1.ebuild 2397 SHA256 16b4cd1cf9d5c1d1012406097c2e61082c5e22d16e9ec41d1384e477a4b24ac1 SHA512 ef9f2bec654941a0733b22eeecfffce42362b6467cd0a7b136b826cbcd76b375d8bd23dabeac945c7c912377a39b7227f6f5a5d441c0622606da637c26f78bba WHIRLPOOL 8efb49ad4ab3e361538abc29b393953fe724fca7791cd932d37d1fc16fc880c6798c25984c4f48e03ab1559b4805452f6b6364a1322625ddb9567e00b0df22ed
-EBUILD libproxy-0.4.10.ebuild 2371 SHA256 b01c312e6316d5b55d2c9abbd2ace3242e076ba5c23cce0c0f8fbc6ba99fe2d4 SHA512 874a04e81abeb6c6446009d915f1363d5ac0bbe1f24d7729e277f89cece16faeb50571e5ccf128f1bf680bb062a91e29441c057239eaa660ddcb78c74966a7e9 WHIRLPOOL 552c020fcfe614262d377b1377f7a0cd5d41200aad36cee2f603b73d71ab80da23a6799965a92d4c931785559bb8e37143720b47921499d0c8e6a337bd3f2674
+EBUILD libproxy-0.4.10.ebuild 2398 SHA256 ce573b5333811945f4262ba5764f54c14de3ae9a5beb6e6600e9649739cf5136 SHA512 a76c924d64db370de420aa85d6fa48a7be1154431eca88a2ac280045b7b8f5dae30292fd12fb11324b6ce1f47e7787eac77252ad4b2a863ee10e81a51904f427 WHIRLPOOL 8b6b3d24f73cb6d5aa51a36ba6745d6af9975f25543aa1c8a94cc16f83c23f206d1809bf5562cebdddd20b981c247f6d867be15fed4ac1487f553937970fd74c
 EBUILD libproxy-0.4.6-r3.ebuild 2369 SHA256 a8d9395c1ab0bfe74fa7d162807fbdd56c7bbacf178767e99033891807ea3887 SHA512 1bb8e552b9375544815fb5f1ee8b78db9080ec43c0dbbb3bf88c21f0b0587158e1599454137b14203b067a1023f46783f97cfaffa925caa9e3150dc5d07c85aa WHIRLPOOL 49d42e72fe6e4bac2696f5f9dff1e8a1d1cd219283aa372522ac45f6117fb78b588616dd616ea72878f642279339ee01eeae6f09872725203d4db22227611461
 EBUILD libproxy-0.4.7.ebuild 2338 SHA256 125a4e2067e3f17aa759b43ef95cfdeae2a3245023d8d73daba50e53fdb21bb9 SHA512 700d7d7824abac057d68deae929bf05c7f2d36da4366c6d4e4ec8de15586c326cbc4cf813087d7fe8d7d65539ff68a0f098624568411f345e99971ae473478d2 WHIRLPOOL 825bcdfb952a5ce47b687afa3135811d6a7879639c334dc92d86dd39fd363e67406076a1883462250738361dde9d3e8930f5c3ef466b2df75c8c4e6febd68d44
-MISC ChangeLog 13754 SHA256 2a2b71adcb4989bd848a7b2a4e4d806f191cdb4b6e9f59e9e8e9ccb6f25368a4 SHA512 b1b90ab72f6510924ff7b5218cc5bd360713c53207b8b47a4c673df52aaf6feaea3e94c6ec121471dfafb9c49eb981c616d5dbfe1d6c693d75aa822f84e1b286 WHIRLPOOL 7ca96b66e48629b915ff9c7af4804481bdc1d9f74c77f42032f877307bfeb196263f74ebdbf2698f8d6d69edb6dbdcf27af4492bac6a7301fdd644fc46ac8d3b
+MISC ChangeLog 14025 SHA256 315027842b268189a0a59280dba1c1a1897bdda6498f8c4d9b6eac74b5a91b78 SHA512 81609837d10b464fc0b947880c8e0fd891bd84c2ce894f9d0f8d4517862b123e68a2136f7826b2d3ecfd6a3fb3e4060143f7fbd356fb8f1fb6db35eece767f64 WHIRLPOOL 78aefe4943fc324d7a0f035051ec8d3e35f8f998ed00d0fef2b3c3df2013abd0a864a2e43c7d8a819ff61eed268fcb727bce55a2fd0264da89d7d0f864f3c07a
 MISC metadata.xml 706 SHA256 f036003c89fb0aabecfc402e08129ab1a698642bc16ddc577909f6fb73d9ca9b SHA512 5699fa2ea9005031934cf7f66d7b51c814309c1f2b3b972ca12983dcdd8d6175e677f0c1d141db4c7d8e3252546b7b25ec3d660cd6a96a9e731f9e42f10f4f1b WHIRLPOOL 7f1dca48d567d95157be0b5e6a5a7612d41772207dac31a48b12012d77519d01c5ce49711ec9c563bf5f188623c85a6a1bda0b39365a25c3493eb64ed4449f67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCDZA8ACgkQ23laikJhg1Sl9QCeKDJ5oC1YYH/hEGbFeUU/I8NY
-BeYAn2dyGYzLV+tkvBwY0oketK3w76EE
-=cM+l
+iQEcBAEBCAAGBQJQg2+yAAoJEJ0WA1zPCt1hk/IH/208Z9EBiCxlLB7j39I1rEGf
+LEmQjrsVDKyWysYz8Ei9OIvZ6QZiVhX7uxNSIFaixXp+eTHzNZeROcv1SDQNU2/e
+4HAsAsxXJKREaMow758l7KTrP5q+YUiYSrz1myB09BI137IWOYfVBdakn5FUUi2A
+nhQ4Mg4hRy46mo9sdgGQyDU+FL8yt20YXVqt0zbRgOf7YULhI2FeFZego9LSsAEq
+uUiIC80PaaHeGIRtorMOFCZPw7YuMWYJMrl0CDvutafXWYFxZpLeAe2bVXsqfa2s
+9dAIkm5kHkqV8f0rvXxTxCi8XUo+hFS7TYjjxZAj9BGEN50w+Pi7YWgHJ4Yf0k4=
+=o+WK
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libproxy/libproxy-0.4.10-r1.ebuild b/net-libs/libproxy/libproxy-0.4.10-r1.ebuild
deleted file mode 100644
index 1960d03b9ce8..000000000000
--- a/net-libs/libproxy/libproxy-0.4.10-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10-r1.ebuild,v 1.1 2012/10/21 02:55:12 creffett Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit cmake-utils eutils 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 spidermonkey test webkit"
-
-# 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.26:2 )
-	kde? ( >=kde-base/kdelibs-4.4.5 )
-	mono? ( dev-lang/mono )
-	networkmanager? ( net-misc/networkmanager )
-	perl? (	dev-lang/perl )
-	spidermonkey? ( >=dev-lang/spidermonkey-1.8.5 )
-	webkit? ( >=net-libs/webkit-gtk-1.6:3 )"
-DEPEND="${RDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Gentoo's spidermonkey doesn't set Version: in mozjs185.pc
-	epatch "${FILESDIR}/${PN}-0.4.10-mozjs185.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"
-}
-
-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)
-			$(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)
-			$(cmake-utils_use_with spidermonkey MOZJS)
-			$(cmake-utils_use_with webkit WEBKIT)
-			$(cmake-utils_use_with webkit WEBKIT3)
-			-DWITH_VALA=ON
-			$(cmake-utils_use test BUILD_TESTING)
-	)
-	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/libproxy-0.4.10.ebuild b/net-libs/libproxy/libproxy-0.4.10.ebuild
index 75a1bb7a7afb..cd50ab8624c7 100644
--- a/net-libs/libproxy/libproxy-0.4.10.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10.ebuild,v 1.7 2012/10/19 06:35:28 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10.ebuild,v 1.8 2012/10/21 03:44:48 tetromino Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
@@ -26,6 +26,7 @@ RDEPEND="gnome? ( >=dev-libs/glib-2.26:2 )
 	spidermonkey? ( >=dev-lang/spidermonkey-1.8.5 )
 	webkit? ( >=net-libs/webkit-gtk-1.6:3 )"
 DEPEND="${RDEPEND}
+	kde? ( dev-util/automoc )
 	virtual/pkgconfig"
 
 pkg_setup() {