Added a better fix for unicode on x86 thanks to Harald Van Dijk <truedfx@gentoo.org>.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 43 insertions, 16 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 086b32ca80a9..5903462bbf28 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.127 2005/08/22 04:27:59 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.128 2005/10/01 16:47:12 metalgod Exp $
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  cdrtools-2.01.01_alpha01-r2.ebuild, cdrtools-2.01.01_alpha03-r2.ebuild:
+  Added a better fix for unicode on x86 thanks to Harald Van Dijk
+  <truedfx@gentoo.org>.
 
 *cdrtools-2.01.01_alpha03-r2 (22 Aug 2005)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 60d6293f3744..63cfdee30ab0 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,16 +1,26 @@
-MD5 b99aca1cac4436f277c4583809661008 cdrtools-2.01.01_alpha01-r2.ebuild 3614
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 23774e05bb2f4f654d3b0715a1e2a360 ChangeLog 19641
 MD5 5a2a9ad0ab6a40d5ee27662bf265bc41 cdrtools-2.01-r1.ebuild 2830
-MD5 01e43fe5e09ee1419b3bae6fbbf193d9 cdrtools-2.01.01_alpha03-r2.ebuild 3768
 MD5 7851326782af5e5357d8e24d8decee25 cdrtools-2.01-r3.ebuild 3608
-MD5 1f0db5e21ca94726c12c55b8d1bbffa8 ChangeLog 19426
+MD5 1f5b609bc623a95800f968ec4bdd4eac cdrtools-2.01.01_alpha01-r2.ebuild 3850
 MD5 015ab4293805faaa417d5ac5304750c4 metadata.xml 254
-MD5 9c89bdd0371267dc24f8640160b9ea9e files/cdrtools-2.01a27-writemode.patch 477
+MD5 6817af3df53f157fe4f24d5b47f75235 cdrtools-2.01.01_alpha03-r2.ebuild 3963
 MD5 3b1ffea11e1653b7b16c2c89597d1c5a files/cdrtools-2.01-scsi-remote.patch 938
-MD5 0a9c4d3c7d28293dd147c78f57dd2a1f files/cdrtools-2.01.01a01-scanbus.patch 776
-MD5 1a596f5cae257e97c559716336b30e5b files/mkisofs-iconv-10.patch 16986
-MD5 5c79e3ba5125fdb0695604c77a00b707 files/cdrtools-2.01.01a03-rezero.patch 558
 MD5 c848b3b9b6921469483a22caa0fd40c3 files/digest-cdrtools-2.01-r1 67
 MD5 8165b59a7b14939c58a88ca1f272cad4 files/digest-cdrtools-2.01-r3 147
-MD5 118ed27cd1f6e1cc5e48adc622bb8528 files/cdrtools-2.01.01a03-warnings.patch 853
 MD5 0e8283f78b14f3ead0e78d197e1d5ed1 files/digest-cdrtools-2.01.01_alpha01-r2 153
+MD5 1a596f5cae257e97c559716336b30e5b files/mkisofs-iconv-10.patch 16986
+MD5 5c79e3ba5125fdb0695604c77a00b707 files/cdrtools-2.01.01a03-rezero.patch 558
+MD5 118ed27cd1f6e1cc5e48adc622bb8528 files/cdrtools-2.01.01a03-warnings.patch 853
+MD5 9c89bdd0371267dc24f8640160b9ea9e files/cdrtools-2.01a27-writemode.patch 477
+MD5 0a9c4d3c7d28293dd147c78f57dd2a1f files/cdrtools-2.01.01a01-scanbus.patch 776
 MD5 a5a56cb102587325619a4d3a610d0085 files/digest-cdrtools-2.01.01_alpha03-r2 153
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDPsvQwUpWvClEHQoRAqWEAJ9+1fo1b61Nr+E7u0+cXva1N2bLMgCfeLd5
+RL2fZkFhK06dank5ZAS050M=
+=cHGw
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild
index 837a800c1fb6..4e720148bceb 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild,v 1.5 2005/08/07 00:24:25 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild,v 1.6 2005/10/01 16:47:12 metalgod Exp $
 
 inherit eutils gnuconfig toolchain-funcs flag-o-matic
 
@@ -59,7 +59,15 @@ src_unpack() {
 src_compile() {
 	gnuconfig_update
 
-	use unicode && append-flags "-finput-charset=ISO-8859-1 -fexec-charset=UTF-8"
+	if use unicode; then
+		local flags="$(test_flag -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
+		if [[ -n ${flags} ]]; then
+			append-flags ${flags}
+		else
+			ewarn "Your compiler does not support the options required to build"
+			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
+		fi
+	fi
 
 	emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
 }
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r2.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r2.ebuild
index 17c25f8195d8..f7a79727aaf7 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r2.ebuild,v 1.1 2005/08/22 04:27:59 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r2.ebuild,v 1.2 2005/10/01 16:47:12 metalgod Exp $
 
 inherit eutils gnuconfig toolchain-funcs flag-o-matic
 
@@ -60,10 +60,14 @@ src_unpack() {
 src_compile() {
 	gnuconfig_update
 
-	use unicode && append-flags "-finput-charset=ISO-8859-1 -fexec-charset=UTF-8"
-	if use x86;
-		then
-		strip-flags
+	if use unicode; then
+		local flags="$(test_flag -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
+		if [[ -n ${flags} ]]; then
+			append-flags ${flags}
+		else
+			ewarn "Your compiler does not support the options required to build"
+			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
+		fi
 	fi
 	emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
 }