Bump, update license, drop old.

(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)

4 files changed, 45 insertions, 25 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/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
 }