diff options
| author |   Victor Ostorga <vostorga@gentoo.org> | 2009-07-20 19:33:41 +0000 |
|---|---|---|
| committer | Victor Ostorga <vostorga@gentoo.org> | 2009-07-20 19:33:41 +0000 |
| commit | 24eb8cb5a7edb22ab91f0b226dabd4cd25c208d3 (patch) | |
| tree | 38116f54164998826e0927d35739973589a0c409 /media-gfx | |
| parent | Use ^C-getCC for compiling the wrapper (diff) | |
| download | gentoo-2-24eb8cb5a7edb22ab91f0b226dabd4cd25c208d3.tar.gz gentoo-2-24eb8cb5a7edb22ab91f0b226dabd4cd25c208d3.tar.bz2 gentoo-2-24eb8cb5a7edb22ab91f0b226dabd4cd25c208d3.zip | |
Fixing src_configure and RDEPEND
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/zphoto/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/zphoto/zphoto-1.2-r2.ebuild | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/media-gfx/zphoto/ChangeLog b/media-gfx/zphoto/ChangeLog index 8d2b5f7a469a..3bd35d97786e 100644 --- a/media-gfx/zphoto/ChangeLog +++ b/media-gfx/zphoto/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/zphoto # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.20 2009/07/20 18:21:39 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/ChangeLog,v 1.21 2009/07/20 19:33:41 vostorga Exp $ + + 20 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> zphoto-1.2-r2.ebuild: + Fixing src_configure and RDEPEND 20 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> zphoto-1.2-r2.ebuild, +files/zphoto-1.2-glibc210.patch: diff --git a/media-gfx/zphoto/zphoto-1.2-r2.ebuild b/media-gfx/zphoto/zphoto-1.2-r2.ebuild index 15a6a499985a..512b750f75ba 100644 --- a/media-gfx/zphoto/zphoto-1.2-r2.ebuild +++ b/media-gfx/zphoto/zphoto-1.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r2.ebuild,v 1.5 2009/07/20 18:21:39 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/zphoto/zphoto-1.2-r2.ebuild,v 1.6 2009/07/20 19:33:41 vostorga Exp $ EAPI=2 @@ -21,28 +21,27 @@ DEPEND=">=media-libs/ming-0.2a app-arch/zip >=dev-libs/popt-1.6.3 wxwindows? ( =x11-libs/wxGTK-2.6*[X] )" -RDEPEND="" +RDEPEND="${DEPEND}" src_prepare(){ #bug 273831 epatch "${FILESDIR}"/"${P}"-glibc210.patch } -src_compile() { +src_configure() { local myconf="${myconf} --disable-avifile" if use wxwindows ; then WX_GTK_VER="2.6" need-wxwidgets gtk2 - myconf="--with-wx-config=${WX_CONFIG}" + myconf="${myconf} --with-wx-config=${WX_CONFIG}" sed -i -e 's@FALSE@false@g' wxzphoto.cpp || die else - myconf="--disable-wx" + myconf="${myconf} --disable-wx" fi econf ${myconf} - emake || die } src_install() { |