Bump to 2.1.9 (from 2.1.3) #107359

Add app-admin/fam rdep to 2.1.3 #101832
Remove 2.1.1
Package-Manager: portage-2.1_pre1

6 files changed, 32 insertions, 28 deletions

diff --git a/net-mail/gnubiff/ChangeLog b/net-mail/gnubiff/ChangeLog
index 17cb02ba9a4d..12f85adf18f1 100644
--- a/net-mail/gnubiff/ChangeLog
+++ b/net-mail/gnubiff/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/gnubiff
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/ChangeLog,v 1.8 2005/10/02 11:42:12 agriffis Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/ChangeLog,v 1.9 2006/01/30 17:25:42 agriffis Exp $
+
+*gnubiff-2.1.9 (30 Jan 2006)
+
+  30 Jan 2006; Aron Griffis <agriffis@gentoo.org> -gnubiff-2.1.1.ebuild,
+  gnubiff-2.1.3.ebuild, +gnubiff-2.1.9.ebuild:
+  Bump to 2.1.9 (from 2.1.3) #107359
+  Add app-admin/fam rdep to 2.1.3 #101832
+  Remove 2.1.1
 
   02 Oct 2005; Aron Griffis <agriffis@gentoo.org> gnubiff-2.1.3.ebuild:
   Mark 2.1.3 ~alpha
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index 158f1f4f4b3c..409eacaf66be 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 38f7e7e07cecf943cd078f4aef09fef1 metadata.xml 250
-MD5 13fb02fc372e67e459858e7250dfbfb4 gnubiff-2.1.1.ebuild 1135
-MD5 7646a13156938906b2b7cbfafb5b1153 gnubiff-2.1.3.ebuild 1150
-MD5 c5939c4a1a05906415dcbad18024c440 ChangeLog 1142
-MD5 0e9e86a2ca36b71472d0d8b6e74e556b files/digest-gnubiff-2.1.1 65
+MD5 a43214640453cbedccba0a4bfb1c6dcb ChangeLog 1387
 MD5 1d4c26812c20d4fd4905d50495833299 files/digest-gnubiff-2.1.3 65
+MD5 f75c0132f9f943ee45fdf278c2aa1b27 files/digest-gnubiff-2.1.9 65
+MD5 5a32a0515443c363a3962a9f8808a164 gnubiff-2.1.3.ebuild 1165
+MD5 b1e7b571b87631aa8d9c5a23e36713a6 gnubiff-2.1.9.ebuild 1074
+MD5 38f7e7e07cecf943cd078f4aef09fef1 metadata.xml 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDP8eoJrHF4yAQTrARAmsdAJ9RbO0vX0VZMryhlPfcftcEZW+9ZgCgz9HM
-BA6koOwLqXlGBD7wqr3O2SI=
-=rv+M
+iD8DBQFD3kwfJrHF4yAQTrARAsJoAJ0fN9SWXvzhrx5HwlQIKGRfE325hQCglZF6
+LRvImpc6H1KIr9kCygnGV64=
+=Ntyq
 -----END PGP SIGNATURE-----
diff --git a/net-mail/gnubiff/files/digest-gnubiff-2.1.1 b/net-mail/gnubiff/files/digest-gnubiff-2.1.1
deleted file mode 100644
index 63dfe4dc807a..000000000000
--- a/net-mail/gnubiff/files/digest-gnubiff-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b3899ba3671b2730a6f25139cdde063 gnubiff-2.1.1.tar.gz 705530
diff --git a/net-mail/gnubiff/files/digest-gnubiff-2.1.9 b/net-mail/gnubiff/files/digest-gnubiff-2.1.9
new file mode 100644
index 000000000000..ed7bbd5b0df0
--- /dev/null
+++ b/net-mail/gnubiff/files/digest-gnubiff-2.1.9
@@ -0,0 +1 @@
+MD5 d6548bda35c656eb5eecc45e409fc72c gnubiff-2.1.9.tar.gz 777299
diff --git a/net-mail/gnubiff/gnubiff-2.1.3.ebuild b/net-mail/gnubiff/gnubiff-2.1.3.ebuild
index bc038b55fcf2..9487ca30c467 100644
--- a/net-mail/gnubiff/gnubiff-2.1.3.ebuild
+++ b/net-mail/gnubiff/gnubiff-2.1.3.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/net-mail/gnubiff/gnubiff-2.1.3.ebuild,v 1.4 2005/10/02 11:42:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/gnubiff-2.1.3.ebuild,v 1.5 2006/01/30 17:25:42 agriffis Exp $
 
 inherit eutils
 
@@ -16,7 +16,8 @@ RDEPEND="virtual/libc
 	>=x11-libs/gtk+-2.4
 	>=gnome-base/libglade-2.3
 	gnome? ( >=gnome-base/libgnome-2.2
-		>=gnome-base/libgnomeui-2.2 )"
+		>=gnome-base/libgnomeui-2.2 )
+	app-admin/fam"
 
 DEPEND="${RDEPEND}
 	gnome? ( dev-util/pkgconfig )"
diff --git a/net-mail/gnubiff/gnubiff-2.1.1.ebuild b/net-mail/gnubiff/gnubiff-2.1.9.ebuild
index b587abe7183e..6c618ec75316 100644
--- a/net-mail/gnubiff/gnubiff-2.1.1.ebuild
+++ b/net-mail/gnubiff/gnubiff-2.1.9.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/net-mail/gnubiff/gnubiff-2.1.1.ebuild,v 1.2 2005/03/12 19:49:31 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/gnubiff-2.1.9.ebuild,v 1.1 2006/01/30 17:25:42 agriffis Exp $
 
 inherit eutils
 
@@ -9,14 +9,15 @@ HOMEPAGE="http://gnubiff.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
 IUSE="gnome password"
 
-RDEPEND="virtual/libc
-	>=x11-libs/gtk+-2.4
+RDEPEND=">=x11-libs/gtk+-2.4
 	>=gnome-base/libglade-2.3
 	gnome? ( >=gnome-base/libgnome-2.2
-		>=gnome-base/libgnomeui-2.2 )"
+		>=gnome-base/libgnomeui-2.2 )
+	fam? ( app-admin/fam )
+	!fam? ( app-admin/gamin )"
 
 DEPEND="${RDEPEND}
 	gnome? ( dev-util/pkgconfig )"
@@ -24,18 +25,12 @@ DEPEND="${RDEPEND}
 src_compile() {
 	local myconf
 
-	if use gnome; then
-		myconf="${myconf} --prefix=`pkg-config libpanelapplet-2.0 --variable=prefix`"
-	else
-		myconf="${myconf} --disable-gnome"
-	fi
-
 	if use password; then
 		einfo "generating random password"
 		myconf="${myconf} --with-password --with-password-string=${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
 	fi
 
-	econf ${myconf} || die
+	econf $(use_enable gnome) $(use_enable nls) || die
 	emake || die
 }