Private libpng prototypes and macro definitions were moved from png.h and pngconf.h into a new pngpriv.h header file that is not visible to applications, as such, copy pngpriv.h from lib/libpng/ to src/ before deleting the directory wrt #308673.

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

3 files changed, 11 insertions, 14 deletions

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 0d69e52f48e9..b3b41193006a 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/optipng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.54 2010/03/18 13:45:47 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.55 2010/03/18 14:14:32 ssuominen Exp $
+
+  18 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> optipng-0.6.4.ebuild:
+  Private libpng prototypes and macro definitions were moved from png.h and
+  pngconf.h into a new pngpriv.h header file that is not visible to
+  applications, as such, copy pngpriv.h from lib/libpng/ to src/ before
+  deleting the directory wrt #308673.
 
 *optipng-0.6.4 (18 Mar 2010)
 
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index f6e2fcb379e4..1d577f5caf81 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST optipng-0.6.2.1.diff 1984 RMD160 e144a8894806e7753da76e5142bb1b90304590fe SHA1 d4456bc5d10e0ec1cf9a260da17f63e31a40dc48 SHA256 b39e748b24ea51ac55aa2b5fae1a3f31e9ede5321941ec3da2904351fe625b69
 DIST optipng-0.6.2.tar.gz 1052509 RMD160 cd9ecfbd1c8901d14cb93fbc9f07403071cea37e SHA1 374b3537a262590ba2822f2b10d9241247b4da95 SHA256 84312506ea0c683a4e7675b3c8278067222762520016cc61e53c2b0e679120ca
 DIST optipng-0.6.3.tar.gz 1060571 RMD160 3ef55878defee86a57b8b0b268da1a7e9eca0d14 SHA1 eba6e3c940588b1d02abfabc407e5c759a3fdd8a SHA256 d11630955e2e72f07dd0aa1270f9d20caaef41796fdbfbbc1caad5b931fdf721
 DIST optipng-0.6.4.tar.gz 1483806 RMD160 6b5248c3c6b744315e70e86b49d998fe66759879 SHA1 ebb8d623c7f79c5c6942803bb96789103780bce9 SHA256 3000892b1d240351f057fbc8012485c3a1e75b991fa8d54e048273fa0fa87647
 EBUILD optipng-0.6.2-r1.ebuild 1103 RMD160 6e94cc9634ab7b9a4195eef05035b8c689c5ef26 SHA1 f936917a80d7f954753e3d777f4dc5ee1c9974db SHA256 0459ce2988d0e4c8d69c962ec3bc9dd1b58be5d49d365dfaacb8be78c5a132d4
 EBUILD optipng-0.6.3.ebuild 1199 RMD160 1de1e0e0130e8876b1cf4d1ddbaf8e9bb2c6a4c4 SHA1 847ad313c9dd9428784907a4170a1d2f9dc3ae6d SHA256 7ad7ec9a111fefcf1946f878e04ae5217e02975feab6ef36bc0a492202a96e37
-EBUILD optipng-0.6.4.ebuild 1198 RMD160 f94db5219d7cc68b1fa28ec3d0cffe50be5ba33c SHA1 86f2400dce3be1dc675c2dd080f67e5fc58b7aa3 SHA256 a8be37a66ecf47971b5f17e7aba6656aac447a52b9aaa0174f2c07a74679ca49
-MISC ChangeLog 6772 RMD160 a56e123c749c299f84747ade24cb43e0ef9796ed SHA1 5756e3b5aec916d75ce55a7bef7a791262796ee2 SHA256 b92e69700ea2202af2e404cd24b683580cc4380009ccdedeef2e1787dcc3f648
+EBUILD optipng-0.6.4.ebuild 1240 RMD160 2319d7ae5b8b7dc956829a2e8663b4171a2f84d6 SHA1 1d289c6c2da08bd69c5db9107e09cc4ac90ab1db SHA256 329befc81fa893eeb280bc264da5a998ee5a09079aad6cd6819b625ad4b0c6b9
+MISC ChangeLog 7108 RMD160 677a7db12753f95c38f129828bdb481954d7d053 SHA1 ac596fdee88891c0383182c0ad9f482a13a236bd SHA256 a6960b43a616f9f219789fe546fec870fc18c960fdc445f16fb82ca2395b7f72
 MISC metadata.xml 253 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 SHA1 b30245f00aae656e7a024b2ab4b8ad8e5549250f SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuiLpEACgkQdz7hIScOUREQPgCg0MAAlhhj58c4aXg/iYl22A7z
-v7AAn1WPusdmwTtutkV69jnXA1+Q4fvz
-=PNC/
------END PGP SIGNATURE-----
diff --git a/media-gfx/optipng/optipng-0.6.4.ebuild b/media-gfx/optipng/optipng-0.6.4.ebuild
index baf3a0c8980b..57290131d752 100644
--- a/media-gfx/optipng/optipng-0.6.4.ebuild
+++ b/media-gfx/optipng/optipng-0.6.4.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-gfx/optipng/optipng-0.6.4.ebuild,v 1.1 2010/03/18 13:45:47 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.4.ebuild,v 1.2 2010/03/18 14:14:32 ssuominen Exp $
 
 EAPI=2
 inherit toolchain-funcs
@@ -23,6 +23,7 @@ src_prepare() {
 		src/scripts/gcc.mak.in \
 		lib/pngxtern/scripts/gcc.mak.in \
 		|| die "sed failed"
+	cp lib/libpng/pngpriv.h src/ || die
 	rm -rf lib/{libpng,zlib}
 }