Removed check for gcc version to set input charset and just use test_flag.

Package-Manager: portage-2.0.51.21-r1

10 files changed, 41 insertions, 58 deletions

diff --git a/media-libs/libmatroska/ChangeLog b/media-libs/libmatroska/ChangeLog
index 9d55bbf53bb2..bf5d8062680e 100644
--- a/media-libs/libmatroska/ChangeLog
+++ b/media-libs/libmatroska/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libmatroska
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.53 2005/05/15 02:06:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.54 2005/05/15 16:44:03 flameeyes Exp $
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  libmatroska-0.7.0.ebuild, libmatroska-0.7.1.ebuild,
+  libmatroska-0.7.2.ebuild, libmatroska-0.7.3.ebuild,
+  libmatroska-0.7.3-r1.ebuild, libmatroska-0.7.4.ebuild,
+  libmatroska-0.7.5.ebuild, libmatroska-0.7.6.ebuild:
+  Removed check for gcc version to set input charset and just use test_flag.
 
   15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
   libmatroska-0.7.0.ebuild, libmatroska-0.7.1.ebuild,
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index b0132a9d3538..fbf33e82fd14 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,15 +1,15 @@
-MD5 6fdd1b3f3a78a66dae7f7d3eb2f1075e ChangeLog 6931
+MD5 9ab610896aa68f2e0560086ed13eea4e ChangeLog 7281
 MD5 65f8d0e35b8781b0aeaff644e8865791 libmatroska-0.5.2.ebuild 798
 MD5 3d450a21efeb1bb816f0418062792e1d libmatroska-0.6.2.ebuild 842
 MD5 34258a5f4d42394b9ba94a4971794d28 libmatroska-0.6.3.ebuild 1049
-MD5 995736a3e7c3caf3cfeaed2268d87fa6 libmatroska-0.7.0.ebuild 1322
-MD5 1860eb95b3e48b31d2e234972a441b6a libmatroska-0.7.1.ebuild 1287
-MD5 52ae799a37e60c9de1739192d150d080 libmatroska-0.7.2.ebuild 1287
-MD5 6d9512ec79ec1730159c2640432dbe90 libmatroska-0.7.3-r1.ebuild 1436
-MD5 94b64fe1954db0bcf026410213e202c4 libmatroska-0.7.3.ebuild 1376
-MD5 b65c18eaffa9f67e24e9cd18641f038d libmatroska-0.7.4.ebuild 1410
-MD5 da61a28a34bf63c4fdd6be0574678d83 libmatroska-0.7.5.ebuild 1407
-MD5 cfc1bf00f2dca42fab0d6240072956d1 libmatroska-0.7.6.ebuild 1306
+MD5 81723b42323d5a5f13c92db29dce6386 libmatroska-0.7.0.ebuild 1237
+MD5 c1016d6032bff5215152e2d59992881b libmatroska-0.7.1.ebuild 1202
+MD5 7193b8d9a95014c135a1b31250ed78af libmatroska-0.7.2.ebuild 1202
+MD5 c4bae45734496d6abe4846452bf79815 libmatroska-0.7.3-r1.ebuild 1351
+MD5 6f5a16f76aae92492c926f4a7fef5b09 libmatroska-0.7.3.ebuild 1291
+MD5 4e0322df4d977e455b6496406b05133c libmatroska-0.7.4.ebuild 1325
+MD5 905fac20e25ed05271888e9f97276c52 libmatroska-0.7.5.ebuild 1322
+MD5 c3d1b826bff9c5fb27a8a50273c8c268 libmatroska-0.7.6.ebuild 1221
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 a517d15638be5ee91357b70059040e06 files/digest-libmatroska-0.5.2 68
 MD5 a37de967f24a547a9f51018af01ccd30 files/digest-libmatroska-0.6.2 68
