Version bump fixing bug 292211

(Portage version: 2.1.7.17/cvs/Linux x86_64)

4 files changed, 17 insertions, 60 deletions

diff --git a/x11-libs/gtk+extra/ChangeLog b/x11-libs/gtk+extra/ChangeLog
index c9d4d977a3e5..68ebe5c567fa 100644
--- a/x11-libs/gtk+extra/ChangeLog
+++ b/x11-libs/gtk+extra/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/gtk+extra
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.21 2008/05/31 13:13:56 remi Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.22 2010/03/27 10:58:01 pacho Exp $
+
+*gtk+extra-2.1.2 (27 Mar 2010)
+
+  27 Mar 2010; Pacho Ramos <pacho@gentoo.org> -gtk+extra-2.1.1.ebuild,
+  -gtk+extra-2.1.1-r1.ebuild, -gtk+extra-2.1.1-r2.ebuild,
+  +gtk+extra-2.1.2.ebuild:
+  Version bump including gtk+-2.18 and SIGSEGV fixes, documentation added.
+  Thanks to Robert Pearce and Joop Stakenborg in bug 292211 for their
+  investigation regarding upstream updates. This also sets GCONF_DEBUG=no
+  due to missing --enable-debug configure option. Cleaning old versions
 
 *gtk+extra-2.1.1-r2 (31 May 2008)
 
diff --git a/x11-libs/gtk+extra/gtk+extra-2.1.1-r2.ebuild b/x11-libs/gtk+extra/gtk+extra-2.1.1-r2.ebuild
deleted file mode 100644
index baf5123cc4cd..000000000000
--- a/x11-libs/gtk+extra/gtk+extra-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.1-r2.ebuild,v 1.1 2008/05/31 13:13:56 remi Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Useful Additional GTK+ widgets"
-HOMEPAGE="http://gtkextra.sourceforge.net"
-SRC_URI="mirror://sourceforge/scigraphica/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.0
-		>=dev-libs/glib-2.0"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog INSTALL README"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# patches to fix segfaults, see bug #219777
-	epatch "${FILESDIR}/${PN}-2.1.1-glib2.10-full-fix.patch"
-	epatch "${FILESDIR}/${PN}-2.1.1-fix-row-deletion-segfault.patch"
-}
diff --git a/x11-libs/gtk+extra/gtk+extra-2.1.1.ebuild b/x11-libs/gtk+extra/gtk+extra-2.1.1.ebuild
deleted file mode 100644
index 2dd0bccb89cc..000000000000
--- a/x11-libs/gtk+extra/gtk+extra-2.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.1.ebuild,v 1.8 2007/02/13 11:50:18 corsair Exp $
-
-inherit gnome2
-
-DESCRIPTION="Useful Additional GTK+ widgets"
-HOMEPAGE="http://gtkextra.sourceforge.net"
-SRC_URI="mirror://sourceforge/scigraphica/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.0
-		>=dev-libs/glib-2.0"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog INSTALL README"
diff --git a/x11-libs/gtk+extra/gtk+extra-2.1.1-r1.ebuild b/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild
index 8704aba66bd7..41df9058bb45 100644
--- a/x11-libs/gtk+extra/gtk+extra-2.1.1-r1.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.1-r1.ebuild,v 1.1 2007/01/09 07:19:56 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild,v 1.1 2010/03/27 10:58:01 pacho Exp $
+
+GCONF_DEBUG="no"
 
 inherit gnome2 eutils
 
 DESCRIPTION="Useful Additional GTK+ widgets"
 HOMEPAGE="http://gtkextra.sourceforge.net"
-SRC_URI="mirror://sourceforge/scigraphica/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gtkextra/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,8 +21,3 @@ DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
 DOCS="AUTHORS ChangeLog INSTALL README"
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}/${P}-glib2.10.patch"
-}