Clean up old revisions. Clean up keywords of older revisions. Clean up USE=gtk3 from metadata.xml.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

5 files changed, 10 insertions, 109 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 3455d7a5cb95..6711c36d5c84 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.299 2013/03/29 13:34:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.300 2013/03/29 19:45:34 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -librsvg-2.34.2.ebuild,
+  librsvg-2.36.1.ebuild, librsvg-2.36.3.ebuild, metadata.xml:
+  Clean up old revisions. Clean up keywords of older revisions. Clean up
+  USE=gtk3 from metadata.xml.
 
   29 Mar 2013; Agostino Sarubbo <ago@gentoo.org> librsvg-2.36.4.ebuild:
   Stable for ia64, wrt bug #458984
diff --git a/gnome-base/librsvg/librsvg-2.34.2.ebuild b/gnome-base/librsvg/librsvg-2.34.2.ebuild
deleted file mode 100644
index 2d5cd2c2e4f9..000000000000
--- a/gnome-base/librsvg/librsvg-2.34.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.2.ebuild,v 1.16 2012/05/05 05:38:09 jdhore Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2"
-
-inherit gnome2 multilib eutils autotools python
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="http://librsvg.sourceforge.net/"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +gtk gtk3 +introspection tools"
-
-RDEPEND=">=media-libs/fontconfig-1.0.1
-	>=media-libs/freetype-2
-	>=dev-libs/glib-2.24:2
-	>=x11-libs/cairo-1.2
-	>=x11-libs/pango-1.10
-	>=dev-libs/libxml2-2.4.7:2
-	>=dev-libs/libcroco-0.6.1
-	x11-libs/gdk-pixbuf:2[introspection?]
-	gtk? ( >=x11-libs/gtk+-2.16:2 )
-	gtk3? ( >=x11-libs/gtk+-2.90.0:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
-
-	>=dev-util/gtk-doc-am-1.13"
-# >=dev-util/gtk-doc-am-1.13 and gobject-introspection needed by eautoreconf
-
-pkg_setup() {
-	# croco is forced on to respect SVG specification
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable tools)
-		$(use_enable gtk gtk-theme)
-		$(use_enable introspection)
-		--with-croco
-		--enable-pixbuf-loader"
-	use gtk && ! use gtk3 && G2CONF+=" --with-gtk=2.0"
-	use gtk && use gtk3 && G2CONF+=" --with-gtk=both"
-	! use gtk && use gtk3 && G2CONF+=" --with-gtk=3.0 --enable-gtk-theme"
-
-	DOCS="AUTHORS ChangeLog README NEWS TODO"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix automagic gtk+ dependency, bug #371290
-	epatch "${FILESDIR}/${PN}-2.34.0-automagic-gtk.patch"
-
-	# bug #391215, https://bugzilla.gnome.org/show_bug.cgi?id=664684
-	epatch "${FILESDIR}/${PN}-2.34.2-gir-filename.patch"
-
-	# introspection.m4 needed for eautoreconf
-	mv "${WORKDIR}/introspection.m4" "${S}"/ || die
-
-	AT_M4DIR="." eautoreconf
-
-	python_convert_shebangs -r 2 .
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	tmp_file=$(mktemp -t tmp.XXXXXXXXXXlibrsvg_ebuild)
-	# be atomic!
-	gdk-pixbuf-query-loaders > "${tmp_file}"
-	if [ "${?}" = "0" ]; then
-		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-	else
-		ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
-	fi
-	rm "${tmp_file}"
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	tmp_file=$(mktemp -t tmp.XXXXXXXXXXlibrsvg_ebuild)
-	# be atomic!
-	gdk-pixbuf-query-loaders > "${tmp_file}"
-	if [ "${?}" = "0" ]; then
-		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-	else
-		ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
-	fi
-	rm "${tmp_file}"
-}
diff --git a/gnome-base/librsvg/librsvg-2.36.1.ebuild b/gnome-base/librsvg/librsvg-2.36.1.ebuild
index fa9396b33014..e1eee3873c35 100644
--- a/gnome-base/librsvg/librsvg-2.36.1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.36.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.1.ebuild,v 1.13 2013/03/03 09:18:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.1.ebuild,v 1.14 2013/03/29 19:45:34 eva Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -14,7 +14,7 @@ SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="s390 sh sparc"
 IUSE="doc +gtk +introspection tools"
 
 RDEPEND=">=dev-libs/glib-2.24:2
diff --git a/gnome-base/librsvg/librsvg-2.36.3.ebuild b/gnome-base/librsvg/librsvg-2.36.3.ebuild
index 2ce668ed9ff0..55c85de0939d 100644
--- a/gnome-base/librsvg/librsvg-2.36.3.ebuild
+++ b/gnome-base/librsvg/librsvg-2.36.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.3.ebuild,v 1.5 2013/03/03 09:18:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.3.ebuild,v 1.6 2013/03/29 19:45:34 eva Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -15,7 +15,7 @@ HOMEPAGE="http://librsvg.sourceforge.net/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha"
 IUSE="doc +gtk +introspection tools vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml
index 3f9c04a39d1c..1bfb1b1f8fa4 100644
--- a/gnome-base/librsvg/metadata.xml
+++ b/gnome-base/librsvg/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="gtk3">Build with gtk+-3 support</flag>
 	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
 	introspection</flag>
 	<flag name="tools">Build miscellaneous tools</flag>