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 | 4dc7d7f313c6eb7534597301c7669d62232a21aa (patch) | |
| tree | 3e1f9049c33a7913d30846195a41cf7446906758 /media-gfx/zphoto | |
| parent | Use ^C-getCC for compiling the wrapper (diff) | |
| download | historical-4dc7d7f313c6eb7534597301c7669d62232a21aa.tar.gz historical-4dc7d7f313c6eb7534597301c7669d62232a21aa.tar.bz2 historical-4dc7d7f313c6eb7534597301c7669d62232a21aa.zip | |
Fixing src_configure and RDEPEND
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'media-gfx/zphoto')
| -rw-r--r-- | media-gfx/zphoto/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/zphoto/Manifest | 4 | ||||
| -rw-r--r-- | media-gfx/zphoto/zphoto-1.2-r2.ebuild | 11 |
3 files changed, 11 insertions, 9 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/Manifest b/media-gfx/zphoto/Manifest index c9c397c40665..2d0fd0972980 100644 --- a/media-gfx/zphoto/Manifest +++ b/media-gfx/zphoto/Manifest @@ -2,6 +2,6 @@ AUX zphoto-0.9-avifile-gentoo.diff 319 RMD160 731206a5c0434e30e4e0c614fbbe45829c AUX zphoto-1.2-glibc210.patch 558 RMD160 73d660c4ec47f963b18171ed39cd9d67b609631e SHA1 4aa9588e02a67c8d7ef9fc1b792280fcef7a4727 SHA256 334bbaa15d5c4971d97ee05d313dce47f39972cee746f54b1ea31d1ba9569239 DIST zphoto-1.2.tar.gz 414079 RMD160 54a93da3c8303ebbf9c505891e9fa8fb32bd6a64 SHA1 2d45c5df2f2a00db0d8170f18ea5ed399fb9d611 SHA256 918f19c4a0077b0c5fd2c80fd846acf21b4c7f62750988e6a4a1d0bb6628c15d EBUILD zphoto-1.2-r1.ebuild 997 RMD160 c1ea031b8ca3e0580f6bc9655f901719ce69391d SHA1 9a6cf81ef1003c3003e4f8136f2a57e206cc5cd2 SHA256 559fcc88e5d8e6c46d44de88f7e98a269cd2fdecbf60c7f39d0eb7a7dc419c9c -EBUILD zphoto-1.2-r2.ebuild 1111 RMD160 7b0b8bb2238ff79eb6353a928123ce55605bd07f SHA1 51ea7f0dc7cc21b146563da4bfe6fad50d9daa73 SHA256 dbca722e1db0fb9729351492dcd1157bf4684e60748bc8324f34646756351bc1 -MISC ChangeLog 3325 RMD160 7e194ad6a130bed6f3a885adcb01b3056559f152 SHA1 d3f554c5b56f207a851ff81f1922327fd20878fc SHA256 54d560a60860851cfd859126eb209ce2b23a113af1feacdf7f6a4a9d1431a6fb +EBUILD zphoto-1.2-r2.ebuild 1128 RMD160 1f9fc9f8913613f6b88bd2f8a86ea56980e0dd85 SHA1 368396f30f4515213c5f70f8b2fcb76f39f623ed SHA256 d3b4fa875070f6d5d6e96db4cd0820d97400e11095c0d43a35025884944f9036 +MISC ChangeLog 3436 RMD160 6cba02fa777bae891db04077d2a02720b9554bcd SHA1 237876ed0008ced6e97f286351b43b5ccd710608 SHA256 90f6fb0115107755a5f191a365ab038b714e19407470da7f975818dd33ec1dde MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 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() { |