Fix building with GLIBC 2.10+ wrt #276066. Fix random QA stuff

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

4 files changed, 47 insertions, 20 deletions

diff --git a/media-gfx/swftools/ChangeLog b/media-gfx/swftools/ChangeLog
index 04a1e855d735..21ee7512583c 100644
--- a/media-gfx/swftools/ChangeLog
+++ b/media-gfx/swftools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/swftools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/ChangeLog,v 1.33 2009/07/06 21:53:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/ChangeLog,v 1.34 2009/08/09 14:37:30 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> swftools-0.9.0.ebuild,
+  +files/swftools-0.9.0-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #276066.
 
   06 Jul 2009; Jeroen Roovers <jer@gentoo.org> swftools-0.8.1.ebuild:
   Stable for HPPA too.
diff --git a/media-gfx/swftools/Manifest b/media-gfx/swftools/Manifest
index a397b08e4ee9..19e8bb5af0f0 100644
--- a/media-gfx/swftools/Manifest
+++ b/media-gfx/swftools/Manifest
@@ -1,7 +1,8 @@
 AUX swftools-0.7.0-gcc41.patch 674 RMD160 468d9830d4e80a94066e4c790c0105063675a993 SHA1 50325705d8539784584c6bbce7e42d9991f0e5fb SHA256 4e5116236d8be8d8aedef7103501d736c2cec1f500363d86132e788755fdf475
+AUX swftools-0.9.0-glibc-2.10.patch 1055 RMD160 c2c7c9eb386968314390488a9f7ce956546df68d SHA1 651f96da72c816c087fe779547e5565a579fdaa9 SHA256 00c85c516c2266e3aff71658caf172a7c9e2c2d8ce75d84c6960de77b6e4d646
 DIST swftools-0.8.1.tar.gz 1743477 RMD160 efcc585bb1fb3c0e533880bede4411bf109121bc SHA1 9cf4722dc92901de50cfabee288b134efc2e9010 SHA256 54b067fe8f644be7bc6d2b037d10679166d7c2cee1c2876d7a4434bee260e550
 DIST swftools-0.9.0.tar.gz 2654046 RMD160 15413b381f20d044062c95dd0583f37ad7cf9979 SHA1 440104e1efa2ea081b17cc3f294ed4e9cc1da497 SHA256 f875df4546f0ed1753ad9bb6e0c71e1390189e93a0e17ad6156d178cf1a212ea
 EBUILD swftools-0.8.1.ebuild 962 RMD160 8348ceb55c1d1bf652ec7bbe04eb500849472ef1 SHA1 854c183404732351a234e12bffe7809c0e7af3ff SHA256 5ef3484330360ec911202d15c7ec2403f2aa63b53da2ca28034e321673ddfbdc
-EBUILD swftools-0.9.0.ebuild 969 RMD160 d3b393bfbf76f8335e8f87ca26b9832aed20e964 SHA1 91e77b8b9af30d45e5c37cc0573c470e30d19389 SHA256 f35609e5c6bcc26c97070b5c6183b51a6fe1e7c440e577687e01dd50d5fbc77f
-MISC ChangeLog 4919 RMD160 1a10c801775d7df3aa4fe1549d26a5987a4789c7 SHA1 3f55ccdd93faccf384176d6886741bc4a23c9e72 SHA256 c16a9cbbedd7ca621ba33cdc8385c53e0b1c7440bdb7eb0bc82c7d702009f294
+EBUILD swftools-0.9.0.ebuild 920 RMD160 d31cd087012c4ef8bc92ed1480c1b6d83288822c SHA1 50e6b4181c1b1929a94ef67fc79341ace8061987 SHA256 777c3c0c789b9f8a4606264ce21058a10dba3102a1e77438d12110a7a2f8b780
+MISC ChangeLog 5090 RMD160 41ce3b42d4526919dcf2220d851af0710ad6fde0 SHA1 8710806165d8b7a961a41a26f564e44e145d45ca SHA256 c0595486f96e96369b92fd1b748002ee70de022c9e2dc03897614245543f33ce
 MISC metadata.xml 405 RMD160 bf4a684561c69f6ad4523191490181a852f04099 SHA1 e4a4d61eacb54b9220bbddcc8a35f9091dc84191 SHA256 270ebc58d0eea07cb9f7b58aa0664d5923585f855c9268823bb3db4322cb13af
