Remove flag-o-matic from inherit as the workaround for bug #168800 was already removed.

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

7 files changed, 24 insertions, 17 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 578cb4d34d35..f1ffc6b63971 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/gnu-classpath
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.106 2010/03/21 22:41:37 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.107 2010/03/25 13:08:57 caster Exp $
+
+  25 Mar 2010; Vlastimil Babka <caster@gentoo.org>
+  gnu-classpath-0.97-r1.ebuild, gnu-classpath-0.97.2.ebuild,
+  gnu-classpath-0.97.2-r1.ebuild, gnu-classpath-0.98-r1.ebuild,
+  gnu-classpath-0.98-r2.ebuild:
+  Remove flag-o-matic from inherit as the workaround for bug #168800 was
+  already removed.
 
   21 Mar 2010; Vlastimil Babka <caster@gentoo.org>
   gnu-classpath-0.97-r1.ebuild, gnu-classpath-0.97.2.ebuild,
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index eb303c0f0c84..b4d2692babc4 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -2,10 +2,10 @@ AUX 0.93-nsplugin.patch 1518 RMD160 b82f191cd788dce09745ca17042499f278d0b695 SHA
 DIST classpath-0.97-gentoo.tar.gz 10261662 RMD160 01ef33c4e50b5c88bfe2f59d9249110072d3764e SHA1 22b2ac2444b73df841e07c36c4e6621ab9a06d3f SHA256 5f0619b26fe3e0cded3e76a09be4004db62f5bcd198c041da2bd619cc633200e
 DIST classpath-0.97.2.tar.gz 10318014 RMD160 a33667d2b692da22cb872c57265511115a543a76 SHA1 627e9781f9bb744b1a70e4aaff88d2d0440cbf1f SHA256 001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4
 DIST classpath-0.98.tar.gz 11021342 RMD160 9a20f4ca9379d90cbca644c0e9410df1c57575a5 SHA1 1d6e8d1b3542a35bbd1013c61fab3cfae083decb SHA256 501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f
