Version bump, drop old.

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

4 files changed, 33 insertions, 44 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 1a45d2816b70..43957ffaa47d 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.201 2012/07/15 17:54:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.202 2012/09/15 09:28:36 pacho Exp $
+
+*libgsf-1.14.24 (15 Sep 2012)
+
+  15 Sep 2012; Pacho Ramos <pacho@gentoo.org> +libgsf-1.14.24.ebuild,
+  -libgsf-1.14.21.ebuild, metadata.xml:
+  Version bump, drop old.
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org> libgsf-1.14.22.ebuild:
   alpha/ia64/sh/sparc stable wrt #410611
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index de42eb8e6204..3392bd474fcc 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libgsf-1.14.16-automake-fixes.patch 618 SHA256 db89b4a2d6614c0ed233303f12340856ff5313a536a60bc89bc9e4dec6684135 SHA512 9c8c58dee5f7ff48cb6db87d172224cf9240c20fee64ea4e656fb58ec1788ae8c827de30dc17be6a36c492e5769496005f522d6e1d7cfef9ea1b8201cf45c5dc WHIRLPOOL 9337a74218e176fcb8a0fd32eb91b170c34e8beb8269fa35168029612248c4c3e6dd4abaa8f74f4bb84f541b6210362bad03961aa984a500099505cead3859d7
 AUX libgsf-1.14.16-gconf-automagic.patch 2201 SHA256 9171232083d44e581918872f2eb3bf9b3571cde63b434caa9a04ff7c8b0c93f7 SHA512 bb50b3acce82366d57f945990156ef5d8aa1f6a538a2e12e06d017c595f487a70b3e6534f79d1025fd50ebea158989cd9ef421af91ba9c33f1ad086e2311cfdb WHIRLPOOL 4dcb290f7d729c90c8adb5632a76782c8ae17e69ee04244e57c780fe2e83968ec740e7d849b8c9fb8dc4fb584f9bf3daf9af4a3783095147d9e552a82bea6d39
 AUX libgsf-1.14.19-missing-declaration.patch 681 SHA256 8b8ef1e0fd6d8ecc61c7ef5c2ef6967bbebbe34470d4e2dadf0aea2ec467a6bd SHA512 272299b3344c7d7399fcb588675abbf3b5937109c0c3ded5671e606956ba3f01da22d6bd2e12ec185f2f21665a0d85b30354f4b6941c71c497d936d1dfcd5746 WHIRLPOOL da933ed2aeabcd001d8aadd014b7119f6694963369461b35060200956f88b14c43c42b82cfe1b2208bce9eeab31e5c8b08a4e8d86996c33cc298c6c7a1e75be6
 AUX libgsf-1.14.23-clone-identifier.patch 3688 SHA256 f563798dcc95e5980b70aa8bce298c7c7c3eeedc9a2391d01ac1db17e4e06f37 SHA512 6ecbabd85bf5a11e46d9685bf0ab5301d55ba586f18a4e1b3534a41763515c21cb3f114f6ef3df8cb6df4d77f9cf03fdf1c424a933535021b3b8134fbfe378a5 WHIRLPOOL 44974f27683b14408c013154a48ae81d1ed0ec70c9730156b66b0fa9ffbdb5fdbfcbeedfd1dba734e36e23f86d651a9e9873d5145b16ecca1077dd0a25187ca9
-DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 SHA256 d392f4cdb99f398ffb67674a2f0e64debcc4574f5ea203c1c25e91532fce894f SHA512 800d2e930f9d7164ec95cb87be684fb466f7e9b55a59c37802fbd567031816a8ea7bce40530dbf400c84dcca89c85da90d6c3b6243af0dc073d80ac35d777d1a WHIRLPOOL 7cefcb81494f5ccb2bb6cd34e78542b4bc953d44672e697a8ae7f6c153c215e940114eb4a9ca5c2cb087b1e1863630d04a7b3a56ec0e98318a8e3277f51e2cfd
-DIST libgsf-1.14.21.tar.bz2 597463 SHA256 eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db
 DIST libgsf-1.14.22.tar.xz 506188 SHA256 a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f SHA512 08371fe27db084530740240795edcaeb6f8fbbf18c76095b52364f8c78bfaf84b7dd7504958e81bbb9e2da024d237d2968fdddb9268a970059739b5414640ec0 WHIRLPOOL 2abad12710c1fa8765b75d9683527137f034e3f86bf22df4290d43896583b631e84eca7bfe9e06e4370f66575f8824032842d634fc6ee496803037cdc7d9c35a
 DIST libgsf-1.14.23.tar.xz 515136 SHA256 bfc1c6178f5319d5e6d854c380ce26542f9a103a5ff31c9d25a834e0be52fb17
