Invalid linguas fix via patch from Philippe Troin <phil@fifi.org>. Resolves bug #114650

Package-Manager: portage-2.1_pre3-r1

5 files changed, 65 insertions, 13 deletions

diff --git a/app-pda/gnome-pilot-conduits/ChangeLog b/app-pda/gnome-pilot-conduits/ChangeLog
index c2da0686a0a6..77538fa607bf 100644
--- a/app-pda/gnome-pilot-conduits/ChangeLog
+++ b/app-pda/gnome-pilot-conduits/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-pda/gnome-pilot-conduits
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot-conduits/ChangeLog,v 1.13 2005/11/19 18:33:53 liquidx Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot-conduits/ChangeLog,v 1.14 2006/01/21 22:28:09 compnerd Exp $
+
+*gnome-pilot-conduits-2.0.10-r2 (21 Jan 2006)
+
+  21 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gnome-pilot-conduits-2.0.10-invalid-linguas.patch,
+  +gnome-pilot-conduits-2.0.10-r2.ebuild:
+  Invalid linguas fix. Resolves bug #114650. Patch from Philippe Troin
+  <phil@fifi.org>.
 
   19 Nov 2005; Alastair Tse <liquidx@gentoo.org>
   gnome-pilot-conduits-0.9.ebuild, gnome-pilot-conduits-2.0.10-r1.ebuild,
diff --git a/app-pda/gnome-pilot-conduits/Manifest b/app-pda/gnome-pilot-conduits/Manifest
index 5222248f7ce1..9aee1f71bd0f 100644
--- a/app-pda/gnome-pilot-conduits/Manifest
+++ b/app-pda/gnome-pilot-conduits/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ad0196dbed2eb0990f75312a9cd7820c ChangeLog 3969
+MD5 316252a86996fb05598e124789eabaa5 ChangeLog 4266
 MD5 76c98072408ae5c4e5a96245e5a20466 files/digest-gnome-pilot-conduits-0.9 77
 MD5 dfa62058be26fe2b26b39fef4de1658b files/digest-gnome-pilot-conduits-2.0.10-r1 80
+MD5 dfa62058be26fe2b26b39fef4de1658b files/digest-gnome-pilot-conduits-2.0.10-r2 80
 MD5 d8d0a176e2cb31938b4cefb832fcf1d2 files/digest-gnome-pilot-conduits-2.0.12 80
 MD5 d06c1183c925f837f1e11dfe8018d7e0 files/digest-gnome-pilot-conduits-2.0.13 80
+MD5 8d63754907c3aaa466046463fb767087 files/gnome-pilot-conduits-2.0.10-invalid-linguas.patch 573
 MD5 c0f29f8ad2fa1877f8faa55abd1f4902 files/gnome-pilot-conduits-2.0.10-memofile.patch 1343
 MD5 1329da71c6ef6753cfcdd93d84c71bb5 gnome-pilot-conduits-0.9.ebuild 1035
 MD5 eabfd9516ebbe45cc044ac8a305c89b9 gnome-pilot-conduits-2.0.10-r1.ebuild 797
+MD5 c8bea384243d55008e3fbb4ee71eb949 gnome-pilot-conduits-2.0.10-r2.ebuild 978
 MD5 fee7cf100ee14dce38297d8c33a61a65 gnome-pilot-conduits-2.0.12.ebuild 641
 MD5 f78abe5fd18504067a91a733eee5e843 gnome-pilot-conduits-2.0.13.ebuild 641
 MD5 1e1031eae2f36a13b2cd73550a31d03d metadata.xml 175
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDf3CZ9ZFPrqoILX8RAt/dAKDT/FHqgnwROJ2/fnQCtJZAw85I7ACgwpUk
-WhQF4x0JItl3rO4mjebLYBM=
-=F7M8
------END PGP SIGNATURE-----
diff --git a/app-pda/gnome-pilot-conduits/files/digest-gnome-pilot-conduits-2.0.10-r2 b/app-pda/gnome-pilot-conduits/files/digest-gnome-pilot-conduits-2.0.10-r2
new file mode 100644
index 000000000000..951998136df2
--- /dev/null
+++ b/app-pda/gnome-pilot-conduits/files/digest-gnome-pilot-conduits-2.0.10-r2
@@ -0,0 +1 @@
+MD5 f6c0c608b04fabe6c83431ed2bda1ec3 gnome-pilot-conduits-2.0.10.tar.bz2 390631
diff --git a/app-pda/gnome-pilot-conduits/files/gnome-pilot-conduits-2.0.10-invalid-linguas.patch b/app-pda/gnome-pilot-conduits/files/gnome-pilot-conduits-2.0.10-invalid-linguas.patch
new file mode 100644
index 000000000000..e866eb54239f
--- /dev/null
+++ b/app-pda/gnome-pilot-conduits/files/gnome-pilot-conduits-2.0.10-invalid-linguas.patch
@@ -0,0 +1,12 @@
+diff -ruN gnome-pilot-conduits-2.0.10.orig/configure gnome-pilot-conduits-2.0.10/configure
+--- gnome-pilot-conduits-2.0.10.orig/configure	2003-07-16 09:44:22.000000000 -0700
++++ gnome-pilot-conduits-2.0.10/configure	2005-12-06 12:11:12.000000000 -0800
+@@ -9477,7 +9477,7 @@
+        NEW_LINGUAS=
+        for lang in ${LINGUAS=$ALL_LINGUAS}; do
+          case "$ALL_LINGUAS" in
+-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
++          $lang|*\ $lang|$lang\ *|*\ $lang\ *) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+          esac
+        done
+        LINGUAS=$NEW_LINGUAS
diff --git a/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r2.ebuild b/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r2.ebuild
new file mode 100644
index 000000000000..d0d30f40c588
--- /dev/null
+++ b/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r2.ebuild,v 1.1 2006/01/21 22:28:09 compnerd Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome Pilot Conduits"
+HOMEPAGE="http://live.gnome.org/GnomePilot"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=gnome-base/libgnome-2.0
+	>=app-pda/gnome-pilot-${PVR}
+	>=dev-libs/libxml2-2.5"
+DEPEND="sys-devel/gettext
+	dev-util/pkgconfig
+	${RDEPEND}"
+
+SCROLLKEEPER_UPDATE="0"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-pilotlinktest"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# patch to fix memo file syncing
+	# http://bugzilla.gnome.org/show_bug.cgi?id=114361
+	epatch ${FILESDIR}/${P}-memofile.patch
+
+	# Patch to fix invalid linguas (Bug #114650)
+	# patch from Philippe Troin <phil@fifi.org>
+	cd ${S} ; epatch ${FILESDIR}/${PN}-2.0.10-invalid-linguas.patch
+}