-EBUILD gnu-classpath-0.97-r1.ebuild 3304 RMD160 90c364c6885dd19572357f34cb31d0c019f3be1d SHA1 4cde99a6e1c2e64eebf2a775b34c6a33365d1cbd SHA256 003a6927af8c1f25dd5d5d584d243cbe60129405171b8c89cef7a01588717546
-EBUILD gnu-classpath-0.97.2-r1.ebuild 2551 RMD160 830c3b90f91e5d3afef010f2df4af25260604f54 SHA1 c2d9dc8dda86b76c626a7354f829d667c3cc4924 SHA256 2329e93d2ba6afbab55eaa090f90627fd05d01f0221a183999c1db551feded53
-EBUILD gnu-classpath-0.97.2.ebuild 2441 RMD160 b008eba788b76762d5a149ee2d42948e5e256040 SHA1 8d157049a1c27001644cfb213011bbb9afa2ea02 SHA256 e9d867f072e99bd1adf14b1fec65e30e4de5afc4071af73333057a09637afb38
-EBUILD gnu-classpath-0.98-r1.ebuild 3196 RMD160 ad61b50943c1918cf1f41dca4d053b452378d1c3 SHA1 1f22fbe68f77e22341d3978de1c197f75512ba3c SHA256 50acc65a3ee097fdf8058a3a4afebe0dcae9a3cab43a3fb7aa1ad07037090932
-EBUILD gnu-classpath-0.98-r2.ebuild 3197 RMD160 50d8ba289072479c2dfb68f382bc6714995c8373 SHA1 f48a13d6c05802c6dbbfcf1a9a6e1062ae46522a SHA256 16e66d8a38ce6d1c3de85744a50d13ecbc0265c48535ab235fe8dc1aeae0b226
-MISC ChangeLog 16122 RMD160 a05f7db657a2592177d2ba4d6b1da7855b066eba SHA1 9ae91a1a7d54832d7be6eccc64fef80df05d6e07 SHA256 f8e26362b97724cab31339393e693b0c71e2f4add45353c438a20bdea202a912
+EBUILD gnu-classpath-0.97-r1.ebuild 3291 RMD160 38502056d3327de61c2e561a3cd7c8a573262a18 SHA1 fb4f5ad58e784b212e731d2d56c0bd8b2fc49246 SHA256 75499bb875b31a623e49359b474eb7bfc59a7bc32c5c8603e27b9bf794af8caf
+EBUILD gnu-classpath-0.97.2-r1.ebuild 2538 RMD160 6f5f25b8ca46d706fa87116f55a4b3d9a3a6c5bf SHA1 342637e679afe3e8ed0f0e35e9a11e186aef910a SHA256 9322596c0f607ffe88c65fca9aa25f6510729c7d8d7e84a6362f4bb27907e044
+EBUILD gnu-classpath-0.97.2.ebuild 2428 RMD160 aec89559c84dd26b8067ec3b79b76669a21e75d6 SHA1 c048e9689dd96f2f9cd325f6d9a952300545da67 SHA256 228c5146db9ac690a7daed9c890115832df701b6755b690ad2f8852713fe7e61
+EBUILD gnu-classpath-0.98-r1.ebuild 3183 RMD160 fc7dfd062aebf44f2882ac246f970215fddad569 SHA1 5b0369b71c0de54ab6b99d76b4361213d1d8a7e0 SHA256 c83a69bf8dc2f41c20576db206343afe24b4ad90953e59b3b34c2df211e8fd5f
+EBUILD gnu-classpath-0.98-r2.ebuild 3184 RMD160 5907f32e11e20bcbcd64caed70acc638a9575516 SHA1 1abb124ff949f001c08f93234748d04299e71e3f SHA256 5b02d80e2d61a3a61fd7b2416dfc6e646d9ff11dfc18d634cddd4e109224056e
+MISC ChangeLog 16423 RMD160 8d4abf5c0d0412c7f72612ee9a710cbdeeed1fd6 SHA1 ba104bfaa87da4d0b9436e263e5f6e18d44583c4 SHA256 1f7e738c9fdaebb06ccb72d165bddc0024cf63b2e95e84205505bc07a4e4f42c
 MISC metadata.xml 759 RMD160 c3f604690ab9414b5d0c58fb74e1d85be10723be SHA1 1a83518e46e13aba75a83f0793e7db52b725867a SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
index 341b8c4278ec..86234441eb7a 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.13 2010/03/21 22:41:37 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.14 2010/03/25 13:08:57 caster Exp $
 
 EAPI=1
 
-inherit eutils flag-o-matic multilib java-pkg-2
+inherit eutils multilib java-pkg-2
 
 # .properties were from missing from tools.zip so I rolled out my own tarball
 # Should be changed back to upstream tarballs fro next release
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild
index 4eab084cb850..44cc6cf4a468 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild,v 1.2 2010/03/21 22:41:37 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild,v 1.3 2010/03/25 13:08:57 caster Exp $
 
 EAPI=1
 
-inherit eutils flag-o-matic multilib java-pkg-2
+inherit eutils multilib java-pkg-2
 
 MY_P=${P/gnu-/}
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
index 144994a9bd03..c2efa58b4f86 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.8 2010/03/21 22:41:37 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.9 2010/03/25 13:08:57 caster Exp $
 
 EAPI=1
 
-inherit eutils flag-o-matic multilib
+inherit eutils multilib
 
 MY_P=${P/gnu-/}
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild
index 3bde8640c3d8..fd0877b3c8ad 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild,v 1.7 2010/03/21 20:50:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild,v 1.8 2010/03/25 13:08:57 caster Exp $
 
 EAPI=2
 
-inherit eutils flag-o-matic java-pkg-2 base multilib
+inherit eutils java-pkg-2 base multilib
 
 MY_P=${P/gnu-/}
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild
index 37073cccc918..9479ef705a53 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild,v 1.4 2010/03/21 20:50:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild,v 1.5 2010/03/25 13:08:57 caster Exp $
 
 EAPI=2
 
-inherit eutils flag-o-matic java-pkg-2 base multilib
+inherit eutils java-pkg-2 base multilib
 
 MY_P=${P/gnu-/}
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"