Version bump wrt #319411. Fix automagic libpng and zlib depend wrt #319409. Restrict...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-gfx/exact-image/ChangeLog b/media-gfx/exact-image/ChangeLog
index a8b361de68f68528635e4d5bf52c9e595a64894c..6bcbc90927451e46aeaeaf4079ead75c3f17e652 100644 (file)
--- a/media-gfx/exact-image/ChangeLog
+++ b/media-gfx/exact-image/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/exact-image
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/ChangeLog,v 1.2 2010/05/12 12:03:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/ChangeLog,v 1.3 2010/06/21 20:47:39 ssuominen Exp $
+
+*exact-image-0.8.1 (21 Jun 2010)
+
+  21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +exact-image-0.8.1.ebuild:
+  Version bump wrt #319411. Fix automagic libpng and zlib depend wrt
+  #319409. Restrict lcms depend to old version.
 
   12 May 2010; Samuli Suominen <ssuominen@gentoo.org>
   exact-image-0.7.5.ebuild, +files/exact-image-0.7.5-libpng14.patch:

diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 9402291b1fe7a5a0b630b8627d7b992e0b1cbcfd..85c0b226a643d21b52f8efaad45517da98e78b6a 100644 (file)
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1,5 +1,5 @@
 AUX exact-image-0.7.5-libpng14.patch 2431 RMD160 2d4a5bf1d2a6019a3a0dbb29eb4a3e2f42d63ab3 SHA1 40fb4b4b140d6958310226f4444521717ae903d9 SHA256 19c2ed561d37ca66543f5c778fa714b873d53289bf779f1482a76222ea5fb2ba
-DIST exact-image-0.7.5.tar.bz2 532314 RMD160 ec83a3f124ac0e6dc7d2724fdf9d2e5c77893227 SHA1 9e0a57df673ffa3b97dd858935c9f0732f09cc82 SHA256 d43635e06fdb48ec8c23bbfd66f40c5a1fc64c81913220f267dd7449050d0c69
-EBUILD exact-image-0.7.5.ebuild 2047 RMD160 289e9da983f14b72f28b76f17dfb5963e01b178f SHA1 c6c3243a49a30facb849c019a33d352e9a6bcc1a SHA256 91227b51aaf54fd55a468d52b7169a041a7913bc08155f7573dd21daa086cd58
-MISC ChangeLog 619 RMD160 e4cc2d2e002bc7ad71aa06c0035796bb8027b467 SHA1 2c67754f4bab5446b42ece2504d5a53f7fed6231 SHA256 f3793ccb01ec98325b6a29857b20c835d69728dc13c8ba075c736e9adeee7163
+DIST exact-image-0.8.1.tar.bz2 283660 RMD160 aa7b46540fca3a790cfb67529cb906fb2cab4088 SHA1 2aa8398d52b62cee5f62356fb81b0d1b8e7f6137 SHA256 926a09c897489705ba42daeb01fc4a3c327a8194dc65431f630d50684390e28b
+EBUILD exact-image-0.8.1.ebuild 1994 RMD160 f638765a4dce1026ae3efcb1a3cd353b624996bd SHA1 e9f011387f712b880011c284c29fcd066162a05a SHA256 e5ea393d564205897fde1f79061e17e079b29d06e38ad139275f48f057f98ddb
+MISC ChangeLog 854 RMD160 762bef169c61a65dbee80c536c67586d7b91615a SHA1 adf621747fbd6e093344c973516381a32489e86d SHA256 587029e49d6a8b822f8880db1f4365e75758f18585bf9167c43a084a2b2044a8
 MISC metadata.xml 415 RMD160 699c10ad1591672665f5f5a0dc826446ac963abe SHA1 37571ecb2ec795cd8a0122de6eddf72be850e4fa SHA256 0c3bba661467d1f7649ce868cc87cff7985a800b6bf330b35a32fecb84939f1c