diff --git a/media-gfx/swftools/files/swftools-0.9.0-glibc-2.10.patch b/media-gfx/swftools/files/swftools-0.9.0-glibc-2.10.patch
new file mode 100644
index 000000000000..ee6918ab4412
--- /dev/null
+++ b/media-gfx/swftools/files/swftools-0.9.0-glibc-2.10.patch
@@ -0,0 +1,26 @@
+diff -ur swftools-0.9.0.orig/lib/pdf/GFXOutputDev.cc swftools-0.9.0/lib/pdf/GFXOutputDev.cc
+--- swftools-0.9.0.orig/lib/pdf/GFXOutputDev.cc	2009-04-13 02:25:32.000000000 +0300
++++ swftools-0.9.0/lib/pdf/GFXOutputDev.cc	2009-08-09 17:33:23.000000000 +0300
+@@ -2504,8 +2504,8 @@
+     memset(f, 0, sizeof(fontfile_t));
+     f->filename = filename;
+     int len = strlen(filename);
+-    char*r1 = strrchr(filename, '/');
+-    char*r2 = strrchr(filename, '\\');
++    char*r1 = const_cast<char*> (strrchr(filename, '/'));
++    char*r2 = const_cast<char*> (strrchr(filename, '\\'));
+     if(r2>r1)
+         r1 = r2;
+     if(r1) {
+diff -ur swftools-0.9.0.orig/lib/pdf/pdf.cc swftools-0.9.0/lib/pdf/pdf.cc
+--- swftools-0.9.0.orig/lib/pdf/pdf.cc	2009-04-13 02:25:32.000000000 +0300
++++ swftools-0.9.0/lib/pdf/pdf.cc	2009-08-09 17:36:46.000000000 +0300
+@@ -458,7 +458,7 @@
+     i->filename = strdup(filename);
+ 
+     char*x = 0;
+-    if((x = strchr(filename, '|'))) {
++    if((x = const_cast<char*> (strchr(filename, '|')))) {
+ 	*x = 0;
+ 	userPassword = x+1;
+     }
diff --git a/media-gfx/swftools/swftools-0.9.0.ebuild b/media-gfx/swftools/swftools-0.9.0.ebuild
index be6e690daffb..9981f8e432b7 100644
--- a/media-gfx/swftools/swftools-0.9.0.ebuild
+++ b/media-gfx/swftools/swftools-0.9.0.ebuild
@@ -1,40 +1,36 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/swftools-0.9.0.ebuild,v 1.1 2009/06/28 11:18:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/swftools-0.9.0.ebuild,v 1.2 2009/08/09 14:37:30 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="SWF Tools is a collection of SWF manipulation and generation utilities"
 HOMEPAGE="http://www.swftools.org/"
 SRC_URI="http://www.swftools.org/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=media-libs/t1lib-1.3.1
+RDEPEND=">=media-libs/t1lib-1.3.1
 	media-libs/freetype
-	media-libs/jpeg
+	media-libs/jpeg"
+DEPEND="${RDEPEND}
 	!<media-libs/ming-0.4.0_rc2"
-RDEPEND=""
 
-src_compile() {
-	econf
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
 
+src_configure() {
+	econf
 	# disable the python interface; there's no configure switch; bug 118242
 	echo "all install uninstall clean:" > lib/python/Makefile
-
-	emake
 }
 
 src_install() {
-	einstall || die "Install died."
-	dodoc AUTHORS ChangeLog FAQ TODO
-}
-
-pkg_postinst() {
-	elog
-	elog "avifile is currently not supported."
-	elog "Therefore, avi2swf was not installed."
-	elog
+	einstall || die "einstall failed"
+	dodoc AUTHORS ChangeLog FAQ
 }