amd64 stable, old

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

diff --git a/media-libs/libicns/ChangeLog b/media-libs/libicns/ChangeLog
index a0249faf19ed0b6247ed5ad2d99f7ad5f5dbbef9..2a929ce4deba0c5b38250ceb55d88dda6c79be16 100644 (file)
--- a/media-libs/libicns/ChangeLog
+++ b/media-libs/libicns/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libicns
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libicns/ChangeLog,v 1.5 2010/05/21 16:22:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libicns/ChangeLog,v 1.6 2010/05/21 16:30:50 ssuominen Exp $
+
+  21 May 2010; Samuli Suominen <ssuominen@gentoo.org> libicns-0.7.1.ebuild:
+  amd64 stable wrt #319537
 
   21 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> libicns-0.7.1.ebuild:
   x86 stable wrt bug #319537

diff --git a/media-libs/libicns/Manifest b/media-libs/libicns/Manifest
index 65f14677059a6ae4968df0c11afc28c81b31cab4..bdad1057d0c1be59595bdd31683e24255dcfa626 100644 (file)
--- a/media-libs/libicns/Manifest
+++ b/media-libs/libicns/Manifest
@@ -1,6 +1,4 @@
-DIST libicns-0.6.0.tar.gz 435605 RMD160 f8c20e2cecd758296b7b3add8a8eddeb090bcbf1 SHA1 b00e1b328da3580bcbb9a4e5c887d3c24cf52ee9 SHA256 226f3519aac9b0f1a7deb48b713dc3ab725dbf6586c838fd0274304a468bdf6c
 DIST libicns-0.7.1.tar.gz 444500 RMD160 96c84aca476ec6dbbd521649e523a206438ba45f SHA1 e12a6ca21988929d56320ac1b96a1a059af0fd43 SHA256 54d5f6927f8d92f8748ccc13089463867788309f4c3fd94a282b30535678e1fa
-EBUILD libicns-0.6.0.ebuild 785 RMD160 5ce21878ec9048500e4aecd6c69291ae8b5d695c SHA1 4e510f510f58ad33c31f6f6a9665d67b1da4c055 SHA256 d8613d40d16984af7030e9277a26f786e6afa331e552aa2fbdb2e36f977bbd08
-EBUILD libicns-0.7.1.ebuild 791 RMD160 688891074e135950a3439073e3252d50e3b7f835 SHA1 32d185e7ff1f4c2969ac808d1f7befcf0ec0f969 SHA256 a7d6cfed03990eb1274d7d534635f0ed2d242c6b762fab774bcb4bb0c7f958ca
-MISC ChangeLog 811 RMD160 ef0788fc5fb1f85fb8b9973b0f0482cd428c4e92 SHA1 f9249541540d159e321c82f7c1fbce5fe1329277 SHA256 951c1efeb808a349fb4423aa25e9df0ef655ae62c1510a989235daa353518bff
+EBUILD libicns-0.7.1.ebuild 803 RMD160 e76264f6f3675742faae26727dc3e0acb582a7a0 SHA1 4c66aecffc946ba9561304ab52f75657d35eae79 SHA256 2521b7a8ba68b77b0fda5170749eddac31c4f3e33b55d175d3695a33ca767aa2
+MISC ChangeLog 914 RMD160 19238a4edca4f69d1b9839df5bbeeacb08bc8c56 SHA1 29831079600b4052ddd479f29b536a1bc10d8e95 SHA256 0c3490ee57f4f785d8e8d703872b6a897beaad9017a6ee1f610c79416320246f
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2

diff --git a/media-libs/libicns/libicns-0.6.0.ebuild b/media-libs/libicns/libicns-0.6.0.ebuild
deleted file mode 100644 (file)
index 9a0a138..0000000
--- a/media-libs/libicns/libicns-0.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libicns/libicns-0.6.0.ebuild,v 1.3 2010/03/11 09:52:02 ssuominen Exp $
-
-EAPI=2
-
-DESCRIPTION="A library for the translation of the icns format"
-HOMEPAGE="http://sourceforge.net/projects/icns"
-SRC_URI="mirror://sourceforge/icns/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/libpng
-       media-libs/jasper"
-
-src_prepare() {
-       sed -i \
-               -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
-               icnsutils/png2icns.c || die
-}
-
-src_configure() {
-       econf \
-               --disable-dependency-tracking
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-       dodoc AUTHORS ChangeLog DEVNOTES README TODO
-}

diff --git a/media-libs/libicns/libicns-0.7.1.ebuild b/media-libs/libicns/libicns-0.7.1.ebuild
index 1dbe6e14361c87b0eaa77cda924c082c805b9da2..eac2adbe9bacbae420459d83adf320bdb58b20a2 100644 (file)
--- a/media-libs/libicns/libicns-0.7.1.ebuild
+++ b/media-libs/libicns/libicns-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libicns/libicns-0.7.1.ebuild,v 1.2 2010/05/21 16:22:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libicns/libicns-0.7.1.ebuild,v 1.3 2010/05/21 16:30:50 ssuominen Exp $
 
 EAPI=2
 
@@ -10,10 +10,10 @@ SRC_URI="mirror://sourceforge/icns/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="media-libs/libpng
+DEPEND=">=media-libs/libpng-1.2.43-r2:0
        media-libs/jasper"
 
 src_prepare() {