Move gnome2_src_prepare to proper place. Drop old.

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

5 files changed, 14 insertions, 129 deletions

diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index 3179118773f4..b17af36dc193 100644
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.62 2011/10/30 02:38:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.63 2011/12/28 16:41:30 pacho Exp $
+
+  28 Dec 2011; Pacho Ramos <pacho@gentoo.org> -libsoup-gnome-2.32.2.ebuild,
+  -libsoup-gnome-2.34.2.ebuild, libsoup-gnome-2.36.1.ebuild:
+  Move gnome2_src_prepare to proper place. Drop old.
 
 *libsoup-gnome-2.36.1 (30 Oct 2011)
 
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index a2452017c33a..cbca1c9112fe 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX libsoup-gnome-2.31.92-system-lib.patch 5433 RMD160 931b001ac5e94f9decbc8a589358bbee6e89b97a SHA1 e550960904d370c8c4d9ba3c3b3a73ca8ef5b8ce SHA256 de4fd6dd04a6972fe63e4214fc4b0d55eb8aec1503261d1cfdd3f11d1970425b
 AUX libsoup-gnome-2.34.1-system-lib.patch 5725 RMD160 f723e514ba9e410a25a76ceea35d35f2ff6b3ee9 SHA1 87a08cfce699eb530d362d2b419afc24a15eaa19 SHA256 e79bd7a13b97313e03c6658ed24d254fcdf0173911e69941a73a23362cd12726
 AUX libsoup-gnome-2.36.1-system-lib.patch 5725 RMD160 597245f2caf5d76563f8b489a0b7b1538b919fcc SHA1 7759cf692ee6b81fbb4d6e259056732c234ccffa SHA256 9e036ef690958aa212493a753ff1da80e34b97da79f2af5395d1349ff188f629
-DIST libsoup-2.32.2.tar.bz2 668131 RMD160 641d52bfbb9772cf9e69f3050f59b42783851926 SHA1 d93cfbd8a44c8b8759c98bfc83d2e3a003973708 SHA256 96e6973c8b7459523c0f44e7aec69528ff2fbd388e8ddc415f91bcc42f50777f
-DIST libsoup-2.34.2.tar.bz2 683331 RMD160 a3a94ca9dd6a49a3ee15efda6cf8e4ba96a66338 SHA1 1812b3c78778b37d55ea2904b9763b6dd8266a1c SHA256 1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261
 DIST libsoup-2.34.3.tar.xz 595916 RMD160 e65c7fb49075248a8fa82076141c7f44a6922e51 SHA1 55fc2282f07fb7a205af9368b6a7aae84b79fde4 SHA256 c43f8865a9f7016c618b481bea3dd9ea65d9200685d4a94cddc54f8663704a1c
 DIST libsoup-2.36.1.tar.xz 608308 RMD160 5f040b6f21fbee7b5d940d929184c0eabd2b074f SHA1 536ed62dfc80638d0f03d999271a4766e3463048 SHA256 73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65
-EBUILD libsoup-gnome-2.32.2.ebuild 1420 RMD160 87fbda2a1ddaf19619a761deea168bf22241be7e SHA1 18d13f5dfd59ed39bf56292f995a3aa30b113640 SHA256 93331d48d8da62f5efffd539a3c13f4e2c239112e3e0a6f455ec06113da73842
-EBUILD libsoup-gnome-2.34.2.ebuild 1440 RMD160 ce15ba20d4182cb2511d62a56afabbde69c2dfe1 SHA1 831d0e1070b1353e223d5b9c67bad9935cff4c2f SHA256 78883259262a6bea97215eeb59ceb8e8364cce3aecc37def7ca6fdd68c623889
 EBUILD libsoup-gnome-2.34.3.ebuild 1454 RMD160 1fdecd8adade937fd77add9bedf29221a1ef9ad8 SHA1 dceeafea4a8baf2fe8c3d38989b118901e16391a SHA256 fe6c83c773fd30eed6f4bef20984280d9c5855b8c67bf03b6c9ca5241c737fe6
-EBUILD libsoup-gnome-2.36.1.ebuild 1439 RMD160 b8df9b2a6d4d2b66a48d87dd6466b484495f1c8b SHA1 c054c00d88e83b325a08b19fa5d4bb6083614800 SHA256 3a3c78b11c6e12101fb9e87b8bf2a0777d0bba89e91453ad9f01c8e29ee8ae02
-MISC ChangeLog 10236 RMD160 d6ec7f4a25df4778361fd5193a19cfab9dc59c01 SHA1 d7278f042f1f768057980ac6992f9c34eb1044df SHA256 c8900b8842670cdd3fdeaa71af740f16694a875306710378e2b7df868051cc63
+EBUILD libsoup-gnome-2.36.1.ebuild 1434 RMD160 157d9f28fba67cf127d35047ccc1d1be6bd330d3 SHA1 f1bacaea87e9633ac5bb55b7786a4b06a4488a7f SHA256 d3db611791c322b7697e3ecba4e32a5d0811a33dbf06d413835285f1e0b8b0e5
+MISC ChangeLog 10423 RMD160 02ee413c2fbe113768681999cb8a3a81e0c4773e SHA1 e5f6ea2d9eda6e55a74ed982f70962238c2051df SHA256 3027f9fdf3fdf36ff7cc3fd7ff5f010403323811df03720145ac259f19b0b10b
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6suLAACgkQdjK8w9WeBnCkFgEApaSEuTUABSqDiwdEuLn7EKae
-yvpb2msUYyWRCWZoINEBAKqdPlj7NWqg4sKHwPa4RyzgXvs8UiJQf/7guChDkbEh
-=wgxe
+iEYEARECAAYFAk77RsAACgkQCaWpQKGI+9SN5wCfTGYcRZT5zLkezLJDpA2Ulozy
+RBEAnj6Fo4fwvyooeGo4F9KxqSds9qP4
+=N5hU
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.32.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.32.2.ebuild
deleted file mode 100644
index 83e99ab1c9b4..000000000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.32.2.ebuild
+++ /dev/null
@@ -1,57 +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/libsoup-gnome/libsoup-gnome-2.32.2.ebuild,v 1.6 2011/03/22 19:42:53 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
-IUSE="debug doc +introspection"
-
-RDEPEND="~net-libs/libsoup-${PV}
-	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
-	net-libs/libproxy
-	>=gnome-base/gconf-2
-	dev-db/sqlite:3
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)
-		--with-libsoup-system
-		--with-gnome"
-	DOCS="AUTHORS NEWS README"
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.31.92-system-lib.patch
-	eautoreconf
-}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild
deleted file mode 100644
index 1c7092a081a7..000000000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild
+++ /dev/null
@@ -1,57 +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/libsoup-gnome/libsoup-gnome-2.34.2.ebuild,v 1.4 2011/07/15 11:09:36 xarthisius Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
-IUSE="debug doc +introspection"
-
-RDEPEND="~net-libs/libsoup-${PV}
-	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
-	dev-db/sqlite:3
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		$(use_enable introspection)
-		--with-libsoup-system
-		--with-gnome"
-	DOCS="AUTHORS NEWS README"
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.34.1-system-lib.patch
-	eautoreconf
-}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild
index bc91b388197e..0ce49bdee405 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild,v 1.1 2011/10/30 02:38:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild,v 1.2 2011/12/28 16:41:30 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -49,9 +49,8 @@ src_configure() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Use lib present on the system
 	epatch "${FILESDIR}"/${PN}-2.36.1-system-lib.patch
 	eautoreconf
+	gnome2_src_prepare
 }