Version bump, including most of our patches.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

3 files changed, 147 insertions, 5 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index e915781f8e44..65835e0080c4 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.175 2011/03/26 20:21:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.176 2011/06/03 15:50:19 pacho Exp $
+
+*libgsf-1.14.21 (03 Jun 2011)
+
+  03 Jun 2011; Pacho Ramos <pacho@gentoo.org> +libgsf-1.14.21.ebuild:
+  Version bump, including most of our patches.
 
 *libgsf-1.14.20 (26 Mar 2011)
 
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 4fba41d93c79..bd8dc36f8269 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -7,14 +7,16 @@ AUX libgsf-1.14.19-missing-declaration.patch 681 RMD160 6eb01d9991e2609dd8505701
 DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 RMD160 cdf17b11dea5da26cc9a17fff953480ee1c39a0f SHA1 e0403cd21c59e305ae26e2d511740a9b1ea17be1 SHA256 d392f4cdb99f398ffb67674a2f0e64debcc4574f5ea203c1c25e91532fce894f
 DIST libgsf-1.14.19.tar.bz2 592483 RMD160 6f18ea6dd19431d5af9044aac88a39bb84e04556 SHA1 125dac2939f9ecc8041c5cb5cbf74a00fd14b6ca SHA256 8cf82ce95ef97e61bae02099d2f39e4d814747b546899b7c28a695e15391b56c
 DIST libgsf-1.14.20.tar.bz2 594933 RMD160 10477305a883681273b9f680d56484c6d289cc5d SHA1 d172b454c1b98f9c111df11e000b1ced050bdac9 SHA256 df82cd86e472a6f8e566976eb7eb8f587aac2639c1448b14b4dbf4db7da1ada6
+DIST libgsf-1.14.21.tar.bz2 597463 RMD160 168c0200fde9792bd8c7937d1c83f3af9c8c0193 SHA1 17981f238f1f8dddb7af01c161bd6a1c4d5e85d2 SHA256 eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db
 EBUILD libgsf-1.14.19.ebuild 3434 RMD160 576ca18e1398a89b06ede5f040fce59af367d6a8 SHA1 608c6baa65fab853bfa8fd423eb33fa4dc18420f SHA256 b8014e02f87ce415a4bf6241440e0aed61fd48f60e95076b55a150cb1db4c58d
 EBUILD libgsf-1.14.20.ebuild 3518 RMD160 fd69c9b823b6dabe32d728a979c81eed323a81ef SHA1 4b5474c714996c0d0fbd4df383e44e0cf073004c SHA256 2c377c0a3277fd842ed8e98b2dc80b11e0d586e4197d9acdb14b5c2a972aa529
-MISC ChangeLog 22193 RMD160 8c5b6b548bbd24cdf027b503dc11878979058809 SHA1 958c3a6ce8971ba2d3a5513d77bc65a135af3245 SHA256 473b50dc0e32d8ecb9fbc06e7e1b1c935f294043a8e810fe8e308567d54eef9b
+EBUILD libgsf-1.14.21.ebuild 3137 RMD160 a5ac9fb33ab32e1b0ec3d5ec02af40722897246a SHA1 a60c11e6bcefb50ad967ffed2f0e0f9aaba05d10 SHA256 fbd7625e7e778e8bae6c57018e417404f92f645013d72fa8bce932bd31200f56
+MISC ChangeLog 22342 RMD160 3c9598463b24a7cda524c8dcf57db88afb65b1c7 SHA1 00b5f5aa5a95114ef58efa6f297dc9cb7a50a5b1 SHA256 00318f1f06d0b37aaecffe9a0ed0e143bab7993c2c3167c77073ef749dc70652
 MISC metadata.xml 304 RMD160 266992ac9d503bb80b31164d13d394853fb72bcc SHA1 97b443e72047a31c18a881dd95cc0034a02c6fc0 SHA256 97dcc056bc6ee681e66294ff87260cba35805a12db640f00c08b8ee3f7e96005
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2OStcACgkQCaWpQKGI+9T67wCeOz8XXAYLEIiqvcir7IInorHR
-3QMAoIO7SuQ20vZXcDtlq4kslhn68SEP
-=Kfgl
+iEYEARECAAYFAk3pAsEACgkQCaWpQKGI+9Qm7ACfe3le9qDerw1R9+xnhaM59tHl
+aA0AmgPwNOA4iskjDnd/X/Bt78SzzAUN
+=SMX4
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgsf/libgsf-1.14.21.ebuild b/gnome-extra/libgsf/libgsf-1.14.21.ebuild
new file mode 100644
index 000000000000..b15d396cd997
--- /dev/null
+++ b/gnome-extra/libgsf/libgsf-1.14.21.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.21.ebuild,v 1.1 2011/06/03 15:50:19 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="python? 2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
+
+inherit autotools eutils gnome2 python multilib
+
+DESCRIPTION="The GNOME Structured File Library"
+HOMEPAGE="http://projects.gnome.org/libgsf/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gnome-mplayer-0.9.6-gconf-2.m4.tgz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc gnome gtk python thumbnail"
+
+RDEPEND="
+	>=dev-libs/glib-2.16:2
+	>=dev-libs/libxml2-2.4.16:2
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	gnome? ( >=gnome-base/libbonobo-2 )
+	gtk? ( x11-libs/gtk+:2 )
+	python? (
+		>=dev-python/pygobject-2.10:2
+		>=dev-python/pygtk-2.10:2 )
+	thumbnail? ( >=gnome-base/gconf-2:2 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35.0
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+PDEPEND="gnome? ( || (
+	media-gfx/imagemagick
+	media-gfx/graphicsmagick[imagemagick] ) )"
+
+pkg_setup() {
+	DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+	G2CONF="${G2CONF}
+		--with-gio
+		--disable-static
+		$(use_with bzip2 bz2)
+		$(use_with gnome gnome-vfs)
+		$(use_with gnome bonobo)
+		$(use_with python)
+		$(use_with gtk gdk-pixbuf)
+		$(use_with thumbnail gconf)"
+
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	cp "${WORKDIR}/gnome-mplayer-0.9.6-gconf-2.m4" m4/ \
+		|| die "failed to copy gconf macro"
+
+	# Python bindings are built/installed manually.
+	sed -e "/SUBDIRS += python/d" -i Makefile.am
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+src_compile() {
+	gnome2_src_compile
+
+	if use python; then
+		python_copy_sources python
+
+		building() {
+			emake \
+				PYTHON_INCLUDES="-I$(python_get_includedir)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir python building
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		installation() {
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_execute_function -s --source-dir python installation
+
+		python_clean_installation_image
+	fi
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libgsf-1.so.1
+	preserve_old_lib /usr/$(get_libdir)/libgsf-gnome-1.so.1
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use python; then
+		python_mod_optimize gsf
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-1.so.1
+	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-gnome-1.so.1
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if use python; then
+		python_mod_cleanup gsf
+	fi
+}