Replace the libpng 1.4 sed fix with a patch, because autoreconf would require SDL to regen the build files. No version bump because already installed versions are not affected.

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

5 files changed, 62 insertions, 33 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 923ab39abf03..18d790e662cd 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28
 AUX digikam-1.2.0-lapack.patch 6429 RMD160 e42b9600822fbd28b31c751fe6515a691db4cb0b SHA1 a495d7734c355419e4cba629354e4e9077f15782 SHA256 02169ca57f86f3f7d40dced07b7c54f612bd8fe3b03d2a5808184c47b5b360c0
 AUX digikam-1.2.0-libpgf-r3.patch 6824 RMD160 cf771745da65673a6783a3ed9d6d2a0e74c69923 SHA1 857589931a4c2acefcc822b664dd02ce324ea152 SHA256 0424234746611e2b75b74725e53705277308fc3596ac095013de985cc6a01622
@@ -13,25 +10,8 @@ DIST digikam-1.7.0.tar.bz2 23386697 RMD160 6b13c1788e7fe97b8043d7d3237808815da6a
 DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.2.0-r3.ebuild 3219 RMD160 6a5187b3e6a0866ecc0c1e95c77f737b84478969 SHA1 fa8f9eea4a6894f1ecd0494f19fbf2d21c07e844 SHA256 776fc41a003c8e0cbe61d123067b3d5cf9bf5d3cc0b57eb088d8fcc9d21db17c
-EBUILD digikam-1.2.0-r4.ebuild 3213 RMD160 4e01305c42310744464a2b6c26d28483cca95107 SHA1 10a7810a22ce140c4e3362344617f031aa5e3251 SHA256 92625f91717434ebebbd11f9f447bc6a95a3809cb563ae2644898b25a6ed00ff
+EBUILD digikam-1.2.0-r4.ebuild 3214 RMD160 a9c5d489d0a461d5e60939dc586137af4199e1c1 SHA1 439586e88f4164feb51a0724d9bcd3286bcbd363 SHA256 ebc5f8f36e91d66b3d5300cee9fcf9073725cd4580991f986e9de2a5f82c5827
 EBUILD digikam-1.7.0.ebuild 3148 RMD160 3c5f1e555f90c9426acc13cae2de7b2a85a8b6cd SHA1 a43ac64cdef4edb5fb24acb0fdaf9662965ccdfe SHA256 174b13da7a4b8cf16992e82c45a60820a2c749577933fce030b62a18627ec369
 EBUILD digikam-1.8.0.ebuild 3233 RMD160 c49460e169ca6a4ca4e0bc2d7cc375d9bf230d64 SHA1 5a7e9101f55305e9d75ed9555c2a428b2c75bdc2 SHA256 318ccfbca4b7648cd3d135e5d52d24f67920847026a90b095e7ff05763573e39
