Version bump, drop old.

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

5 files changed, 27 insertions, 104 deletions

diff --git a/dev-libs/libpeas/ChangeLog b/dev-libs/libpeas/ChangeLog
index 78f4508f5f8f..dfe0c75e3aa3 100644
--- a/dev-libs/libpeas/ChangeLog
+++ b/dev-libs/libpeas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libpeas
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.7 2012/09/30 07:36:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.8 2012/10/20 06:46:36 pacho Exp $
+
+*libpeas-1.6.1 (20 Oct 2012)
+
+  20 Oct 2012; Pacho Ramos <pacho@gentoo.org> +libpeas-1.6.1.ebuild,
+  -libpeas-1.2.0-r1.ebuild, -libpeas-1.4.0-r1.ebuild, metadata.xml:
+  Version bump, drop old.
 
 *libpeas-1.6.0 (30 Sep 2012)
 
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index c6b088807a95..4173e82418e7 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -3,22 +3,16 @@ Hash: SHA256
 
 AUX libpeas-1.2.0-PeasPluginInfo-annotation.patch 2255 SHA256 2b187f0681021ea1cca8f805e9eaf452cd7c5611c80bfa1e04315aac68b75f80 SHA512 abc843a75ed6572530771b4fa2dbafe4c3b5b09a0fc4c6871f9b52c96c67914289315bad6a1397aa724dcdc048affbd274b5a74392b62e5616d9f274774b9514 WHIRLPOOL 82a024775c3fd06880d3382dfaa0c8a684ef9f1ec6955fedfd878ea5bfaad6f98e4073a58c096807d0e0b57db03c5af5bb808a5d835854877eabbd01b5ab2bbe
 AUX libpeas-1.4.0-pkgconfig.patch 1009 SHA256 58dd1842947442f9b548e9bde969ba0e122b407fc956da439c323a444c3e128e SHA512 d5c8317eba938826c903884191d1acf125a1d1c742ac06ff8316d54c1392a8c87d2b83ef2a11f128d061982bd78f3499e7da9ac45256695dfeb73bf33a11f0e2 WHIRLPOOL 15253ad6d7426e39e6102cafa97e4c41d2212674f3fd89e01f2b00177e716bb1e1ab7a4b4c78764e203860cd0288eccf5ab515e217fe65dc139ad13c2a129178
-DIST libpeas-1.2.0.tar.xz 497176 SHA256 871868ff44352367a4b4602352f60fd20eb99794ade454f3b120d87c1560f31c SHA512 73f06a13450154a65b01cb40123c3b61db3c543b3d018fe11f45df8179ec70561cefc7cbe20684f37365580c7d64e87db93feb00b262b64404386d424172f18c WHIRLPOOL efda83ead8dc60fb7ef6e53e820dad057461fa8e64604cbef5d0f5752896c7511ce62ef833523fa4b917a3f619c60be26998048159b3caa10bf80e94cc2ec8cc
-DIST libpeas-1.4.0.tar.xz 521044 SHA256 d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6 SHA512 77d1892f48b6cdbe4979ca8524e7305589a2cc33785a71e29f5bf28572041082417072e3f5f694e76178b3985ffe9490fc9d9f32c69d340be5eab59a0832f984 WHIRLPOOL 9ca1a59eb34cb4b7099927c74ba53dd258d63361ee28de155fbb670e39cca5e7d70baee52535180605dae62ea738fcd6090d332886c6afc9af94122f04babb54
 DIST libpeas-1.6.0.tar.xz 521520 SHA256 23c1385cba2e32201588c988ea6894b27a115efc01cb4acb927e984456ffd63c SHA512 e6b0bc9c8efe954dbf30fe8363d8e45224c03f53b64d41a217d9aee6f29e4e7a826877bd392dea5d555ce339cc91fc730d8ccd986fa3d78468cdf0b70878380c WHIRLPOOL 22f8f44fa8868444f523a848bbcea045cc3408f61d7d38bfd5243b38d26d52a4d3e4d7ba647f30e4990bf49900e0ecbe1210659e32cc5b25ebcd50d32dc4768e