-EBUILD libgsf-1.14.21.ebuild 3109 SHA256 250dd2d22a2c0878692c7ffbfd847fab55aef6293a034a8de86ea7e89d4d99d6 SHA512 ea057c7eb42fad892b3e80e425d2fc445fa78a124d2dda4d23fe74fbaa1a6d9929aaf5560b535932cf25c8391b7c1c37afe5a1b1f426184625a5a91aadab6be4 WHIRLPOOL 1d7054c02ef5f0da7a9e2017861766db261ce33bcd25f19948e10898798b5421bb04ecdd7c20368124fcdd9a4bc170fc16d78726eaf7345b5e2e6c4fa6b5bc10
+DIST libgsf-1.14.24.tar.xz 522900 SHA256 975fc00a1332167e2baf649f8e2637884f798db1c8bb04abece2d5141663abff SHA512 806cd80253c8eaf5958bd881b3fd475b0d5cab0e04e8899bf3095cd22523beff569a34f2a86b1645d9e062455c9a63adc1bfc8da6f7bfe5f7f482ddbef6407a0 WHIRLPOOL 5d4950ccbe84a39220c9c12dd74747fac1e23f4223c0ec18512e2ebc81b5c0a6111b63de279124078b11093e7bc091ed569f7bb4aa31696e453aeb1f1699ad14
 EBUILD libgsf-1.14.22.ebuild 2789 SHA256 3ec5d973aab0bfe23f1c692cc22eaf73b773d3cf893c366d0806b8130d70618a SHA512 8c39e1a44537eb9e15826525bc077b4bc85a94b8e9e9da4184f8b5191d5b235cab9e43c0b11c2ec52452c4473bc7db3b6c5871ffc2868362982bde41b55c9a4c WHIRLPOOL 96396e2f112e88725bb3afc4ed70c60afece3299f752a7476266d98225c679b83de58038dbd0dd347473462ed66d496eee987d25b92f700bbc33291375146901
 EBUILD libgsf-1.14.23.ebuild 3005 SHA256 cf6c2ac158c79e76a5f4a3f0986724b8066e79dc4197c9bd31d3dd8e13ec466a SHA512 59dca8a1a5fb4408aa2151f10ca3f8eb73648438e2169f62845d92b469fc914f6d297638fee64913fe3d75408b22bce6872ae9e8d12b096a5a4301f96a74bdce WHIRLPOOL 8f260e517bcd497a695acb9db82feb96503f9e0baecb3585b4d632c6837952125a851aef9ba926b8fec54058cd93af221fbcf7d2720e2e9e595c991fd94f2fa4
