Revision bump and remove old. Fix compile errors when the nls USE flag is not enabled (fixes bug #339398) and add gnome-base/gnome-panel dependency for GNOME support.

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

4 files changed, 41 insertions, 11 deletions

diff --git a/net-mail/gnubiff/ChangeLog b/net-mail/gnubiff/ChangeLog
index fb7cd87c229c..321dda5dd76c 100644
--- a/net-mail/gnubiff/ChangeLog
+++ b/net-mail/gnubiff/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/gnubiff
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/ChangeLog,v 1.25 2010/08/29 21:33:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/ChangeLog,v 1.26 2010/10/02 00:32:15 radhermit Exp $
+
+*gnubiff-2.2.13-r1 (02 Oct 2010)
+
+  02 Oct 2010; Tim Harder <radhermit@gentoo.org> -gnubiff-2.2.13.ebuild,
+  +gnubiff-2.2.13-r1.ebuild, +files/gnubiff-2.2.13-fix-nls.patch:
+  Revision bump and remove old. Fix compile errors when the nls USE flag is
+  not enabled (fixes bug #339398) and add gnome-base/gnome-panel dependency
+  for GNOME support.
 
 *gnubiff-2.2.13 (29 Aug 2010)
 
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index 5cd8fa07f5c8..a54771271053 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -2,20 +2,21 @@
 Hash: SHA1
 
 AUX gnubiff-2.2.10-gcc43.patch 977 RMD160 3a053a7425eb59e371474a8ef0999511d1d2467e SHA1 791992b272e53fe5bac2cf41292b59af5495684c SHA256 51ea86a80d83d1c4d08837cb735d1e20dd86a08033f65fae36a08778ff29a0ff
+AUX gnubiff-2.2.13-fix-nls.patch 462 RMD160 d651dc987be13c8f24b3d4ff412b70c836c15170 SHA1 1259715dbd69ae1853be77f475782c5f38ea6a3c SHA256 a3a61e93aeccbabfac6bc5e58373a002c1ed6fb2d4105182d12ad891a8b4b9b8
 DIST gnubiff-2.2.10.tar.gz 856771 RMD160 4386cb36eada3158db5c14fb4e5e8ce9879def5c SHA1 c8379bb6c6fa2ee3512c7dd00492ca0eb5ceae0e SHA256 9536f6411bbaa68ff0dea3a203d6d6b65bd1fad367f210a0ec6aa3e8a790b412
 DIST gnubiff-2.2.13.tar.gz 848538 RMD160 30659e4e9ce9f232c6b79deae78f3900af745087 SHA1 693bd245b8aaccec74d3ada505dc7ceb4efdb8fc SHA256 42ef54b6add17e57603728fc08a53ecbdc2a9d9e35de7455d4c43dff1e1ca5f3
 EBUILD gnubiff-2.2.10.ebuild 1172 RMD160 5f5c94d2d5cf5acc070833789943e103ef55b04a SHA1 0905fbf8e9af90ef666397d0a3f1339a7f135a19 SHA256 c58df0cbb033efb6fa18007c0994f4e22553258a8247e2bd974efd4196500ae7
-EBUILD gnubiff-2.2.13.ebuild 1070 RMD160 0070a1e6f52d76d28a7c4338fb8dc3a5931656ca SHA1 506ce7803bcd770263e2dcf7148e4a80a7aba0cf SHA256 9a3d451e54972d2ac3d14707bd6b70df40820be4724c175b6bcc81acab42d33e
-MISC ChangeLog 3936 RMD160 bbcc3b5cf9b51fd0c4329ced655097752474ef50 SHA1 5fffa036ab332c15e3418b72388df62883f2ec26 SHA256 e352e2dc51652f1499ccc79746b12af9fd9343ad2f23ca41bda6b234d4a0f92a
+EBUILD gnubiff-2.2.13-r1.ebuild 1174 RMD160 403a7e331d82108f848b77f8d6437472dc9017b0 SHA1 f5e3f06a5390ddb14b39bab603d6cb14eeaf0037 SHA256 b6ec59bdb4607b2b960b189c0bda95ae7745b83ab64f1938c7dbb6f1eacc86cf
+MISC ChangeLog 4283 RMD160 d2c970b48e96d707eb4404a42ed934287f3c86f5 SHA1 7fd6e9f6c73933e16ab5ec4c99ad1fe9ef7d7d0a SHA256 b5447e406a571be8783cb2e8019bd24ef58d5d3a4b4e1d32c25ef395d46ba56e
 MISC metadata.xml 273 RMD160 6f1255cdc5aca61d5dcb7443a82b7efc0d01d630 SHA1 14320ff253cdc06f0cf869720802f2f5cfbe3bfc SHA256 8ac6ca0ce9f35cd2aac5fbda074690cdfee7018157ce59475fdf3e2c522f796d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMetJFAAoJEEqz6FtPBkyjRbYH/3+NqQxtnLACaayxe18eQbK5
-MOzFt7kWwpAGzH7Mkmv24SODijdgTucNbP0v7PJ0haQ2S1CRsJ8kPLHuUdk5gYEm
-H90d/PifzqpLzu9ttAktg2waXt0WXMH/SVVO2iPTLBgbVqyAcQO5IiFEJmpxUHx7
-oQjlabPN6VtEHQfq2CyqFN3vlEdAvdx3P+e0+2C5eZFHUu2v/aegGYl3llxje+SM
-PKLM0Eb4ANwSuqBOUTgl8qzFZR12IA49aXfcbYa7CK57OjrOLvCDgt2yTI13UPuu
-Hz4lrtQk7NvI0QNj2hN2RB/qe9XAi9P6Sim6wYwIp08+7GrDz/+YJC/YlPUPpwM=
-=wbDn
+iQEcBAEBAgAGBQJMpn2ZAAoJEEqz6FtPBkyjsEUIAKMMq3Ov1MQuvATFj74KnBV+
+Ic2Nh2QQzeUlU5IECTA+p+Odt+X9A22ofOLxAr/W+qTgEcM8jnezpUJJFh5is6tu
+ctpDZwI4SjEYj83nWRCuGnuihZqrg5aqkCze11PUiOppftWuuj89RCAg51XEdBNV
+Dyj5S8+hUaT45HvqxbNoIE8c3Srwowpb9ehzpq2rAYI+ufu6ls0rM28gsKQZ4XAJ
+3gvPz5yDa9by91wLDSnV6CyYn2d+rUidjKo3dTtw9D0fGrNUJrLfTS1Z3vDpZQtM
+pOoXWLEklW3/O7HLke/7flw1b4yItfva+IMax+9pf8fLLWx10OuzREjf/UdvrQo=
+=KifX
 -----END PGP SIGNATURE-----
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.13-fix-nls.patch b/net-mail/gnubiff/files/gnubiff-2.2.13-fix-nls.patch
new file mode 100644
index 000000000000..24fdfa7415ac
--- /dev/null
+++ b/net-mail/gnubiff/files/gnubiff-2.2.13-fix-nls.patch
@@ -0,0 +1,14 @@
+--- gnubiff-2.2.13.orig/src/nls.h	2009-01-01 16:45:39.000000000 -0800
++++ gnubiff-2.2.13/src/nls.h	2010-10-01 17:13:03.595458860 -0700
+@@ -49,11 +49,6 @@
+ #else
+ #  define _(String) (String)
+ #  define N_(String) (String)
+-#  define textdomain(String) (String)
+-#  define gettext(String) (String)
+-#  define dgettext(Domain,String) (String)
+-#  define dcgettext(Domain,String,Type) (String)
+-#  define bindtextdomain(Domain,Directory) (Domain)
+ #endif
+ 
+ #endif
diff --git a/net-mail/gnubiff/gnubiff-2.2.13.ebuild b/net-mail/gnubiff/gnubiff-2.2.13-r1.ebuild
index 2c765f87df4b..d1f3d6771988 100644
--- a/net-mail/gnubiff/gnubiff-2.2.13.ebuild
+++ b/net-mail/gnubiff/gnubiff-2.2.13-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/gnubiff-2.2.13.ebuild,v 1.1 2010/08/29 21:33:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/gnubiff-2.2.13-r1.ebuild,v 1.1 2010/10/02 00:32:15 radhermit Exp $
 
 EAPI=3
 
+inherit eutils
+
 DESCRIPTION="A mail notification program"
 HOMEPAGE="http://gnubiff.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -17,6 +19,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
 	>=gnome-base/libglade-2.3
 	dev-libs/popt
 	gnome? (
+		gnome-base/gnome-panel
 		>=gnome-base/libgnome-2.2
 		>=gnome-base/libgnomeui-2.2 )
 	password? ( dev-libs/openssl )
@@ -25,6 +28,10 @@ RDEPEND=">=x11-libs/gtk+-2.6
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-nls.patch
+}
+
 src_configure() {
 	econf \
 		$(use_enable debug) \