Version bump, remove old.

(Portage version: 2.1.10.51/cvs/Linux x86_64)

3 files changed, 13 insertions, 81 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index c36e0db5a86d..ef156846d0e8 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.153 2012/03/25 16:14:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.154 2012/03/27 08:33:13 pacho Exp $
+
+*glade-3.8.2 (27 Mar 2012)
+
+  27 Mar 2012; Pacho Ramos <pacho@gentoo.org> +glade-3.8.2.ebuild,
+  -glade-3.10.0-r1.ebuild, -glade-3.8.0.ebuild:
+  Version bump, remove old.
 
   25 Mar 2012; Raúl Porcel <armin76@gentoo.org> glade-3.8.1.ebuild,
   glade-3.10.2.ebuild:
diff --git a/dev-util/glade/glade-3.10.0-r1.ebuild b/dev-util/glade/glade-3.10.0-r1.ebuild
deleted file mode 100644
index 03684791e487..000000000000
--- a/dev-util/glade/glade-3.10.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.10.0-r1.ebuild,v 1.7 2011/10/30 17:41:42 armin76 Exp $
-
-EAPI="2"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-
-inherit gnome2 versionator
-
-DESCRIPTION="GNOME GUI Builder"
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="3.10"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc +introspection python"
-
-RDEPEND=">=x11-libs/gtk+-3.0.2:3
-	>=dev-libs/libxml2-2.4.0:2
-	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )
-	python? ( >=dev-python/pygobject-2.27.0:2 )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.41.0
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/gettext-0.17
-	>=app-text/gnome-doc-utils-0.18
-	app-text/docbook-xml-dtd:4.1.2
-	doc? ( >=dev-util/gtk-doc-1.13 )
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-static
-		--enable-libtool-lock
-		--disable-scrollkeeper
-		$(use_enable introspection)
-		$(use_enable python)"
-}
-
-src_prepare() {
-	# to avoid file collision with glade:3, rename GNOME help module from
-	# glade to glade-3.10, and gladeui documentation from gladeui to gladeui-2
-	local i
-	sed -e 's:DOC_MODULE = glade:DOC_MODULE = glade-3.10:' -i help/Makefile.in \
-		|| die "sed of help/Makefile.in failed"
-	sed -e 's:/glade.xml:/glade-3.10.xml:g' -i help/*/*.po \
-		|| die "sed of help .po files failed"
-	for i in help/*/glade.xml ; do
-		mv ${i} ${i/glade/glade-3.10} || die "mv ${i} failed"
-	done
-	sed -e 's:DOC_MODULE = gladeui:DOC_MODULE = gladeui-2:' -i doc/Makefile.in \
-		|| die "sed of doc/Makefile.in failed"
-	for i in doc/gladeui-* doc/gladeui.* ; do
-		mv ${i} ${i/gladeui/gladeui-2} || die "mv ${i} failed"
-	done
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	gnome2_src_install
-}
diff --git a/dev-util/glade/glade-3.8.0.ebuild b/dev-util/glade/glade-3.8.2.ebuild
index 75bfbcf21fde..ec66eb07e05c 100644
--- a/dev-util/glade/glade-3.8.0.ebuild
+++ b/dev-util/glade/glade-3.8.2.ebuild
@@ -1,8 +1,9 @@
-# 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-util/glade/glade-3.8.0.ebuild,v 1.7 2011/10/06 18:40:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.8.2.ebuild,v 1.1 2012/03/27 08:33:13 pacho Exp $
 
-EAPI="2"
+EAPI="4"
+GCONF_DEBUG="yes"
 GNOME_ORG_MODULE="glade3"
 GNOME2_LA_PUNT="yes"
 
@@ -13,11 +14,11 @@ HOMEPAGE="http://glade.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc gnome python"
 
 RDEPEND=">=dev-libs/glib-2.8:2
-	>=x11-libs/gtk+-2.20:2
+	>=x11-libs/gtk+-2.24:2
 	>=dev-libs/libxml2-2.4:2
 	gnome?	(
 		>=gnome-base/libgnomeui-2
@@ -43,11 +44,6 @@ pkg_setup() {
 		$(use_enable python)"
 }
 
-src_install() {
-	gnome2_src_install
-	find "${ED}"/usr/$(get_libdir)/glade3/modules -name "*.la" -delete
-}
-
 pkg_preinst() {
 	gnome2_pkg_preinst
 	preserve_old_lib /usr/$(get_libdir)/libgladeui-1.so.9