diff --git a/media-libs/libmatroska/libmatroska-0.7.0.ebuild b/media-libs/libmatroska/libmatroska-0.7.0.ebuild
index 202234911d0d..1772a919bbc8 100644
--- a/media-libs/libmatroska/libmatroska-0.7.0.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.0.ebuild,v 1.16 2005/05/15 02:06:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.0.ebuild,v 1.17 2005/05/15 16:44:03 flameeyes Exp $
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="http://www.matroska.org/"
@@ -28,10 +28,7 @@ src_compile() {
 	sed -i -e 's/CXXFLAGS=/CXXFLAGS+=/g' Makefile
 
 	#fixes locale for gcc3.4.0 to close bug 52385
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		append-flags -finput-charset=ISO8859-15
-	fi
+	append-flags $(test_flag -finput-charset=ISO8859-15)
 
 	make PREFIX=/usr \
 		LIBEBML_INCLUDE_DIR=/usr/include/ebml \
diff --git a/media-libs/libmatroska/libmatroska-0.7.1.ebuild b/media-libs/libmatroska/libmatroska-0.7.1.ebuild
index ea37329c80b1..aff88d80f7d0 100644
--- a/media-libs/libmatroska/libmatroska-0.7.1.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.1.ebuild,v 1.4 2005/05/15 02:06:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.1.ebuild,v 1.5 2005/05/15 16:44:03 flameeyes Exp $
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="http://www.matroska.org/"
@@ -28,10 +28,7 @@ src_compile() {
 	sed -i -e 's/CXXFLAGS=/CXXFLAGS+=/g' Makefile
 
 	#fixes locale for gcc3.4.0 to close bug 52385
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		append-flags -finput-charset=ISO8859-15
-	fi
+	append-flags $(test_flag -finput-charset=ISO8859-15)
 
 	make PREFIX=/usr \
 		LIBEBML_INCLUDE_DIR=/usr/include/ebml \
diff --git a/media-libs/libmatroska/libmatroska-0.7.2.ebuild b/media-libs/libmatroska/libmatroska-0.7.2.ebuild
index 142c41d9920f..57e4d65b788a 100644
--- a/media-libs/libmatroska/libmatroska-0.7.2.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.2.ebuild,v 1.4 2005/05/15 02:06:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.2.ebuild,v 1.5 2005/05/15 16:44:03 flameeyes Exp $
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="http://www.matroska.org/"
@@ -28,10 +28,7 @@ src_compile() {
 	sed -i -e 's/CXXFLAGS=/CXXFLAGS+=/g' Makefile
 
 	#fixes locale for gcc3.4.0 to close bug 52385
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		append-flags -finput-charset=ISO8859-15
-	fi
+	append-flags $(test_flag -finput-charset=ISO8859-15)
 
 	make PREFIX=/usr \
 		LIBEBML_INCLUDE_DIR=/usr/include/ebml \
diff --git a/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild b/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild
index f9c451e3d0d7..1475eef193ab 100644
--- a/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild,v 1.6 2005/05/15 02:06:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild,v 1.7 2005/05/15 16:44:03 flameeyes Exp $
 
 IUSE=""
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="http://www.matroska.org/"
@@ -36,10 +36,7 @@ src_compile() {
 	use ppc && append-flags -fPIC
 
 	#fixes locale for gcc3.4.0 to close bug 52385
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		append-flags -finput-charset=ISO8859-15
-	fi
+	append-flags $(test_flag -finput-charset=ISO8859-15)
 
 	make PREFIX=/usr \
 		LIBEBML_INCLUDE_DIR=/usr/include/ebml \
diff --git a/media-libs/libmatroska/libmatroska-0.7.3.ebuild b/media-libs/libmatroska/libmatroska-0.7.3.ebuild
index 65c4c9ee0785..9b320c156db7 100644
--- a/media-libs/libmatroska/libmatroska-0.7.3.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3.ebuild,v 1.5 2005/05/15 02:06:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3.ebuild,v 1.6 2005/05/15 16:44:03 flameeyes Exp $
 
 IUSE=""
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="http://www.matroska.org/"
@@ -33,10 +33,7 @@ src_compile() {
 	use ppc && append-flags -fPIC
 
 	#fixes locale for gcc3.4.0 to close bug 52385
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		append-flags -finput-charset=ISO8859-15
-	fi
+	append-flags $(test_flag -finput-charset=ISO8859-15)
 
 	make PREFIX=/usr \
 		LIBEBML_INCLUDE_DIR=/usr/include/ebml \
diff --git a/media-libs/libmatroska/libmatroska-0.7.4.ebuild b/media-libs/libmatroska/libmatroska-0.7.4.ebuild
index 0840ca6c6048..0e8b6f497023 100644
--- a/media-libs/libmatroska/libmatroska-0.7.4.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.4.ebuild,v 1.11 2005/05/15 02:06:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.4.ebuild,v 1.12 2005/05/15 16:44:03 flameeyes Exp $
 
 IUSE=""
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="http://www.matroska.org/"
@@ -36,10 +36,7 @@ src_compile() {
 	use ppc && append-flags -fPIC
 
 	#fixes locale for gcc3.4.0 to close bug 52385
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		append-flags -finput-charset=ISO8859-15
-	fi
+	append-flags $(test_flag -finput-charset=ISO8859-15)
 
 	make PREFIX=/usr \
 		LIBEBML_INCLUDE_DIR=/usr/include/ebml \
diff --git a/media-libs/libmatroska/libmatroska-0.7.5.ebuild b/media-libs/libmatroska/libmatroska-0.7.5.ebuild
index c23e65e8d998..47ad19e7aadf 100644
--- a/media-libs/libmatroska/libmatroska-0.7.5.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.5.ebuild,v 1.5 2005/05/15 02:06:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.5.ebuild,v 1.6 2005/05/15 16:44:03 flameeyes Exp $
 
 IUSE=""
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="http://www.matroska.org/"
@@ -36,10 +36,7 @@ src_compile() {
 	use ppc && append-flags -fPIC
 
 	#fixes locale for gcc3.4.0 to close bug 52385
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		append-flags -finput-charset=ISO8859-15
-	fi
+	append-flags $(test_flag -finput-charset=ISO8859-15)
 
 	make PREFIX=/usr \
 		LIBEBML_INCLUDE_DIR=/usr/include/ebml \
diff --git a/media-libs/libmatroska/libmatroska-0.7.6.ebuild b/media-libs/libmatroska/libmatroska-0.7.6.ebuild
index ddabf77f2878..753000970f58 100644
--- a/media-libs/libmatroska/libmatroska-0.7.6.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.6.ebuild,v 1.3 2005/05/15 02:06:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.6.ebuild,v 1.4 2005/05/15 16:44:03 flameeyes Exp $
 
 IUSE=""
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="http://www.matroska.org/"
@@ -32,10 +32,7 @@ src_compile() {
 	append-flags -fPIC
 
 	#fixes locale for gcc3.4.0 to close bug 52385
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		append-flags -finput-charset=ISO8859-15
-	fi
+	append-flags $(test_flag -finput-charset=ISO8859-15)
 
 	emake PREFIX=/usr \
 		LIBEBML_INCLUDE_DIR=/usr/include/ebml \