diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2008-05-13 10:55:09 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-05-13 10:55:09 +0000 |
| commit | beedc1427e18f8f9e0f49a1119857cdf517b2846 (patch) | |
| tree | 2ec246f62991ee43e28627c6a02bfe7804ec430b /media-gfx/gtkam | |
| parent | Version bump. New module for etags. (diff) | |
| download | gentoo-2-beedc1427e18f8f9e0f49a1119857cdf517b2846.tar.gz gentoo-2-beedc1427e18f8f9e0f49a1119857cdf517b2846.tar.bz2 gentoo-2-beedc1427e18f8f9e0f49a1119857cdf517b2846.zip | |
Scrollkeeper is not optional for correct installation. Fixing libgphoto dependency.
(Portage version: 2.1.5_rc8)
Diffstat (limited to 'media-gfx/gtkam')
| -rw-r--r-- | media-gfx/gtkam/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/gtkam/gtkam-0.1.14.ebuild | 36 |
2 files changed, 27 insertions, 17 deletions
diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog index 6380ea4bef42..7c1f433b64b4 100644 --- a/media-gfx/gtkam/ChangeLog +++ b/media-gfx/gtkam/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gtkam -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.47 2007/05/08 14:17:47 dang Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.48 2008/05/13 10:55:09 eva Exp $ + + 13 May 2008; Gilles Dartiguelongue <eva@gentoo.org> gtkam-0.1.14.ebuild: + Scrollkeeper is not optional for correct installation. + Fixing libgphoto dependency. 08 May 2007; Daniel Gryniewicz <dang@gentoo.org> +files/gtkam-0.1.12-as-needed.patch, gtkam-0.1.12-r2.ebuild: diff --git a/media-gfx/gtkam/gtkam-0.1.14.ebuild b/media-gfx/gtkam/gtkam-0.1.14.ebuild index f4b5f398473a..3335c3cef00e 100644 --- a/media-gfx/gtkam/gtkam-0.1.14.ebuild +++ b/media-gfx/gtkam/gtkam-0.1.14.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.14.ebuild,v 1.3 2007/01/31 19:01:02 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.14.ebuild,v 1.4 2008/05/13 10:55:09 eva Exp $ inherit autotools eutils gnome2 @@ -11,28 +11,32 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="doc gimp gnome nls" +IUSE="gimp gnome nls" + +# FIXME: why is exif not optional ? RDEPEND=">=x11-libs/gtk+-2.0 - >=media-libs/libgphoto2-2.2.0 + >media-libs/libgphoto2-2.2.0 >=media-libs/libexif-0.3.2 media-libs/libexif-gtk gimp? ( >=media-gfx/gimp-2 ) - gnome? ( >=gnome-base/libbonobo-2 >=gnome-base/libgnomeui-2 )" + gnome? ( + >=gnome-base/libbonobo-2 + >=gnome-base/libgnomeui-2 )" DEPEND="${RDEPEND} dev-util/pkgconfig - doc? ( app-text/scrollkeeper ) + app-text/scrollkeeper nls? ( >=sys-devel/gettext-0.14.1 )" DOCS="ABOUT-NLS AUTHORS MANUAL NEWS README" pkg_setup() { - G2CONF="${G2CONF} \ - $(use_enable doc scrollkeeper) \ - $(use_with gimp) \ - $(use_with gnome) \ - $(use_with gnome bonobo) \ - $(use_enable nls) \ + G2CONF="${G2CONF} + $(use_with gimp) + $(use_with gnome) + $(use_with gnome bonobo) + $(use_enable nls) + --disable-scrollkeeper --with-rpmbuild=/bin/false" } @@ -40,14 +44,16 @@ src_unpack() { gnome2_src_unpack # The icon in the tarball is busted, so overwrite it - cp ${FILESDIR}/${PN}.png ${S}/${PN}.png + cp "${FILESDIR}"/${PN}.png "${S}"/${PN}.png + + # Fix --as-needed, bug #169661 + epatch "${FILESDIR}/${PN}-0.1.14-as-needed.patch" - epatch ${FILESDIR}/${PN}-0.1.14-as-needed.patch AT_M4DIR="m4m" eautomake } src_install() { gnome2_src_install - rm -rf ${D}/usr/share/doc/gtkam + rm -rf "${D}"/usr/share/doc/gtkam } |