Fix building with glibc-2.10+ wrt #278143.

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

4 files changed, 59 insertions, 14 deletions

diff --git a/media-video/atomicparsley/ChangeLog b/media-video/atomicparsley/ChangeLog
index a64ed3c116ad..496f790145fd 100644
--- a/media-video/atomicparsley/ChangeLog
+++ b/media-video/atomicparsley/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/atomicparsley
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/atomicparsley/ChangeLog,v 1.14 2008/04/10 07:48:34 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/atomicparsley/ChangeLog,v 1.15 2009/07/21 21:55:46 ssuominen Exp $
+
+  21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  atomicparsley-0.9.0.ebuild, +files/atomicparsley-0.9.0-glibc-2.10.patch:
+  Fix building with glibc-2.10+ wrt #278143.
 
   10 Apr 2008; Samuli Suominen <drac@gentoo.org> metadata.xml,
   atomicparsley-0.9.0.ebuild:
diff --git a/media-video/atomicparsley/Manifest b/media-video/atomicparsley/Manifest
index 876ace9abc9e..2e26713b8bf7 100644
--- a/media-video/atomicparsley/Manifest
+++ b/media-video/atomicparsley/Manifest
@@ -1,4 +1,5 @@
+AUX atomicparsley-0.9.0-glibc-2.10.patch 1988 RMD160 3d9f1404b605f7d989c8432febb5d9ef907dffd5 SHA1 fdedb38654a7573e4e4d93cb7939db86ddc0a769 SHA256 9e0895bcfd2a056e837a58471c62f7ac51d56bbce33eb8d11eddc68a41085b0e
 DIST AtomicParsley-source-0.9.0.zip 172616 RMD160 c83afb09518e89d3a5dc317bcf46e2f8e23a7a7a SHA1 5b647324a6f460a3e48665717593ca7910936a1b SHA256 1344a66170e1f324eb43618763dbcfe984ca84c64ea8baf81e99e59657e082f7
-EBUILD atomicparsley-0.9.0.ebuild 856 RMD160 c9d6159968a90ccca2389d40ec60f392074fb31c SHA1 cf23bcfa78f82d83ed264e3335c752f308584de0 SHA256 fb0a880bb2e62d3872af6f25688550c7504f04bd22bcfbb0a4bc010e000ca70d
-MISC ChangeLog 1843 RMD160 e5687809cf84f47a65f6daf11e6038d6dfeaff37 SHA1 1969b2356e744a511a9efc3ac83c1a2e6087d385 SHA256 a898bc811427d1439aa7146c178625604fd9a5620471171da2f9e88a92c65d73
+EBUILD atomicparsley-0.9.0.ebuild 910 RMD160 9c2f6d7949d76f4a84c442b75d5bfa55a448c49e SHA1 a51345eaa045e1005ee355dae70e906a943111b9 SHA256 4ac261df3c00a5797c0fb96f1b941c5d448dbabf560ae87a002e1d87c610f5db
+MISC ChangeLog 2023 RMD160 7147a1d423f29d5b79cbfe91c48de4f4a63b7a79 SHA1 6f0e69a228bfa0caa0633a82e4baecff03519605 SHA256 2f080e5b6c4f3d9cbb5caa20ada3c19d6ebb1bb71cabe2c9dab1c9f9d28473c1
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
index 4c7b0e171ff0..2022e2acd137 100644
--- a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
+++ b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/atomicparsley/atomicparsley-0.9.0.ebuild,v 1.11 2008/04/10 07:49:58 drac Exp $
-
-inherit toolchain-funcs
+# $Header: /var/cvsroot/gentoo-x86/media-video/atomicparsley/atomicparsley-0.9.0.ebuild,v 1.12 2009/07/21 21:55:46 ssuominen Exp $
 
+EAPI=2
 MY_P=AtomicParsley-source-${PV}
+inherit eutils toolchain-funcs
 
 DESCRIPTION="command line program for reading, parsing and setting iTunes-style metadata in MPEG4 files"
 HOMEPAGE="http://atomicparsley.sourceforge.net"
@@ -16,20 +16,21 @@ KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="app-arch/unzip"
+DEPEND="app-arch/unzip
+	sys-apps/sed"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:g++:$(tc-getCXX):g" "${S}"/build || die "sed failed."
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	sed -i -e "s:g++:$(tc-getCXX):g" build || die "sed failed"
 }
 
 src_compile() {
-	./build || die "build failed."
+	./build || die "build failed"
 }
 
 src_install() {
-	dobin AtomicParsley || die "dobin failed."
+	dobin AtomicParsley || die "dobin failed"
 	dodoc *.{txt,rtf}
 }
diff --git a/media-video/atomicparsley/files/atomicparsley-0.9.0-glibc-2.10.patch b/media-video/atomicparsley/files/atomicparsley-0.9.0-glibc-2.10.patch
new file mode 100644
index 000000000000..0397a4e42bca
--- /dev/null
+++ b/media-video/atomicparsley/files/atomicparsley-0.9.0-glibc-2.10.patch
@@ -0,0 +1,39 @@
+diff -ur AtomicParsley-source-0.9.0.orig/AtomicParsley.cpp AtomicParsley-source-0.9.0/AtomicParsley.cpp
+--- AtomicParsley-source-0.9.0.orig/AtomicParsley.cpp	2006-09-16 02:22:33.000000000 +0300
++++ AtomicParsley-source-0.9.0/AtomicParsley.cpp	2009-07-22 00:52:48.000000000 +0300
+@@ -1447,7 +1447,7 @@
+ 	uint32_t atom_offsets = 0;
+ 	char* uuid_outfile = (char*)calloc(1, sizeof(char)*MAXPATHLEN+1); //malloc a new string because it may be a cli arg for a specific output path	
+ 	if (output_path == NULL) {
+-		char* orig_suffix = strrchr(originating_file, '.');
++		const char* orig_suffix = strrchr(originating_file, '.');
+ 		if (orig_suffix == NULL) {
+ 			fprintf(stdout, "AP warning: a file extension for the input file was not found.\n\tGlobbing onto original filename...\n");
+ 			path_len = strlen(originating_file);
+@@ -4462,7 +4462,7 @@
+ #endif
+ 
+ void APar_DeriveNewPath(const char *filePath, char* temp_path, int output_type, const char* file_kind, char* forced_suffix, bool random_filename = true) {
+-	char* suffix = NULL;
++	const char* suffix = NULL;
+ 	if (forced_suffix == NULL) {
+ 		suffix = strrchr(filePath, '.');
+ 	} else {
+@@ -4480,7 +4480,7 @@
+ 		memcpy(temp_path, filePath, base_len);
+ 		memcpy(temp_path + base_len, file_kind, strlen(file_kind));
+ #else
+-		char* file_name = strrchr(filePath, '/');
++		const char* file_name = strrchr(filePath, '/');
+ 		size_t file_name_len = strlen(file_name);
+ 		memcpy(temp_path, filePath, filepath_len-file_name_len+1);
+ 		memcpy(temp_path + strlen(temp_path), ".", 1);
+@@ -5006,7 +5006,7 @@
+ 			free_modified_name = true;
+ 			if (forced_suffix_type == FORCE_M4B_TYPE) { //using --stik Audiobook with --overWrite will change the original file's extension
+ 				uint16_t filename_len = strlen(m4aFile);
+-				char* suffix = strrchr(m4aFile, '.');
++				const char* suffix = strrchr(m4aFile, '.');
+ 				memcpy(originating_file, m4aFile, filename_len+1 );
+ 				memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 );
+ 			}