Update patch for git version (#296381).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 17 insertions, 25 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index b4bb8ce1973e..6e15bae404b3 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.101 2009/11/30 06:05:17 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.102 2009/12/12 10:37:53 mrness Exp $
+
+  12 Dec 2009; Alin Năstac <mrness@gentoo.org> gnokii-9999.ebuild,
+  files/gnokii-9999-translations.patch:
+  Update patch for git version (#296381).
 
   30 Nov 2009; Joseph Jezak <josejx@gentoo.org> gnokii-0.6.27-r2.ebuild:
   Marked ppc64 stable.
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index bd3d731a2fe2..7a0b39b84fe6 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -5,19 +5,19 @@ AUX gnokii-0.6.27-TP-PI.patch 711 RMD160 c4060c16f61fd7067a8593070213c5070274f25
 AUX gnokii-0.6.27-disable-database.patch 1236 RMD160 c3e512d6e1aa4b81a4dca5d15c386fe65ffe04e2 SHA1 b60d2f91703cf11be6a55ded64f133a782549eba SHA256 e4ccb40497b1ae06708a075acd2e63f19ca3c56ff0bfff7bf9df0134262cd715
 AUX gnokii-0.6.27-icon.patch 441 RMD160 9fef77b23583ed0e6218dc030aa320911f534e7a SHA1 4a265f59a641ae763f4e5650367c892a0fd692cb SHA256 409fb78596ff3e29a363023099b772c8b2454318df4f7a2532c28e5f995eceba
 AUX gnokii-9999-icon.patch 429 RMD160 72e247aa0b7df38d985c291ca1022c39e21909e0 SHA1 f860d42789602f9385511ec36df0988282d6a957 SHA256 b42f6cad1287b9aa214d95292f9db23ff81cb9163e4ad8c0b8a9809349886a6e
-AUX gnokii-9999-translations.patch 541 RMD160 f2aef12bbac67e49288ddc2deaf55ff206fc086d SHA1 5b48e286b7d8fa81e2251bbf0d062a8e24123446 SHA256 15094a1757a0b796605bfebb74f31567be5318053fc7077a7110c1bd222ed4a2
+AUX gnokii-9999-translations.patch 361 RMD160 fb80506029e6656d3abb6997c21a3fb319853e76 SHA1 961ae446ded8dfc7b15d6b7975509e16c97a28f4 SHA256 4aa65a26c7ad6cc08b3d34491652830fc36622d3c829f68f591adcac1cd86bbd
 DIST gnokii-0.6.27.tar.bz2 1491564 RMD160 48522400f6b86a61035ba888782a10bc51c3ec0c SHA1 a7c6f9fa56bfe01e3c8e719bb8585a24469fe1e7 SHA256 69f1d75f755a2918e9577cf28dacea9d6fca9b9d722813341d50d12acb8ee886
 DIST gnokii-0.6.28.1.tar.bz2 1271287 RMD160 7e4e4ba09cda4ec13f908b8073e634b8d11f1bc0 SHA1 fa7b58057c4610a8205a19e439430bc29142a339 SHA256 58659ccd8a6d4b38cbfcc820ec4705acea6e5ba63f89c9a5494d03c63e71aced
 EBUILD gnokii-0.6.27-r2.ebuild 2812 RMD160 00b83aaeee755576460bb0f56a70c6006b46e005 SHA1 7bb9a13f5cbcc9cf800e5a266b2d968b6e351def SHA256 70ffd00e892a21f1bdba02e89264c8774697df96441ab3ddf6aea41cb0f2fe8a
 EBUILD gnokii-0.6.27-r4.ebuild 3504 RMD160 b00e7b027e036ea70118e51ac7b4e68ef30e2bac SHA1 62ee771ec91197493c86b8af27ac6357e32ba9b7 SHA256 023a6671264260ea2d14fb67793c20e46586a0a00062cfcd6291ebfe69304386
 EBUILD gnokii-0.6.28.1.ebuild 3586 RMD160 e0745024233a02377f96f2bd9583f54b96709bd8 SHA1 a3747b17561415d80785d285ef1b1b582ae987c3 SHA256 d75cbf9b5f6e6b25a075ea453aa1fb0940f81881501ba50ea9bc248cd2addb41
-EBUILD gnokii-9999.ebuild 3499 RMD160 7089164fd31253ac331a8744f5f885f5c987a360 SHA1 7ea9533092627a638a436c85dbbd0282e7a7b008 SHA256 9588c5893406df45c395df5f6a1eaaf1c33169f9b10ba3414ce3b473ecea8d02
-MISC ChangeLog 19205 RMD160 cf26a372ca2233737011755041ab0a6175cf13c2 SHA1 8b408a3a825098dbafbe20c656d3c5337c1b87e9 SHA256 72a419a6b5b2dabeb4b8784c4f123889370cebb1751523a0b16cb05a992e543f
+EBUILD gnokii-9999.ebuild 3344 RMD160 ca3fc75b67f1db2150c5428d77373f26e9be4ecc SHA1 b45ee89fcabdcf92d7b930f1ff264387a1fa0592 SHA256 609f996e51785cfdb8202439df1642241f9b4954723cc9429e52fd2679a4dbc4
+MISC ChangeLog 19356 RMD160 87fe8e96917347ddd6ef063bc09ab96bcb0d002c SHA1 1329a82b7a6663bf3202fb725d3518d84652a4f5 SHA256 f5021fdf5ac88b980a8764a9800e8488f9732f758092155a7c29be5c96e26293
 MISC metadata.xml 663 RMD160 3b3b8b1de6315f0068a2b405f3a6a985d976fd6f SHA1 29453a786f8cd9bc457c41db0c2bf1131ac33dce SHA256 8275ef9e2f500c48cc7c6620246bfafdf15e0bbd62bbe5f7fe286ebf5650a5ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksTYIMACgkQcsIHjyDViGQNZgCfU6FMrKGpih91XtGyVkNlNbxv
-nxwAnjJXs0rbQlacUIyn39kqc4DsOClF
-=zUCY
+iEYEARECAAYFAksjco4ACgkQ9A5kJBGSrssTWgCeNywmExXIuq1dZZyt+Q/2H8/1
+hHwAn2X6QjzvpvcHCZglPJZSAHiO5EOt
+=6CWV
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnokii/files/gnokii-9999-translations.patch b/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
index 6ddab8156da4..ad99193a4335 100644
--- a/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
+++ b/app-mobilephone/gnokii/files/gnokii-9999-translations.patch
@@ -1,15 +1,7 @@
 diff -Nru gnokii-9999.orig/po/POTFILES.in gnokii-9999/po/POTFILES.in
 --- gnokii-9999.orig/po/POTFILES.in	2009-08-16 11:48:52.000000000 +0200
 +++ gnokii-9999/po/POTFILES.in	2009-08-16 11:56:02.000000000 +0200
-@@ -40,6 +40,7 @@
- gnokii/gnokii-dial.c
- gnokii/gnokii-file.c
- gnokii/gnokii-logo.c
-+gnokii/gnokii-mms.c
- gnokii/gnokii-monitor.c
- gnokii/gnokii-other.c
- gnokii/gnokii-phonebook.c
-@@ -58,6 +59,7 @@
+@@ -59,6 +59,7 @@
  smsd/mysql.c
  smsd/pq.c
  smsd/smsd.c
diff --git a/app-mobilephone/gnokii/gnokii-9999.ebuild b/app-mobilephone/gnokii/gnokii-9999.ebuild
index d7e75d6f56c3..0db3eb3661f7 100644
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild
+++ b/app-mobilephone/gnokii/gnokii-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-9999.ebuild,v 1.4 2009/08/31 22:08:39 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-9999.ebuild,v 1.5 2009/12/12 10:37:53 mrness Exp $
 
 EAPI=2
 
@@ -47,14 +47,10 @@ MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 src_prepare() {
-	if [ "$PV" != "9999" ]; then
-	    epatch "${FILESDIR}"/${P}-icon.patch
-	    epatch "${FILESDIR}"/${P}-disable-database.patch
-	    epatch "${FILESDIR}"/${P}-TP-PI.patch
-	else
-	    epatch "${FILESDIR}"/${P}-icon.patch
-	    epatch "${FILESDIR}"/${P}-translations.patch
-	    intltoolize --force --copy --automake || die "intltoolize error"
+	if [ "$PV" = "9999" ]; then
+		epatch "${FILESDIR}"/${P}-icon.patch
+		epatch "${FILESDIR}"/${P}-translations.patch
+		intltoolize --force --copy --automake || die "intltoolize error"
 	fi
 
 	eautoreconf