From: Pacho Ramos Date: Sat, 31 Dec 2011 19:33:05 +0000 (+0000) Subject: Version bump, remove old. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1b7a7c28c6d0156f91ce8644ae9fd70459715ef8;p=gentoo.git Version bump, remove old. Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog index 684be0f7945e..4a1d8946eae8 100644 --- a/gnome-extra/libgsf/ChangeLog +++ b/gnome-extra/libgsf/ChangeLog @@ -1,6 +1,12 @@ # 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.189 2011/10/30 16:25:12 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.190 2011/12/31 19:33:05 pacho Exp $ + +*libgsf-1.14.22 (31 Dec 2011) + + 31 Dec 2011; Pacho Ramos +libgsf-1.14.22.ebuild, + -libgsf-1.14.20.ebuild: + Version bump, remove old. 30 Oct 2011; Raúl Porcel libgsf-1.14.21.ebuild: alpha/ia64/sh/sparc stable wrt #385699 diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest index b39bfc5d2aa2..ab004b6e2645 100644 --- a/gnome-extra/libgsf/Manifest +++ b/gnome-extra/libgsf/Manifest @@ -5,16 +5,16 @@ AUX libgsf-1.14.16-automake-fixes.patch 618 RMD160 6426795391ab582106f9f6c131974 AUX libgsf-1.14.16-gconf-automagic.patch 2201 RMD160 0a7f63db3fd9dd740f37de0d2cb42f6f75294a75 SHA1 4636e593872ec761b79921e9e935725541f4edb6 SHA256 9171232083d44e581918872f2eb3bf9b3571cde63b434caa9a04ff7c8b0c93f7 AUX libgsf-1.14.19-missing-declaration.patch 681 RMD160 6eb01d9991e2609dd85057017886d6267b7e3601 SHA1 8a85dcbc8f502b96ddfdd47d56c081dc395f132b SHA256 8b8ef1e0fd6d8ecc61c7ef5c2ef6967bbebbe34470d4e2dadf0aea2ec467a6bd DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 RMD160 cdf17b11dea5da26cc9a17fff953480ee1c39a0f SHA1 e0403cd21c59e305ae26e2d511740a9b1ea17be1 SHA256 d392f4cdb99f398ffb67674a2f0e64debcc4574f5ea203c1c25e91532fce894f -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.20.ebuild 3513 RMD160 a5b878b5a45b25ce32d7beef78d8e2d04e37989c SHA1 4926d2dfcfdfe030607c55205ac41e3e93f0db3e SHA256 03b656c8aa39b5e61e9702befc113a2e9ede186522a9b2ab0cbd56542a3db6ea +DIST libgsf-1.14.22.tar.xz 506188 RMD160 a47fa284ace94ead51f2130cba31d8962d554f3b SHA1 ca1c5aa92a840e322d7cafd9f2dede3d38a69660 SHA256 a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f EBUILD libgsf-1.14.21.ebuild 3150 RMD160 d5dc21319ed679f92fedd8b0f174292d18581db8 SHA1 630540ce7216b52a07a233dadb67bc0842d49cd0 SHA256 35a4a6cb09c1c5469e344e0b95e04befca960b12dc79f37c002c512649031c5c -MISC ChangeLog 23761 RMD160 41e8761e898d64330f912a21777c84ef6d108667 SHA1 4ab2a4c43968d170673693020511e0d5bbc94483 SHA256 a7c8cb9c36d61f5666f641633aa02e5b2032cdf9cfc8f2395db5f6a32ddbb63a +EBUILD libgsf-1.14.22.ebuild 2789 RMD160 fd7bd41b2bc226aa423f8aaeefc67c14481e3e19 SHA1 4fb19eac46651e298d02566d25517568d0dda0a9 SHA256 efacfd62dd7b886d0ae39c3a9a4ed5685c3c58c66f6891240ccdb58e7e156b64 +MISC ChangeLog 23915 RMD160 8d6d05452e21834ad6669be8733d1cc4cc64f460 SHA1 93dbf7ee548ee8ead87f1974056e107e056c5111 SHA256 66974d1acb19dde51ae85842fbff83389a470ccb9bef134f3e7f9015aee1ebf6 MISC metadata.xml 304 RMD160 266992ac9d503bb80b31164d13d394853fb72bcc SHA1 97b443e72047a31c18a881dd95cc0034a02c6fc0 SHA256 97dcc056bc6ee681e66294ff87260cba35805a12db640f00c08b8ee3f7e96005 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6tem8ACgkQuQc30/atMkCIxwCgmLoyq0vW/etkC8pdvz/XqpAi -bk4AnjZKIeqor2ZTyalZrveo1SjJhpWC -=VVUi +iEYEARECAAYFAk7/Y3cACgkQCaWpQKGI+9QPWgCeNINkLbt2QAUPZqdoJYPYgJi3 +B34AoIikJBXWbVC6KBdIEPbaR10L2837 +=BZPH -----END PGP SIGNATURE----- diff --git a/gnome-extra/libgsf/libgsf-1.14.20.ebuild b/gnome-extra/libgsf/libgsf-1.14.22.ebuild similarity index 62% rename from gnome-extra/libgsf/libgsf-1.14.20.ebuild rename to gnome-extra/libgsf/libgsf-1.14.22.ebuild index 16a1c6199b3b..ae150edd720e 100644 --- a/gnome-extra/libgsf/libgsf-1.14.20.ebuild +++ b/gnome-extra/libgsf/libgsf-1.14.22.ebuild @@ -1,9 +1,10 @@ # 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.20.ebuild,v 1.7 2011/10/05 17:40:14 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.22.ebuild,v 1.1 2011/12/31 19:33:05 pacho Exp $ -EAPI="3" +EAPI="4" GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" PYTHON_DEPEND="python? 2:2.6" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython" @@ -12,25 +13,20 @@ 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 python" -RDEPEND=" - >=dev-libs/glib-2.16:2 +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 )" + >=dev-python/pygtk-2.10:2 )" DEPEND="${RDEPEND} dev-util/pkgconfig @@ -38,21 +34,14 @@ DEPEND="${RDEPEND} 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)" + $(use_with gtk gdk-pixbuf)" if use python; then python_pkg_setup @@ -60,29 +49,19 @@ pkg_setup() { } src_prepare() { - gnome2_src_prepare - - cp "${WORKDIR}/gnome-mplayer-0.9.6-gconf-2.m4" m4/ \ - || die "failed to copy gconf macro" - - # Fix gconf automagic, bug #289856, upstream bug #645775 - epatch "${FILESDIR}/${PN}-1.14.16-gconf-automagic.patch" - - # Fix useless variable in toplevel Makefile.am, bug #298813, upstream bug #645777 - epatch "${FILESDIR}/${PN}-1.14.16-automake-fixes.patch" - - # Fix build with FEATURES="stricter", upstream bug #645778 - epatch "${FILESDIR}/${PN}-1.14.19-missing-declaration.patch" + # 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 # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile + echo '#!/bin/sh' > py-compile + + gnome2_src_prepare } src_compile() {