Version bump, drop old.

(Portage version: 2.1.11.24/cvs/Linux x86_64)

4 files changed, 20 insertions, 91 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/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>