Convert to EAPI=2. Fix patch to respect LDFLAGS, fixing #336185.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 48 insertions, 9 deletions

diff --git a/media-gfx/pngtoico/ChangeLog b/media-gfx/pngtoico/ChangeLog
index 66aad9c46cd7..ba9fb45db276 100644
--- a/media-gfx/pngtoico/ChangeLog
+++ b/media-gfx/pngtoico/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/pngtoico
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.12 2010/01/07 22:32:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.13 2010/09/06 18:42:42 graaff Exp $
+
+*pngtoico-1.0.1-r1 (06 Sep 2010)
+
+  06 Sep 2010; Hans de Graaff <graaff@gentoo.org> +pngtoico-1.0.1-r1.ebuild,
+  files/pngtoico-1.0.1-Makefile.patch:
+  Convert to EAPI=2. Fix patch to respect LDFLAGS, fixing #336185.
 
   07 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   pngtoico-1.0.1.ebuild:
diff --git a/media-gfx/pngtoico/Manifest b/media-gfx/pngtoico/Manifest
index 06e590db6944..7807f6727160 100644
--- a/media-gfx/pngtoico/Manifest
+++ b/media-gfx/pngtoico/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX pngtoico-1.0-Makefile.patch 466 RMD160 ce606cfb72b6a637bae02bc062ba39bfe0e8be25 SHA1 0a2cd13d4564a381f807491adb8e46d7e80e2b97 SHA256 2e5c7cdfe93374732f4ee9b56319f4b21cdebbd362d61400a96f79c864b8a5c0
-AUX pngtoico-1.0.1-Makefile.patch 466 RMD160 ce606cfb72b6a637bae02bc062ba39bfe0e8be25 SHA1 0a2cd13d4564a381f807491adb8e46d7e80e2b97 SHA256 2e5c7cdfe93374732f4ee9b56319f4b21cdebbd362d61400a96f79c864b8a5c0
+AUX pngtoico-1.0.1-Makefile.patch 467 RMD160 2dad4af2fe2d1cf00f04aa3bb3cc4dc08389d74c SHA1 3d5dfb1d61da36ec5baa999296b83cd7635052e4 SHA256 eb3450365ffe0c3138794e8e9d1429adf911173afa0c35b6e2ae43fa6e901177
 DIST pngtoico-1.0.1.tar.bz2 4355 RMD160 a8dc5d1618ed9ba077836357516404ff85f7c5b9 SHA1 5a51a6a9e79a723a0b6b23b7b13a84fb19bf46b4 SHA256 63201bf4abff473ee7056bd1c8f54c5eaaade2d9e42ae04ca7426812d64e522b
 DIST pngtoico-1.0.tar.bz2 4480 RMD160 866444acfed6b1583d2fcfc29687f0e7d7218f05 SHA1 6f65d99f55815eba28e3702741d17d7f3cc51cce SHA256 567732d665b3c4590654007a640679ee9cff2bf4113218a7dbfa9ac392b06421
+EBUILD pngtoico-1.0.1-r1.ebuild 756 RMD160 70c2c878989c7292aa87faef9234f8f7164c2aec SHA1 cd3e66a16a3ad3a4bf10c6a8971b4969af3e523d SHA256 f8f0c2936b0f167c19bb47d79f88f89683f4565b1ead7ea30ffca9be7dad02b9
 EBUILD pngtoico-1.0.1.ebuild 743 RMD160 136b409a1fdd1c4f6bafc302c43f34c1f764ea96 SHA1 47e11c852e3486baf530e867fe6fcfda519bbec4 SHA256 0854ad25d2eafc1b3cd8fe0d45c149d60d49db30e7223d2474943b5ed50dc691
 EBUILD pngtoico-1.0.ebuild 706 RMD160 d99eefb2f5cf878ce464cd9658fe41660448a916 SHA1 31243a555066b2ac9a6eb398e04d4f99ce72cbd3 SHA256 e8fc579fbfed5f20bee49596990699698b6d3c58ec9dadd2d29f6106ad58c557
-MISC ChangeLog 1515 RMD160 fc9f2e22756cab026555df6fa0043f4b973debcf SHA1 eb8854afc3d599b5fa54f3735ff62e72a2efa732 SHA256 2e11ad22c99d27af962992a9f40397c0be31d8992e2bde8c239a273dd96b8670
+MISC ChangeLog 1734 RMD160 74c914ccc8b2515329da6dcba55a8e29d4c59336 SHA1 b400a0db0b5f9b5c76e266f68afed77daa5832fd SHA256 6cf9bb55be0a9914a1ff2d254f9f7228e2f2ece6f12cd0e3c20cc82768f698fe
 MISC metadata.xml 248 RMD160 d6c9deac62816903fa896c02812e7b644a67dfd0 SHA1 c9c17191c605c607ba6a47cf37c80256353b28f3 SHA256 4b70871cee0948180519799125b78c0a47c91d8840b618b96018e31b9df6bb74
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAktGYQkACgkQNQqtfCuFneNHPQCeK4LxqdwAmTky9u/07mg8T7O9
-ptgAn0dBZBqKqRApfssr03+QqSenrSO1
-=S+++
+iF4EAREIAAYFAkyFNigACgkQZihJkut28SsdfwEAjmG1h704r1G79jkG6mmVjIdT
+C4jQXfamkdpp6K/O8ocBALnZ2K0FFzOwUcIKpJ7h6jnOT5lipDjVEVQKTb9pAaui
+=Q+db
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch b/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch
index 4350bb6359e9..77d86dc52446 100644
--- a/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch
+++ b/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch
@@ -8,7 +8,7 @@
 -LDFLAGS = -s
 -LIBS    = -lpng
 +CFLAGS  += -fomit-frame-pointer `libpng-config --cflags`
-+LDFLAGS = `libpng-config --ldflags` 
++LDFLAGS += `libpng-config --ldflags` 
 +LIBS    = `libpng-config --libs`
  INSTALL = install
  INSTALL_EXEC = $(INSTALL) -c -m 755
diff --git a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..1d53a2590a10
--- /dev/null
+++ b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild,v 1.1 2010/09/06 18:42:42 graaff Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Convert png images to MS ico format"
+HOMEPAGE="http://www.kernel.org/pub/software/graphics/pngtoico/"
+SRC_URI="mirror://kernel/software/graphics/pngtoico/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="media-libs/libpng"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin pngtoico
+	doman pngtoico.1
+}