diff --git a/media-gfx/exact-image/exact-image-0.7.5.ebuild b/media-gfx/exact-image/exact-image-0.8.1.ebuild
similarity index 54%
rename from media-gfx/exact-image/exact-image-0.7.5.ebuild
rename to media-gfx/exact-image/exact-image-0.8.1.ebuild
index a2b55388e8343f8a8e62f27c77acc18a822b919c..7fe104c45a8510eaf4ef5ae08ec6a095f6e7c062 100644 (file)
--- a/media-gfx/exact-image/exact-image-0.7.5.ebuild
+++ b/media-gfx/exact-image/exact-image-0.8.1.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/exact-image-0.7.5.ebuild,v 1.2 2010/05/12 12:03:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/exact-image-0.8.1.ebuild,v 1.1 2010/06/21 20:47:39 ssuominen Exp $
 
-EAPI="2"
-inherit eutils
+EAPI=2
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit eutils python
 
 DESCRIPTION="A fast, modern and generic image processing library"
 HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
@@ -12,18 +15,19 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="agg expat jpeg jpeg2k lcms lua openexr php perl python ruby swig tiff truetype X"
+IUSE="expat jpeg jpeg2k lcms lua openexr php perl png python ruby swig tiff truetype X"
 
-RDEPEND="agg? ( x11-libs/agg[truetype] )
+RDEPEND="x11-libs/agg[truetype]
+       sys-libs/zlib
        expat? ( dev-libs/expat )
        jpeg2k? ( media-libs/jasper )
-       jpeg? ( media-libs/jpeg )
-       lcms? ( media-libs/lcms )
+       jpeg? ( >=media-libs/jpeg-8a )
+       lcms? ( =media-libs/lcms-1* )
        lua? ( dev-lang/lua )
        openexr? ( media-libs/openexr )
        php? ( dev-lang/php )
        perl? ( sys-devel/libperl )
-       python? ( dev-lang/python )
+       png? ( >=media-libs/libpng-1.2.43 )
        ruby? ( dev-lang/ruby )
        tiff? ( media-libs/tiff )
        truetype? ( >=media-libs/freetype-2 )
@@ -33,41 +37,48 @@ RDEPEND="agg? ( x11-libs/agg[truetype] )
                x11-libs/libICE
                x11-libs/libSM
        )"
-
 DEPEND="${RDEPEND}
+       dev-util/pkgconfig
        swig? ( dev-lang/swig )"
 
+pkg_setup() {
+       if use python; then
+               python_set_active_version 2
+       fi
+}
+
 src_prepare() {
-       # this is broken ebuild: automagic libpng depend.
-       epatch "${FILESDIR}"/${P}-libpng14.patch
+       epatch "${FILESDIR}"/${PN}-0.7.5-libpng14.patch
 }
 
 src_configure() {
-       # evas support is disabled since evas is not on main tree. You can find it
-       # on enlightenment overlay
-       # bardecode is disabled since it is protected by custom licence
-       # libungif is disabled as it is not supported anymore
-       myconf=" --without-libungif --without-evas \
-               --without-bardecode --prefix=/usr
-               $(use_with jpeg libjpeg)\
-               $(use_with lua) \
-               $(use_with php) \
-               $(use_with ruby) \
-               $(use_with python) \
-               $(use_with swig) \
-               $(use_with agg libagg) \
-               $(use_with lcms) \
-               $(use_with tiff libtiff) \
+       # evas -> enlightenment overlay
+       # bardecode -> protected by custom license
+       # libungif -> not supported anymore
+
+       ./configure \
+               --prefix=/usr \
+               $(use_with X x11) \
                $(use_with truetype freetype) \
-               $(use_with expat) \
-               $(use_with openexr) \
+               --without-evas \
+               $(use_with jpeg libjpeg) \
+               $(use_with tiff libtiff) \
+               $(use_with png libpng) \
+               --without-libungif \
                $(use_with jpeg2k jasper) \
-               $(use_with X x11)"
-       #econf fails
-       ./configure ${myconf} || die "configure failed"
+               $(use_with openexr) \
+               $(use_with expat) \
+               $(use_with lcms) \
+               --without-bardecode \
+               $(use_with lua) \
+               $(use_with swig) \
+               $(use_with perl) \
+               $(use_with python) \
+               $(use_with php) \
+               $(use_with ruby) || die
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc README || die "dodoc failed"
+       emake DESTDIR="${D}" install || die
+       dodoc README TODO || die
 }