-EBUILD libpeas-1.2.0-r1.ebuild 1937 SHA256 7af59aee0134d60c9c853081f90ed1d6591253dce893e5d6ba03d88e6cd47546 SHA512 66dabdf3c76bed5acfac71bc4b819f96bc88b5e0e8d80c29ccdff8f93f6ec0b14d85bae431f49259aea415c6851a8d5026fa01c19baea8a6d56615a2d1e4f8fe WHIRLPOOL a41a8e9022d02134ad0e4ed6295311a6f10995a332c5b46875c564762b3cdea7c964e785828b8090dd782023d44349d87fb3bb5d60524dc246a0b3e0d6e1b81c
-EBUILD libpeas-1.4.0-r1.ebuild 2158 SHA256 539ebac6f5d55d06f0f25c891f6f7898f48e2549183c4ded6ebc4467d01630db SHA512 77dbe2e2e09ab0503a1685a4a30efac620987ff2118983fc9ad45dad8facc5cf59b824ff29a01418a7b5f71fe3396fc373a114809fb8f4dcf80d32aa791bd81c WHIRLPOOL da81f413ef374c31fea5ec47955527b830380be75e6c119c7a6db779df1837faeff7c3d69e61d1c91aecd8a1d28ec315dd2cd97e91190b5d3b05bb4f7c7b2ca7
+DIST libpeas-1.6.1.tar.xz 523800 SHA256 7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39 SHA512 8160730bd6f97e1e9d01c497c9053e5f070a7f555fa0c073a5f257220b9525a65a94ced2651ca3897bf0f2a0915082fc10915aad67906cf3afff9c8734de7f38 WHIRLPOOL 68e87c21580a962d4cf0d8f00358a8d94e25465fde3c55b34821b43faeb7eb869733558a4c6837f1a25cd9319bf7a0ad41d240c0e80590958a754414044e421c
 EBUILD libpeas-1.6.0.ebuild 1977 SHA256 3b0f294678623928cfb1f89eaf9cd83eb3e66e9a8213ffc6292866ba94ed37d3 SHA512 fe37d28a8623a7440b6bada3aec9191fa44a2c6b9ae5bd0aeccba4a973da8aac78adc212d36ad6c11a6cbb1c43081a6175460b9f26d7d40fdc152a48bb51adc7 WHIRLPOOL b9fbd6780c59267db9fc4df0afd224dcadc575fbf6c9cf3db09a0d1340e05f92f28033a8be79188f9120c495a9b83c6c0e007d1227f6112a3bd7c2f20d137425
-MISC ChangeLog 1631 SHA256 9378b798360477ab7577528eb4d079728beb876bb8a6d720aef167f28749d862 SHA512 305efb21e4ae9029c0fdd2c8f47b5957e7541432a26594c5c0c72f02d658cd7373477859a68c6598184dff7b279d616f5b74695a256bbd97c57630b8d944df86 WHIRLPOOL 1a16580da765ed80099c261eb8b2bc707be98c231e2f98cc1933547d54671a99b7caaf825558247398fb8ce5f7acd5bee2450f7417b936d6bc3be8ee47efe95f
-MISC metadata.xml 620 SHA256 4e7d5a8ee528a66e66dedb86ea1789a60b865c4c35429a389f2ae7ffc69faec2 SHA512 5f516444c914a76974d8761a445db0a715bfc78d044b7e19a39bbe338a3df56bcc25249178215ebd76da79751ab33c21482284c4a37bc3825849e8439fd17539 WHIRLPOOL 78039cbdd84139583a6e2799abec6a8eb6dc57d6b695b1269854809988b3fe5673aebec8f0cf1935c89401981c549f936987d93de09771f148a809380b32ec1a
+EBUILD libpeas-1.6.1.ebuild 1957 SHA256 3ba05310efdb9f879fcdbef4b3b0130f6ffe32359f1f41abc24c94e6f39699b6 SHA512 7a251492e3d380c71fe18d5125f2072144afa1e0776fbab52c64c48c2eb21a45b387f7ae8d9d3bb948277b16a79ee8a90b4f7591c278d2d158ed1118baf1ff00 WHIRLPOOL 0e7332466f80f4b3a3a0a4bf570b87faeeabff83c678771f0125069556b898bbaed8763bcd910bc733e95c55ef897eb484067da7b555d9e6a2b489190635d8ba
+MISC ChangeLog 1821 SHA256 e9a7c27b5d23cd16f736b49237d1aa0dd58596117b9f5e709eee8a79dc27d245 SHA512 bede9d61184c153dc90397081f9e3989f64c6af852cbb34fb6370f8982f11648b942a19284fea75bfaf22e1e8e623cd948a9c824dc742464d5fd76a01ae57139 WHIRLPOOL 9a3a18df381e3b19ec722feadcd8ad462f49c528514a47eb4218ac9383ad6c046c4796942cb4abeb46f9f123deea3ac70d1a8e878f72c7cf8310213215c96566
+MISC metadata.xml 531 SHA256 51dd5faefa5c4d563cd93744c74166cd21b2fbaba1ddb8b64239c25d53962c21 SHA512 237be10858c63fd7e3c335692ca2276b3b2062b52b30de2bcc99cfbcb0fb2d059cf8facebc65a1aecd0bf9a3092c51e1cc287d35cc13f52b5b5e8d11bdbf877c WHIRLPOOL 3375f4b5fad86a6ecc774b4071c7c637a01d58ee1305210c56a5d7f5dca0b76cd183f285348366b80c202c0f5b5c42d6bd7c5c7c3d6501a414a2481e142efb48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQZ/adAAoJEJ0WA1zPCt1hQ0gH/ikV9XP1GXMz4Ab3jFeNCnmk
-ZrB+Hib433V3CEJSdJhYCb18hqeptUaiJ9KWqaV6J7wEK9KG5w0kOjdgKURRw9Lc
-bHPBnBBU5/gsxwtVX7vHIhxe7XwWUV+xqV+lmtOEe28JtF/TudffCQZTIoEWjt4J
-Zd8l5132m8NWGyUzKzyiNxpSbuR79UYWghz+caeYwbD8B8E9Uns30gtuScTseApY
-ufOIMqNd4fGRevf9rn84WUULPLH12dd0MbgxBJVGDcp4975uEcvlGnUA5+6YDomp
-Pe6MEJ7mhsXL8Yp7LSSAiykCb1a+gEA3aOyWqpVjxXL91VnZ4nGu9vxuM1c7gj8=
-=Lh06
+iEYEAREIAAYFAlCCSM0ACgkQCaWpQKGI+9SFvACggOeu+1AibPVRISMNy1YseDlW
+dtYAniauNWB3VmkLulYGgZpjICoQ4Ylh
+=Uq3k
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpeas/libpeas-1.2.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.2.0-r1.ebuild
deleted file mode 100644
index 7057f1e32f2d..000000000000
--- a/dev-libs/libpeas/libpeas-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.2.0-r1.ebuild,v 1.3 2012/09/30 07:36:54 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2 python virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="doc gjs +gtk glade +python seed vala"
-KEYWORDS="~amd64 ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-
-RDEPEND=">=dev-libs/glib-2.23.6:2
-	>=dev-libs/gobject-introspection-0.10.1
-	gjs? ( >=dev-libs/gjs-1.29.16 )
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	gtk? ( >=x11-libs/gtk+-2.91.1:3[introspection] )
-	python? ( >=dev-python/pygobject-3.0.0:3 )
-	seed? ( >=dev-libs/seed-2.91.91 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.11 )
-	vala? ( >=dev-lang/vala-0.11.1:0.12 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable gjs)
-		$(use_enable glade glade-catalog)
-		$(use_enable gtk)
-		$(use_enable python)
-		$(use_enable seed)
-		$(use_enable vala)
-		VALAC=$(type -P valac-0.12)
-		--disable-deprecation
-		--disable-static"
-	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
-	# What do we do about gdb, valgrind, gcov, etc?
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Upstream patch to fix g-i annotations; prevents crashes
-	epatch "${FILESDIR}/${P}-PeasPluginInfo-annotation.patch"
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
-	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
-	# To reproduce:
-	# >>> from gi.repository import Gtk
-	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
-	# This should return True, it returns False for Xvfb
-	Xemake check
-}
diff --git a/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.6.1.ebuild
index 79cd7e813780..1b9b2951ddd7 100644
--- a/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.6.1.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/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild,v 1.3 2012/09/30 07:36:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.6.1.ebuild,v 1.1 2012/10/20 06:46:36 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -10,50 +10,43 @@ PYTHON_DEPEND="python? 2:2.5"
 inherit eutils gnome2 multilib python virtualx
 
 DESCRIPTION="A GObject plugins library"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="doc gjs +gtk glade +python seed vala"
