Don't strip binary during linking (leave it to Portage), use the correct compiler, add maintainer-needed metadata.

Package-Manager: portage-2.1_rc1-r2

6 files changed, 52 insertions, 11 deletions

diff --git a/media-gfx/pngtoico/ChangeLog b/media-gfx/pngtoico/ChangeLog
index d76a65033db7..929ac6a52b55 100644
--- a/media-gfx/pngtoico/ChangeLog
+++ b/media-gfx/pngtoico/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/pngtoico
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.8 2005/10/30 19:06:05 grobian Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.9 2006/05/17 10:03:08 flameeyes Exp $
+
+  17 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/pngtoico-1.0-Makefile.patch, +metadata.xml, pngtoico-1.0.ebuild:
+  Don't strip binary during linking (leave it to Portage), use the correct
+  compiler, add maintainer-needed metadata.
 
   30 Oct 2005; Fabian Groffen <grobian@gentoo.org> pngtoico-1.0.ebuild:
   Marked ~ppc-macos (bug #110829)
diff --git a/media-gfx/pngtoico/Manifest b/media-gfx/pngtoico/Manifest
index f48d993dc646..5492285defb2 100644
--- a/media-gfx/pngtoico/Manifest
+++ b/media-gfx/pngtoico/Manifest
@@ -1,4 +1,30 @@
-MD5 1dac83102a2d2097ac76d2bb965707fa pngtoico-1.0.ebuild 685
-MD5 ac5b840f1863062c250cca34afc7f686 ChangeLog 741
-MD5 1bd0ef1eb0469dba51a17382c9304c22 files/pngtoico-1.0-Makefile.patch 469
-MD5 c92aed2d78ad63c530ccec495dbe78f8 files/digest-pngtoico-1.0 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pngtoico-1.0-Makefile.patch 466 RMD160 ce606cfb72b6a637bae02bc062ba39bfe0e8be25 SHA1 0a2cd13d4564a381f807491adb8e46d7e80e2b97 SHA256 2e5c7cdfe93374732f4ee9b56319f4b21cdebbd362d61400a96f79c864b8a5c0 size 466
+MD5 55bdb3b7786b8c8572bc5957c1ca64f0 files/pngtoico-1.0-Makefile.patch 466
+RMD160 ce606cfb72b6a637bae02bc062ba39bfe0e8be25 files/pngtoico-1.0-Makefile.patch 466
+SHA256 2e5c7cdfe93374732f4ee9b56319f4b21cdebbd362d61400a96f79c864b8a5c0 files/pngtoico-1.0-Makefile.patch 466
+DIST pngtoico-1.0.tar.bz2 4480 RMD160 866444acfed6b1583d2fcfc29687f0e7d7218f05 SHA256 567732d665b3c4590654007a640679ee9cff2bf4113218a7dbfa9ac392b06421 size 4480
+EBUILD pngtoico-1.0.ebuild 721 RMD160 067d875ed77fc230eb19cd2d90ffa079a2390cb5 SHA1 91386ebd5fb615f2dc93284939f84233f5d07f2c SHA256 27626a221307d6175a4edfb413e7df0aed90c829dfd8f337ca5f49993a2757fe size 721
+MD5 c7a717cee29b9d8a251a11527c50d473 pngtoico-1.0.ebuild 721
+RMD160 067d875ed77fc230eb19cd2d90ffa079a2390cb5 pngtoico-1.0.ebuild 721
+SHA256 27626a221307d6175a4edfb413e7df0aed90c829dfd8f337ca5f49993a2757fe pngtoico-1.0.ebuild 721
+MISC ChangeLog 989 RMD160 31d3e08e0f5390d8a78d19037c5bf593b95e32eb SHA1 c595952c0ce885697bfd8a81e5c260d1b8724076 SHA256 fa3b161c7864944e732024537a54e10dc595d068e88e1c2511beab172be9c0f9 size 989
+MD5 71d948567948a8900888076ff6a06ebc ChangeLog 989
+RMD160 31d3e08e0f5390d8a78d19037c5bf593b95e32eb ChangeLog 989
+SHA256 fa3b161c7864944e732024537a54e10dc595d068e88e1c2511beab172be9c0f9 ChangeLog 989
+MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a size 231
+MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
+RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
+SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
+MD5 71a993885eb9d264ebb0f30b0145d548 files/digest-pngtoico-1.0 235
+RMD160 efc889fc20ad5f34c5b7a5db498e95ac5653618c files/digest-pngtoico-1.0 235
+SHA256 8a61ed809922f7ae722fbd89c64a5aa6bdd18bb90d7b09a800fcf9863fcf4801 files/digest-pngtoico-1.0 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEavTjAiZjviIA2XgRAhHEAJ91oZVz0KWPOIyv9S4XhuETC33EMACgpCnV
+V0kPOu1mQzShezzDhdJTLwY=
+=RUwT
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/pngtoico/files/digest-pngtoico-1.0 b/media-gfx/pngtoico/files/digest-pngtoico-1.0
index 65ae33aef047..a234972c18c0 100644
--- a/media-gfx/pngtoico/files/digest-pngtoico-1.0
+++ b/media-gfx/pngtoico/files/digest-pngtoico-1.0
@@ -1 +1,3 @@
 MD5 995efd27a1011f30a9ff72aa148fdc66 pngtoico-1.0.tar.bz2 4480
+RMD160 866444acfed6b1583d2fcfc29687f0e7d7218f05 pngtoico-1.0.tar.bz2 4480
+SHA256 567732d665b3c4590654007a640679ee9cff2bf4113218a7dbfa9ac392b06421 pngtoico-1.0.tar.bz2 4480
diff --git a/media-gfx/pngtoico/files/pngtoico-1.0-Makefile.patch b/media-gfx/pngtoico/files/pngtoico-1.0-Makefile.patch
index 859f7bf9ef60..4350bb6359e9 100644
--- a/media-gfx/pngtoico/files/pngtoico-1.0-Makefile.patch
+++ b/media-gfx/pngtoico/files/pngtoico-1.0-Makefile.patch
@@ -8,7 +8,7 @@
 -LDFLAGS = -s
 -LIBS    = -lpng
 +CFLAGS  += -fomit-frame-pointer `libpng-config --cflags`
-+LDFLAGS = -s `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/metadata.xml b/media-gfx/pngtoico/metadata.xml
new file mode 100644
index 000000000000..54494c4bb860
--- /dev/null
+++ b/media-gfx/pngtoico/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/pngtoico/pngtoico-1.0.ebuild b/media-gfx/pngtoico/pngtoico-1.0.ebuild
index 0953495c783d..6ad2755744d4 100644
--- a/media-gfx/pngtoico/pngtoico-1.0.ebuild
+++ b/media-gfx/pngtoico/pngtoico-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/pngtoico-1.0.ebuild,v 1.9 2005/10/30 19:06:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/pngtoico-1.0.ebuild,v 1.10 2006/05/17 10:03:08 flameeyes Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Convert png images to MS ico format"
 HOMEPAGE="http://www.kernel.org/pub/software/graphics/pngtoico/"
@@ -22,7 +22,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {