Bump, update license, drop old.

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

5 files changed, 57 insertions, 33 deletions

diff --git a/dev-libs/libpeas/ChangeLog b/dev-libs/libpeas/ChangeLog
index 914bd28ed663..78f4508f5f8f 100644
--- a/dev-libs/libpeas/ChangeLog
+++ b/dev-libs/libpeas/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2012/08/13 18:41:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.7 2012/09/30 07:36:54 tetromino Exp $
+
+*libpeas-1.6.0 (30 Sep 2012)
+
+  30 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libpeas-1.6.0.ebuild, -libpeas-1.0.0.ebuild, libpeas-1.2.0-r1.ebuild,
+  libpeas-1.4.0-r1.ebuild:
+  Bump, update license, drop old.
 
   13 Aug 2012; Anthony G. Basile <blueness@gentoo.org> libpeas-1.4.0-r1.ebuild:
   Keyword ~ppc, bug #385237
@@ -36,4 +43,3 @@
   16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +libpeas-1.0.0.ebuild,
   +metadata.xml:
   Move from gnome overlay for GNOME 3
-
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 5b84d1a4c987..c6b088807a95 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -3,18 +3,22 @@ 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.0.0.tar.bz2 598820 SHA256 b1482690565241baf3870311a77efb3f89a4335f48cb4ca31e8b8405220a8d99 SHA512 8c3217b3ba2e321c4d87123d857e90179c7ad02e3dcfff49c31bb712f6f0c2301f238164fab6ef624f7c87dda4b1c5a226854743312cd6f4a46f60640d546485 WHIRLPOOL d12eadedef08d2e5b5fb815568cf559af2fbf5d156e99eab71e306d6c95afc2ae9a6a69ae975e4052f923697e09a6188bb5dbb43e56ec627a98d96cbcdd3ef64
 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
-EBUILD libpeas-1.0.0.ebuild 1680 SHA256 af84e27bbe7f5ec0dd36d217f5e62d9d69a7916cb77dc02d31e8b3872e99af26 SHA512 f9a9d298275bf9e285776afe7a588c86f1c7fac0becaa12ab4be0788f43340b40fea81cfae92d6a519c8c0801bf09a7021fdce27ce26a89f9ebed82734f4d51c WHIRLPOOL 33e009e3db4b51afa0c6116853b69b8f855192dc2a2a386a8a98b4626db1bd4744138b664d972dd479d393ca2cdffaf4b225d62c7044973860806c419296a3c7
-EBUILD libpeas-1.2.0-r1.ebuild 1935 SHA256 5f6ee0ad70b0601bae05357a415d63e0039431446745e071149ffead4ccffff4 SHA512 b15f620423e49a3640340f187c8ff321247cbf571a1fc556d86c252e5d76ee5d4089f32d969ab77ae2f5cf02255a849c2a7a594e3c5538c653612e1bb5f2595c WHIRLPOOL 1acee6c9a450c59e9ddcd8a686c27b77e3a6966823ae45e31e9c9e7c0d3a5085f58b73495c5966832306bb5c03ce151dd3e776bc5a80cbfc1d7c90c38cfde46d
-EBUILD libpeas-1.4.0-r1.ebuild 2156 SHA256 16e3f22be0f0f5e41728e231678a4443dfaba29a7084c1fda1c6918331ae6f6b SHA512 42ede6189002bd887c868288c9bb2e9ea5c4f4377efc499ac8127a0fb1f7fd40d2f8952856a9b8db76a0b50173defaa4eee02bc86171c199938acf7af396d9bf WHIRLPOOL e67e7485cb931a31c04186475e0b2118cf8b5b6e6ec8cc6e1092937ed21efaa338489079f9f02771d523fe50d40e1c1a049d7942cc193f56cb967cfaebeacf73
-MISC ChangeLog 1407 SHA256 70076d393a3d9d6eca7c0b85a58b4759f8f58aa48010e7dd32a3c5d9f86cb4de SHA512 33d651cd7e60c8c78cf01d026187d71aa27224cdb0eca2ed12cbbe15400eef87bdf2da5d56511541dc7ceabea5ddcb574730c2b68cd9f6a76484cae33f094f42 WHIRLPOOL 3721032b7daf038a369c0397a928e2f7eeca2a11dd347738aeb58705f0b01cebba8c23e6bf8d64cd8ab6c6c5715a94187378192b13ea75867ec5ef5704c63ee2
+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
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlApSnIACgkQl5yvQNBFVTXsOACgm8Zi2vmgiihVpLcsSgfrwHDv
-b4MAn3JoC5S5s58KL2R17XD1cGqXTtvV
-=7EEJ
+iQEcBAEBCAAGBQJQZ/adAAoJEJ0WA1zPCt1hQ0gH/ikV9XP1GXMz4Ab3jFeNCnmk
+ZrB+Hib433V3CEJSdJhYCb18hqeptUaiJ9KWqaV6J7wEK9KG5w0kOjdgKURRw9Lc
+bHPBnBBU5/gsxwtVX7vHIhxe7XwWUV+xqV+lmtOEe28JtF/TudffCQZTIoEWjt4J
+Zd8l5132m8NWGyUzKzyiNxpSbuR79UYWghz+caeYwbD8B8E9Uns30gtuScTseApY
+ufOIMqNd4fGRevf9rn84WUULPLH12dd0MbgxBJVGDcp4975uEcvlGnUA5+6YDomp
+Pe6MEJ7mhsXL8Yp7LSSAiykCb1a+gEA3aOyWqpVjxXL91VnZ4nGu9vxuM1c7gj8=
+=Lh06
 -----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
