Fix dependencies so that gettext is not in RDEPEND.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 41 insertions, 19 deletions

diff --git a/app-admin/fpm/ChangeLog b/app-admin/fpm/ChangeLog
index d98d177fa872..4448145ff26a 100644
--- a/app-admin/fpm/ChangeLog
+++ b/app-admin/fpm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/fpm
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/ChangeLog,v 1.11 2006/01/09 16:48:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/ChangeLog,v 1.12 2006/02/16 23:31:05 flameeyes Exp $
+
+  16 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> fpm-0.59.ebuild,
+  fpm-0.60.ebuild:
+  Fix dependencies so that gettext is not in RDEPEND.
 
   09 Jan 2006; Bryan Østergaard <kloeri@gentoo.org metadata.xml:
   Remove retired dev from metadata.xml
diff --git a/app-admin/fpm/Manifest b/app-admin/fpm/Manifest
index 9f78d2da5cbc..316481068cfb 100644
--- a/app-admin/fpm/Manifest
+++ b/app-admin/fpm/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 451d0a33110ca68e6d180e030a8c3bd4 ChangeLog 1240
+MD5 ed43b7275809c0b2547f2bb43c78fd92 ChangeLog 1387
+RMD160 857ed285f8bf2ed46e940721c85c2c08832620b5 ChangeLog 1387
+SHA256 8d9808b31e19a295fb32660fd6d7fb81cf07b2cabc2d18ec8ef1c4efda33f0d6 ChangeLog 1387
 MD5 4e5cac87c0eedbc94af5c328b8dedd8b files/digest-fpm-0.59 60
+RMD160 b0f81890f240865e7fc4972972dfaf49bbf4adc0 files/digest-fpm-0.59 60
+SHA256 079d1f6b1633253355c88714a53c4d6c72c8853b576cec2df24c370372dade60 files/digest-fpm-0.59 60
 MD5 f91c5af118c5e3bf81ca6fd8a7249e92 files/digest-fpm-0.60 60
-MD5 c08900d24b20570ec37f314e8b0b1cc1 fpm-0.59.ebuild 761
-MD5 55651ae73d0eac9547598ba4479d0b87 fpm-0.60.ebuild 737
+RMD160 78dea23cb4a06a9a90caef52dfc6960b05eab5c3 files/digest-fpm-0.60 60
+SHA256 350391ea595d15978f40c72b7716735f528ba2f6aea04456b5b3e8e9103f2a4c files/digest-fpm-0.60 60
+MD5 16dd164bd7379cef0dff4bfd5abb5087 fpm-0.59.ebuild 794
+RMD160 570ce921d14158064b80381cfe8a6466342d90de fpm-0.59.ebuild 794
+SHA256 f3942de2af3f8d92ee12384ed1c91c562ebf0f661bd56c6acf3522bfc3535c8e fpm-0.59.ebuild 794
+MD5 6dc86ddf0ca323d5f85d5c0a0ffa0f60 fpm-0.60.ebuild 770
+RMD160 9418bb15ad6b160e279076d717d0ad2f86c03979 fpm-0.60.ebuild 770
+SHA256 0c546c5a14beb03f4e776bd632a2f58443e47d8ba562538867aa6a6b64db68dd fpm-0.60.ebuild 770
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
+SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDwpQsugEuf3OQ0akRAobXAJ99xCKWKoQ5HkApzY7LZqDalCIGTQCeLY+C
-VxcEG0a4ClGp40oo6x+FS5Y=
-=S9DG
+iD8DBQFD9QtFAiZjviIA2XgRAkNbAKDurFJe5T1AfDcTgbTUcoimGjez6QCgp7GX
+d4C+iLu4wnydkqeOuGyP1oQ=
+=yhQG
 -----END PGP SIGNATURE-----
diff --git a/app-admin/fpm/fpm-0.59.ebuild b/app-admin/fpm/fpm-0.59.ebuild
index 94f704c76cca..6eea06db4ece 100644
--- a/app-admin/fpm/fpm-0.59.ebuild
+++ b/app-admin/fpm/fpm-0.59.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/fpm-0.59.ebuild,v 1.8 2005/01/01 10:59:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/fpm-0.59.ebuild,v 1.9 2006/02/16 23:31:05 flameeyes Exp $
 
 DESCRIPTION="A password manager for gnome"
 HOMEPAGE="http://fpm.sourceforge.net/"
@@ -11,15 +11,18 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE="nls"
 
-DEPEND="virtual/libc
-	gnome-base/gnome-libs
+DEPEND="gnome-base/gnome-libs
 	>=dev-libs/libxml2-2.5.7-r2
 	x11-libs/gtk+
 	dev-libs/glib
-	nls? ( sys-devel/gettext )"
-DEPEND="${DEPEND}
+	nls? ( virtual/libintl )"
+
+RDEPEND="${DEPEND}
 	dev-util/cvs"
 
+DEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
 src_compile() {
 	./autogen.sh --prefix=/usr \
 	./configure --prefix=/usr
diff --git a/app-admin/fpm/fpm-0.60.ebuild b/app-admin/fpm/fpm-0.60.ebuild
index c13ef5cd2069..30f36687f41f 100644
--- a/app-admin/fpm/fpm-0.60.ebuild
+++ b/app-admin/fpm/fpm-0.60.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/fpm-0.60.ebuild,v 1.9 2005/01/01 10:59:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/fpm-0.60.ebuild,v 1.10 2006/02/16 23:31:05 flameeyes Exp $
 
 DESCRIPTION="A password manager for gnome"
 HOMEPAGE="http://fpm.sourceforge.net"
@@ -11,15 +11,18 @@ SLOT="0"
 KEYWORDS="x86 amd64 ppc"
 IUSE="nls"
 
-DEPEND="virtual/libc
-	gnome-base/gnome-libs
+DEPEND="gnome-base/gnome-libs
 	>=dev-libs/libxml2-2.5.7-r2
 	x11-libs/gtk+
 	dev-libs/glib
-	nls? ( sys-devel/gettext )"
+	nls? ( virtual/libintl )"
+
 RDEPEND="${DEPEND}
 	dev-util/cvs"
 
+DEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
 src_compile() {
 	./configure --prefix=/usr
 	emake || die "Make failed"