-MISC ChangeLog 28881 RMD160 3f31bb02d566c7d54885a4351d4791fdd3dc3787 SHA1 b0becd84e6d4a071ef1983d7c318c866b2dc7015 SHA256 499eae5ec5643dc742ca37866a5cbe55a445217e8f13a80740e342c16f889f79
+MISC ChangeLog 28995 RMD160 dd41d47916403aa8c51516cdcb6b9e3be25d9003 SHA1 03cfe3d70a1b8c9b4d4c8a93bd78679c57dd860a SHA256 bffb62449b5e63d377bd417248ebe41f3c0ca99da9b3223b88754dd40e1210a4
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJNRFAJAAoJEPqDWhW0r/LCNk8QAIvp22P0cZiWnDzJRt/XTdyH
-B77LHj0QBphWpfmHeChmOWTOavBfuOuRSSkfIUWHTy6wRb029UysmNMPaJncdNjj
-avJAeKDR7gdeI4z3e7mu5UFPnGLFFp/CBohaGRJ6pKAMr3zQ1qGuY/GGl2/V8CX3
-kPsj4JD9EREyiw29/pRzw1w6+vya9ovfFWXYd8AR7MB5VfC0fBbAwOfhXlK6Vs5l
-yFalwAOo6xWPKHj7dsco/2O1xSup2mbCeSwhsDoacHNxzrBkbpX1A6AXqkoRmtGQ
-tk9tPXVCUgoc0hOCTMcF9GgTmG2wCqt2poDDVOGH8MhCkFHBvfozylM/t8EelX5E
-8hZrDIRWbKd+FN9JP124kq6tJJQJ4zG8VVpy1MKmPLmaDNtBQGGssW8JQw5+f8zI
-NkqVFimn3iuXFAijxKCUYJUgWmpEFi+8eeYF4mGLSIAA3quhUuwl6XhHY5AiUysm
-eViKIptWnkvTXJPhu6qImLnZfdtUw/8t4/XcymrDL4T123eZtdQBmQ1kg0B0HQZ+
-DmeLUmYVxoEPcZhBN7dBM++Sz6DSimFUrBuTTEc8agF18TvRmCgcocpbLCVq3uEs
-HpfDKyGOD01ds24j7XyzS6PILCLZ4T8MytdoVjkSc7SvYwSGRcthhsfpRKeN2jKt
-jDp2pGAHiUulVrrxjoIQ
-=BmlC
------END PGP SIGNATURE-----
diff --git a/media-gfx/qrencode/ChangeLog b/media-gfx/qrencode/ChangeLog
index ef32d8aa8ea8..9a9449185bde 100644
--- a/media-gfx/qrencode/ChangeLog
+++ b/media-gfx/qrencode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/qrencode
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/ChangeLog,v 1.9 2010/09/29 15:13:39 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/ChangeLog,v 1.10 2011/01/31 08:37:00 joker Exp $
+
+  31 Jan 2011; Christian Birchinger <joker@gentoo.org>
+  qrencode-3.1.1.ebuild, +files/qrencode-3.1.1-pngregenfix.patch:
+  Replace the libpng 1.4 sed fix with a patch, because autoreconf would
+  require SDL to regen the build files. No version bump because already
+  installed versions are not affected.
 
   29 Sep 2010; Brent Baude <ranger@gentoo.org> qrencode-3.1.1.ebuild:
   Marking qrencode-3.1.1 ~ppc for bug 338861
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 6ad615b480d2..f19647f3b609 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,4 +1,5 @@
+AUX qrencode-3.1.1-pngregenfix.patch 1721 RMD160 58f2af583829d8d68f2af6c746674097eb51126b SHA1 1c331b197c88ccf7849664ee2c77e475f416eb10 SHA256 1bd7ae459ecac9a25f568fdcd58b1b1e9417539e763eee18fff6802b2a248d85
 DIST qrencode-3.1.1.tar.bz2 313039 RMD160 dd11a199e777bd1deffce4507f0dd6bb7c6bc23d SHA1 9af729b4923f531decfd18963d7ff63bea320367 SHA256 ce79446b0f391e42414651afff468ce6ebe2c4e67e3f2d132d31a26bb22adb94
-EBUILD qrencode-3.1.1.ebuild 751 RMD160 bbaeab94d9487287e745d3d762d8e049ba03df4f SHA1 25eb3da129fa24bc337bdf03b39e5124b6e65890 SHA256 f42aa79ca8a251a1af473dccae1e9304555c981ee341bf6b85606af205c73548
-MISC ChangeLog 1392 RMD160 3fcb7a4d702526df71f81692c8323a9342e4704a SHA1 dcc36903107e8675df3bbbfe792a5ba90250b26e SHA256 676dcbe04ca64ccbd3524aafde72c2e043c2f1df0543ec473e475dda0a8bdcde
+EBUILD qrencode-3.1.1.ebuild 741 RMD160 e370737807ac70c7b6d7b626af5e68ed01598dd2 SHA1 d9a4414a472c18a10d1d58fa263641eeb840013c SHA256 743fa55b70ac15cec05498cf617956964cee90b9aadf31151b53c40f5ef5a085
+MISC ChangeLog 1697 RMD160 ad74d53ef3e24530b1fd860235d24a57fc2f807a SHA1 422dbca913fa8cab34bdbe479dfda3163121a90e SHA256 3632a638dd12924a624fc18c95c84e75cc844e11e3a290d9c6c5722cb80ea91a
 MISC metadata.xml 253 RMD160 0fbf1fbbd5db1e93b963863ec0bad1399080b8bf SHA1 f4e5f6b8a9cb77f62159abb5a375ad9fbe0fe062 SHA256 a4f00013acb59b31924050af3601057caf44ece9a17824057cf7c0a4a930dd97