+IUSE="gjs +gtk glade +python seed"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
-RDEPEND=">=dev-libs/glib-2.31.2:2
+RDEPEND=">=dev-libs/glib-2.32:2
 	>=dev-libs/gobject-introspection-0.10.1
 	gjs? ( >=dev-libs/gjs-1.31.11 )
 	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	gtk? ( >=x11-libs/gtk+-2.91.1:3[introspection] )
+	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
 	python? ( >=dev-python/pygobject-3.0.0:3 )
 	seed? ( >=dev-libs/seed-2.91.91 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.11 )
-	vala? ( >=dev-lang/vala-0.11.1:0.12 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
+	>=sys-devel/gettext-0.17"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+
 	G2CONF="${G2CONF}
 		$(use_enable gjs)
 		$(use_enable glade glade-catalog)
 		$(use_enable gtk)
 		$(use_enable python)
 		$(use_enable seed)
-		$(use_enable vala)
-		VALAC=$(type -P valac-0.12)
 		--disable-deprecation
 		--disable-static"
 	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
 	# What do we do about gdb, valgrind, gcov, etc?
 
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# In next release, bug #415961
-	epatch "${FILESDIR}/${P}-pkgconfig.patch"
-
 	use python && python_clean_py-compile_files
 	gnome2_src_prepare
 }
diff --git a/dev-libs/libpeas/metadata.xml b/dev-libs/libpeas/metadata.xml
index 87ac1eefb12d..44e6eebe0612 100644
--- a/dev-libs/libpeas/metadata.xml
+++ b/dev-libs/libpeas/metadata.xml
@@ -10,7 +10,5 @@
 			plugins</flag>
 		<flag name="seed">Build support for loading JavaScript plugins using
 			<pkg>dev-libs/seed</pkg></flag>
-		<flag name="vala">Build support for loading <pkg>dev-lang/vala</pkg>
-			plugins</flag>
 	</use>
 </pkgmetadata>