From a545da24a409f88a028ca808b0b0d656b7dc5b32 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 29 Apr 2012 11:53:30 +0000 Subject: Move to EAPI=4, handle static-libs, add fix for gold.ld, call Xemake #294295; do not call elibtoolize twice, #411389 Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64 --- media-gfx/gtkimageview/ChangeLog | 8 ++++-- media-gfx/gtkimageview/Manifest | 18 ++++++-------- media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 31 +++++++++++++++--------- 3 files changed, 32 insertions(+), 25 deletions(-) (limited to 'media-gfx/gtkimageview') diff --git a/media-gfx/gtkimageview/ChangeLog b/media-gfx/gtkimageview/ChangeLog index 0ba86bf4e39c..6f63fce7480a 100644 --- a/media-gfx/gtkimageview/ChangeLog +++ b/media-gfx/gtkimageview/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gtkimageview -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/ChangeLog,v 1.20 2011/03/12 10:36:48 radhermit Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/ChangeLog,v 1.21 2012/04/29 11:53:30 jlec Exp $ + + 29 Apr 2012; Justin Lecher gtkimageview-1.6.4.ebuild: + Move to EAPI=4, handle static-libs, add fix for gold.ld, call Xemake #294295; + do not call elibtoolize twice, #411389 12 Mar 2011; Tim Harder gtkimageview-1.6.4.ebuild: Use slot dep for gtk+. diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest index 9a212b91b113..69f8fe60c3c0 100644 --- a/media-gfx/gtkimageview/Manifest +++ b/media-gfx/gtkimageview/Manifest @@ -1,18 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 DIST gtkimageview-1.6.4.tar.gz 1158138 RMD160 0d9cfdf97cde57bba057d75600d1abb0eabfe063 SHA1 a6c78744ba98441bca28c9d27bf89245517940db SHA256 4c681d38d127ee3950a29bce9aa7aa8a2abe3b4d915f7a0c88e526999c1a46f2 -EBUILD gtkimageview-1.6.4.ebuild 1789 RMD160 9cd96ef50cb801c822440c5619f0d5519842bf97 SHA1 fab04ae2765f66958c8309e310eff0aad0864f90 SHA256 0e0ca84a35ab5f9819e3b5d21788e383921967680c28dff9c00f59a50af23771 -MISC ChangeLog 2789 RMD160 c1c4a420b2942cf52c9966fe94e8f6a83c60693b SHA1 f6bacd5ccf3c4536a455324a05e398fbc2437ace SHA256 62f7002837a5599c77cbf73fcd997e38c194a65d642ff72bf81ad5b42234e763 +EBUILD gtkimageview-1.6.4.ebuild 1947 RMD160 44602fe46705025914ef5af2997c6d0b5361dd2b SHA1 4b6fb85d71433997c9f9b356611c1b8f4f26bc35 SHA256 af9dfa3f94635892bc8bbab88fe5160c61691f624cf34cc7eaf4bdf4aedd60d6 +MISC ChangeLog 2980 RMD160 1b1a58bb47dff6d001d80553b9d354f754fd42fb SHA1 787145fd168b8bccd0923adfbc4ca35bb4d18a71 SHA256 1b9454773aeea71e85bd67daa4a26ed4d38080cd4f8927a5d28207dfb75bd862 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJNe0zFAAoJEEqz6FtPBkyj3DMH/2w3oc2y8rxK2RPvsyMTjL/k -i6bErUFG9tgr/7exDHiLSdKeh+tdxMqWftYLo0U2BrkJfJyYapANuxolAREGY463 -GsDqM+/sCyRZF+JkUvv6wQJGKk4qbMOnvB3EX02g8GlQb0scCRYaYL9OV+yaUMlq -6oocBKP/4WVwH6K45dt+xOuroMtF1AzNblWqxV9ZvPRMieLN6IvJt/1EOVx75Xof -p0ocApf3XBuvj6l+yISC3LFa+mF1wCNtT9vuSyjRNMFBKnC8BvAFvXhlsMHs3V2+ -AWc6oExohax5Z3gLkMVLjxCnHQIDc8MPIcVdRp20VvOfRweXZM1+7JCwgWxx57s= -=0VP1 +iEYEAREKAAYFAk+dK78ACgkQgAnW8HDreRZT+gCgus0GKQ7cy6Z/jriAT2lnLOZg +3IIAoKeIIRA5F1pWn02iU/H5CHKhhiq/ +=PXK9 -----END PGP SIGNATURE----- diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild index 741db18eb930..99242c4bd11c 100644 --- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild +++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild @@ -1,30 +1,33 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild,v 1.21 2011/03/12 10:36:48 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild,v 1.22 2012/04/29 11:53:30 jlec Exp $ -EAPI="2" +EAPI=4 inherit autotools gnome2 virtualx -DESCRIPTION="GtkImageView is a simple image viewer widget for GTK." -HOMEPAGE="http://trac.bjourne.webfactional.com/wiki" +DESCRIPTION="A simple image viewer widget for GTK" +HOMEPAGE="http://trac.bjourne.webfactional.com/wiki/" SRC_URI="http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${P}.tar.gz?format=raw -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="doc examples" +IUSE="doc examples static-libs" # tests do not work with userpriv RESTRICT="userpriv" -RDEPEND=">=x11-libs/gtk+-2.6:2" -DEPEND="${DEPEND} +RDEPEND="x11-libs/gtk+:2" +DEPEND="${RDEPEND} gnome-base/gnome-common dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.8 )" -DOCS="README" +pkg_setup() { + DOCS="README" + G2CONF="$(use_enable static-libs static)" +} src_prepare() { gnome2_src_prepare @@ -35,6 +38,9 @@ src_prepare() { # Prevent excessive build failures due to glib/gtk changes sed '/DEPRECATED_FLAGS/d' -i configure.in || die "sed 2 failed" + # Gold linker fix + sed -e '/libtest.la/s:$: -lm:g' -i tests/Makefile.am || die + if use doc; then sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \ -i gtk-doc.make || die "sed 3 failed" @@ -43,13 +49,13 @@ src_prepare() { -i gtk-doc.make || die "sed 4 failed" fi - eautoreconf + AT_NOELIBTOOLIZE=yes eautoreconf } src_test() { # the tests are only built, but not run by default local failed="0" - emake check || die "emake check failed" + Xemake check cd "${S}"/tests for test in test-* ; do if [[ -x ${test} ]] ; then @@ -61,8 +67,9 @@ src_test() { src_install() { gnome2_src_install + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la if use examples ; then docinto examples - dodoc tests/ex-*.c || die "dodoc failed" + dodoc tests/ex-*.c fi } -- cgit v1.2.3-65-gdbad