index 4f26005d2e43..7057f1e32f2d 100644
--- a/dev-libs/libpeas/libpeas-1.2.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.2 2011/12/01 17:31:42 darkside Exp $
+# $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"
@@ -12,7 +12,7 @@ inherit eutils gnome2 python virtualx
 DESCRIPTION="A GObject plugins library"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="LGPL-2"
+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"
diff --git a/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild
index 69896acb17e3..79cd7e813780 100644
--- a/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.4.0-r1.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.2 2012/08/13 18:41:54 blueness Exp $
+# $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 $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2 multilib python virtualx
 DESCRIPTION="A GObject plugins library"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="doc gjs +gtk glade +python seed vala"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
diff --git a/dev-libs/libpeas/libpeas-1.0.0.ebuild b/dev-libs/libpeas/libpeas-1.6.0.ebuild
index bf1aaeb3728d..ce77a2d2a011 100644
--- a/dev-libs/libpeas/libpeas-1.0.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.6.0.ebuild
@@ -1,51 +1,55 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0.0.ebuild,v 1.2 2011/08/16 19:03:57 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.6.0.ebuild,v 1.1 2012/09/30 07:36:54 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit gnome2 python virtualx
+inherit eutils gnome2 multilib python virtualx
 
 DESCRIPTION="A GObject plugins library"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="doc +gtk glade python seed vala"
-KEYWORDS="~amd64 ~x86"
+IUSE="doc gjs +gtk glade +python seed"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
-RDEPEND=">=dev-libs/glib-2.23.6: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.90:3[introspection] )
-	python? ( >=dev-python/pygobject-2.28:2[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 )"
+	doc? ( >=dev-util/gtk-doc-1.11 )"
 
 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-static
-		--disable-maintainer-mode
-		--disable-gtk2-test-build"
+		--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() {
+	use python && python_clean_py-compile_files
+	gnome2_src_prepare
 }
 
 src_test() {
@@ -55,5 +59,15 @@ src_test() {
 	# >>> from gi.repository import Gtk
 	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
 	# This should return True, it returns False for Xvfb
-	Xemake check || die
+	Xemake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use python && python_mod_optimize /usr/$(get_libdir)/peas-demo
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use python && python_mod_cleanup /usr/$(get_libdir)/peas-demo
 }