diff --git a/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch b/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch
new file mode 100644
index 000000000000..9791c09b6407
--- /dev/null
+++ b/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch
@@ -0,0 +1,45 @@
+diff -ruN qrencode-3.1.1-orig/Makefile.am qrencode-3.1.1/Makefile.am
+--- qrencode-3.1.1-orig/Makefile.am	2010-01-19 21:13:25.000000000 +0100
++++ qrencode-3.1.1/Makefile.am	2011-01-31 09:21:17.000000000 +0100
+@@ -24,7 +24,7 @@
+ pkgconfig_DATA = libqrencode.pc
+ 
+ EXTRA_DIST = libqrencode.pc.in autogen.sh configure.ac acinclude.m4 \
+-			 Makefile.am tests/Makefile.am qrencode.spec.in qrencode.spec \
++			 Makefile.am qrencode.spec.in qrencode.spec \
+ 			 qrencode.1.in Doxyfile tests/test_all.sh
+ 
+ if BUILD_TOOLS
+diff -ruN qrencode-3.1.1-orig/configure.ac qrencode-3.1.1/configure.ac
+--- qrencode-3.1.1-orig/configure.ac	2010-02-03 01:42:12.000000000 +0100
++++ qrencode-3.1.1/configure.ac	2011-01-31 09:21:17.000000000 +0100
+@@ -29,14 +29,14 @@
+ AC_PROG_LIBTOOL
+ PKG_PROG_PKG_CONFIG
+ 
+-AC_CONFIG_FILES([Makefile libqrencode.pc tests/Makefile qrencode.spec qrencode.1])
++AC_CONFIG_FILES([Makefile libqrencode.pc qrencode.spec qrencode.1])
+ 
+ dnl --with-tools
+ AC_ARG_WITH([tools], [AC_HELP_STRING([--with-tools], [build utility tools [default=yes]])],
+  [build_tools=$withval], [build_tools=yes])
+ AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ])
+ if test x$build_tools = xyes ; then
+-	PKG_CHECK_MODULES(png, "libpng12")
++	PKG_CHECK_MODULES(png, "libpng")
+ fi
+ 
+ dnl --with-tests
+@@ -54,12 +54,6 @@
+ fi
+ 
+ 
+-if test x$build_tests = xyes ; then
+-	SDL_REQUIRED_VERSION=1.2.0
+-	AM_PATH_SDL($SDL_REQUIRED_VERSION,,AC_MSG_WARN([*** SDL $SDL_REQUIRED_VERSION or better is required.]))
+-fi
+-AM_CONDITIONAL(HAVE_SDL, [test "x$SDL_CFLAGS" != "x" ])
+-
+ 
+ dnl --enable-gprof
+ AC_ARG_ENABLE([gprof], [AC_HELP_STRING([--enable-gprof], [generate extra code to write profile information suitable for gprof [default=no]])],
diff --git a/media-gfx/qrencode/qrencode-3.1.1.ebuild b/media-gfx/qrencode/qrencode-3.1.1.ebuild
index da03bf3e3f1e..9920de1f5ee3 100644
--- a/media-gfx/qrencode/qrencode-3.1.1.ebuild
+++ b/media-gfx/qrencode/qrencode-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/qrencode-3.1.1.ebuild,v 1.5 2010/09/29 15:13:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/qrencode-3.1.1.ebuild,v 1.6 2011/01/31 08:37:00 joker Exp $
 
 EAPI=2
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="C library for encoding data in a QR Code symbol"
 HOMEPAGE="http://megaui.net/fukuchi/works/qrencode/index.en.html"
@@ -19,10 +19,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	sed -i \
-		-e 's:libpng12:libpng:' \
-		configure.ac || die
-
+	epatch "${FILESDIR}/${P}-pngregenfix.patch"
 	eautoreconf
 }