Rename "file" USE flag to "magic", bug 282199.

(Portage version: 2.2_rc38/cvs/Linux i686)

5 files changed, 21 insertions, 17 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 6e526f5ccfa8..379c54631f33 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/rpm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.101 2008/12/27 22:04:05 caleb Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.102 2009/08/21 13:18:32 ulm Exp $
+
+  21 Aug 2009; Ulrich Mueller <ulm@gentoo.org> rpm-5.0.0.ebuild,
+  rpm-5.0.3.ebuild, rpm-5.1.6.ebuild, metadata.xml:
+  Rename "file" USE flag to "magic", bug 282199.
 
 *rpm-5.1.6 (27 Dec 2008)
 
diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml
index 90ce67ae68db..fe5be6a03af6 100644
--- a/app-arch/rpm/metadata.xml
+++ b/app-arch/rpm/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-<email>maintainer-needed@gentoo.org</email>
+  <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='file'>add magic file support</flag>
-<flag name='neon'>include support for neon</flag>
+  <flag name='magic'>Add magic file support (<pkg>sys-apps/file</pkg>)</flag>
+  <flag name='neon'>Include support for <pkg>net-misc/neon</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/app-arch/rpm/rpm-5.0.0.ebuild b/app-arch/rpm/rpm-5.0.0.ebuild
index c1822e88b87d..72e93934f11c 100644
--- a/app-arch/rpm/rpm-5.0.0.ebuild
+++ b/app-arch/rpm/rpm-5.0.0.ebuild
@@ -1,6 +1,6 @@
-# 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/app-arch/rpm/rpm-5.0.0.ebuild,v 1.1 2008/01/05 16:27:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-5.0.0.ebuild,v 1.2 2009/08/21 13:18:32 ulm Exp $
 
 inherit multilib distutils python
 
@@ -14,7 +14,7 @@ SRC_URI="http://rpm5.org/files/rpm/rpm-5.0/${MY_P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="berkdb bzip2 doc file lua neon nls pcre perl python selinux sqlite"
+IUSE="berkdb bzip2 doc lua magic neon nls pcre perl python selinux sqlite"
 
 #	dmalloc? ( dev-libs/dmalloc )
 #	efence? ( dev-util/efence )
@@ -59,7 +59,7 @@ src_compile() {
 		$(use_with berkdb db) \
 		$(use_with bzip2) \
 		$(use_with doc apidocs) \
-		$(use_with file) \
+		$(use_with magic file) \
 		$(use_with lua) \
 		$(use_with neon) \
 		$(use_with nls) \
diff --git a/app-arch/rpm/rpm-5.0.3.ebuild b/app-arch/rpm/rpm-5.0.3.ebuild
index 3aa48ad33101..9f5e2801b8df 100644
--- a/app-arch/rpm/rpm-5.0.3.ebuild
+++ b/app-arch/rpm/rpm-5.0.3.ebuild
@@ -1,6 +1,6 @@
-# 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/app-arch/rpm/rpm-5.0.3.ebuild,v 1.2 2008/09/25 09:54:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-5.0.3.ebuild,v 1.3 2009/08/21 13:18:32 ulm Exp $
 
 inherit multilib distutils python
 
@@ -14,7 +14,7 @@ SRC_URI="http://rpm5.org/files/rpm/rpm-5.0/${MY_P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="berkdb bzip2 doc file lua neon nls pcre perl python selinux sqlite"
+IUSE="berkdb bzip2 doc lua magic neon nls pcre perl python selinux sqlite"
 
 #	dmalloc? ( dev-libs/dmalloc )
 #	efence? ( dev-util/efence )
@@ -59,7 +59,7 @@ src_compile() {
 		$(use_with berkdb db) \
 		$(use_with bzip2) \
 		$(use_with doc apidocs) \
-		$(use_with file) \
+		$(use_with magic file) \
 		$(use_with lua) \
 		$(use_with neon) \
 		$(use_with nls) \
diff --git a/app-arch/rpm/rpm-5.1.6.ebuild b/app-arch/rpm/rpm-5.1.6.ebuild
index 37924052927e..dd4b3fc17f75 100644
--- a/app-arch/rpm/rpm-5.1.6.ebuild
+++ b/app-arch/rpm/rpm-5.1.6.ebuild
@@ -1,6 +1,6 @@
-# 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/app-arch/rpm/rpm-5.1.6.ebuild,v 1.1 2008/12/27 22:04:05 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-5.1.6.ebuild,v 1.2 2009/08/21 13:18:32 ulm Exp $
 
 inherit multilib distutils python
 
@@ -14,7 +14,7 @@ SRC_URI="http://rpm5.org/files/rpm/rpm-5.1/${MY_P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="berkdb bzip2 doc file lua neon nls pcre perl python selinux sqlite"
+IUSE="berkdb bzip2 doc lua magic neon nls pcre perl python selinux sqlite"
 
 #	dmalloc? ( dev-libs/dmalloc )
 #	efence? ( dev-util/efence )
@@ -66,7 +66,7 @@ src_compile() {
 		$(use_with berkdb db) \
 		$(use_with bzip2) \
 		$(use_with doc apidocs) \
-		$(use_with file) \
+		$(use_with magic file) \
 		$(use_with lua) \
 		$(use_with neon) \
 		$(use_with nls) \