-MISC ChangeLog 25448 SHA256 16993d3cb28433cc77572cbc9e9a5a4ea51f6d65e0ef7259f4513af88a024563 SHA512 9c79517e1771daca7c830089b340dfe8e8c11738f9062030fc3238951c003d7cb9b82de79676aaeec339fa5af24cfdf089ae09c0f83f85ce3cc355c9e66fe906 WHIRLPOOL c3b6e72d9adc56ac3c4f4348d37114b154fbe68ed8c564a73ae30af783db8d83078ab641892602c61e4fb41b0cd58901b7d17f2b0b9e7293fd7aa38d7558a9fc
-MISC metadata.xml 403 SHA256 1be1454195dc641b968829a70975fa8f9897199d72017a9964be954fe19e6552 SHA512 57b723e5cfa302c6d7e2dc96ee3509b892d33d79dc62a41f0cd1c56bcd108f492a6051eb6ff9d224fa2f063d093142b787d876496a61eb16a374a96355b3d180 WHIRLPOOL dbc0fd3f4cfe5203713bbcc1b4e286a7390edbc621b652a6d06cd958ac1b04b27b898e9b72611ac2d6246827375c7f15b6dd86d4b79f9d84dc0af6ecc88d6c12
+EBUILD libgsf-1.14.24.ebuild 2822 SHA256 c667e6b018bd50737e2ed73e870d00d8c0cf3416f39ad8d9a29c78bb47f56ff4 SHA512 0c63eb424b7cebfd7d1820e709bd105ac7f12a24101d6511480c58ab423f9c9e96a3bfcdfcf99ef92a451dabf97540723d4564f8fba0dceb702237c4c0dd6b6f WHIRLPOOL 90bc357f234cad3e6114758028cb8d8fe666bcc9e05ad94775030ba52071378de818200361e1ca544718e974b2eb0e6a507eb1cf7164979348095b52caad5d0d
+MISC ChangeLog 25614 SHA256 2b235b48639b9d2e1a63f121ac8973f51ce6dc4bb00d1c3ac373bb8ada7e65b3 SHA512 b9078e867fa939f7d11c49e68abf07691a64784366ae5b0c5ffdec9c2102611fc6e91f832700ad6fe54e387de1482a2c18c3f66d85c918e388a162773026e910 WHIRLPOOL f38d87e4ff5ff03b63f15fada7f78cb4551e754b01508e9f4a5abb95263f5858022e8498d9c06ccd9335fad489a882325a924aad6b42ec14e306304af8d0a298
+MISC metadata.xml 328 SHA256 d974a1f53b321ad04ebfcba2c36ca0560af655ce57aaefb8b6fb872e26e2aa9e SHA512 9b0bd3e37b310337231ddf762cc503825d453b0229981820e21c43c24ba0e60cfcd235e7b520efb1e247713bdaa1c27fcd81c37f2a77d5c54556b585088f100a WHIRLPOOL 1665f22e64be2aa4ac405e292f5e8657edb19e1bf6b9897fbdd289d0da5ff7874706c1b1f0d2cdcc88d495dca0827de2e01a3312b2212d91f977ee6ce4960a05
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlADA/EACgkQuQc30/atMkAyiQCdFQW+IFWqtCC6K6rKUQrbQbtv
-uWAAnjd27gL2xv363zrPgv0u46rf6LL1
-=lK5q
+iEYEAREIAAYFAlBUSkoACgkQCaWpQKGI+9TtkgCfUPsYIawkGAfz67JmOm6p4l56
+3SUAn0pKlzCsNf+NnAV5iwiaIIIZd1jN
+=ZmnJ
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgsf/libgsf-1.14.21.ebuild b/gnome-extra/libgsf/libgsf-1.14.24.ebuild
index 414c70a34e74..1cb589f15c57 100644
--- a/gnome-extra/libgsf/libgsf-1.14.21.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.24.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.10 2012/05/05 02:16:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.24.ebuild,v 1.1 2012/09/15 09:28:36 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.6"
@@ -13,35 +13,28 @@ 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"
+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 gtk +introspection python"
 
-RDEPEND="
-	>=dev-libs/glib-2.16:2
+RDEPEND=">=dev-libs/glib-2.26: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 )
+	introspection? ( >=dev-libs/gobject-introspection-1.0.0 )
 	python? (
 		>=dev-python/pygobject-2.10:2
-		>=dev-python/pygtk-2.10:2 )
-	thumbnail? ( >=gnome-base/gconf-2:2 )"
+		>=dev-python/pygtk-2.10:2 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.0
 	dev-util/gtk-doc-am
+	dev-libs/gobject-introspection-common
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="gnome? ( || (
-	media-gfx/imagemagick
-	media-gfx/graphicsmagick[imagemagick] ) )"
+	doc? ( >=dev-util/gtk-doc-1.12 )"
 
 pkg_setup() {
 	DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
@@ -49,31 +42,23 @@ pkg_setup() {
 		--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)"
+		$(use_with gtk gdk-pixbuf)"
 
-	if use python; then
-		python_pkg_setup
-	fi
+	use python && python_pkg_setup
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
-	cp "${WORKDIR}/gnome-mplayer-0.9.6-gconf-2.m4" m4/ \
-		|| die "failed to copy gconf macro"
+	# Drop DEPRECATED flags
+	sed -i -e "s/ -DG_DISABLE_DEPRECATED//" configure.in configure || die
 
 	# Python bindings are built/installed manually.
-	sed -e "/SUBDIRS += python/d" -i Makefile.am
+	sed -e "/SUBDIRS += python/d" -i Makefile.am || die
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	use python && python_clean_py-compile_files
 
-	# disable pyc compiling
-	>py-compile
+	eautoreconf
+	gnome2_src_prepare
 }
 
 src_compile() {
diff --git a/gnome-extra/libgsf/metadata.xml b/gnome-extra/libgsf/metadata.xml
index ba1a20fb574b..29f51c3d7bc4 100644
--- a/gnome-extra/libgsf/metadata.xml
+++ b/gnome-extra/libgsf/metadata.xml
@@ -5,6 +5,5 @@
 <use>
 	<flag name="gtk">Enable use of gdk in thumbnailer</flag>
 	<flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
-	<flag name="thumbnail">Enable libgsf supported formats thumbnailer</flag>
 </use>
 </pkgmetadata>