Invalid linguas patch from Philippe Troin <phil@fifi.org>. Bug #114650

Package-Manager: portage-2.1_pre3-r1

5 files changed, 86 insertions, 13 deletions

diff --git a/app-pda/gnome-pilot/ChangeLog b/app-pda/gnome-pilot/ChangeLog
index 3b6ac63011fe..f181d44f2882 100644
--- a/app-pda/gnome-pilot/ChangeLog
+++ b/app-pda/gnome-pilot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-pda/gnome-pilot
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.20 2005/11/19 18:29:15 liquidx Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.21 2006/01/21 22:04:31 compnerd Exp $
+
+*gnome-pilot-2.0.10-r2 (21 Jan 2006)
+
+  21 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gnome-pilot-2.0.10-invalid-linguas.patch,
+  +gnome-pilot-2.0.10-r2.ebuild:
+  Fix invalid linguas (bug #114650).  Patch from Philippe Troin <phil@fifi.org>
 
   19 Nov 2005; Alastair Tse <liquidx@gentoo.org>
   gnome-pilot-0.1.65-r5.ebuild, gnome-pilot-0.1.71.ebuild,
diff --git a/app-pda/gnome-pilot/Manifest b/app-pda/gnome-pilot/Manifest
index cc450b234826..22beb64442ca 100644
--- a/app-pda/gnome-pilot/Manifest
+++ b/app-pda/gnome-pilot/Manifest
@@ -1,16 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 92424eaddbb294bffeed2677ead76f26 ChangeLog 6632
+MD5 656a007b5899dcce61ce736385d1b369 ChangeLog 6892
 MD5 6dd42dbe52e081c7ac130b8303cd84ac files/digest-gnome-pilot-0.1.65-r5 71
 MD5 327dd488b418afec2cac40f6b8bbbcd7 files/digest-gnome-pilot-0.1.71 71
 MD5 4c1bf3e985e3e12a7196902b013f314c files/digest-gnome-pilot-2.0.10-r1 71
+MD5 4c1bf3e985e3e12a7196902b013f314c files/digest-gnome-pilot-2.0.10-r2 71
 MD5 3434f149c580da7e00c52a173dfdf96a files/digest-gnome-pilot-2.0.12 71
 MD5 09477f9cfae06129aa47446204f1ef29 files/digest-gnome-pilot-2.0.13 71
 MD5 df4f6d9882436059cee414d0fb7d91ae files/gnome-pilot-0.1.70-usb.patch 1122
 MD5 de42a13e198e82cd8d8c5f77bc1a1705 files/gnome-pilot-2.0.1-pisock.patch 450
 MD5 ba03ae634fb8f71f80715cdfea0ba409 files/gnome-pilot-2.0.10-clie.patch 638
 MD5 0a9a340af87da627cb43fe7d0b3c5a3e files/gnome-pilot-2.0.10-gcc34.patch 4108
+MD5 1561c41d7c5bc6d8418a2979a0646197 files/gnome-pilot-2.0.10-invalid-linguas.patch 539
 MD5 0e6853fd3f1027a38152ea0085dc8f6e files/gnome-pilot-2.0.10-memofile.patch 16432
 MD5 3720cf4f610ccbcdfce32c5c540d1076 files/gnome-pilot-2.0.10-missing_proc.patch 440
 MD5 d8281597713f41bcc2f8d66d72c64a5c files/gnome-pilot-2.0.10-treo600.patch 670
@@ -19,13 +18,7 @@ MD5 f50c6d977f5c1c3729bb88a763356de4 files/gnome-pilot-gentoo.diff 4186
 MD5 a1fb0bdf5ba3b104f29ba839cb4e4d06 gnome-pilot-0.1.65-r5.ebuild 1206
 MD5 bab3e760fa1f372fad7455a5d0be1f78 gnome-pilot-0.1.71.ebuild 1408
 MD5 a83f56dd57ba4ad5975c9125b3109817 gnome-pilot-2.0.10-r1.ebuild 1503
+MD5 759226b766ff7c1baa484c90c5605d00 gnome-pilot-2.0.10-r2.ebuild 1664
 MD5 0ee8aa20a23401b608d2ea073e19ceb3 gnome-pilot-2.0.12.ebuild 985
 MD5 6b44f020e5ff6cd575ce733da97e9d48 gnome-pilot-2.0.13.ebuild 906
 MD5 1e1031eae2f36a13b2cd73550a31d03d metadata.xml 175
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDf28I9ZFPrqoILX8RAqxMAKCfwU9I2C4EBFgJH2aJZ6gs387huQCfYwUR
-mmy2Bewy7bX+Gqf1HaIQbk0=
-=GQhl
------END PGP SIGNATURE-----
diff --git a/app-pda/gnome-pilot/files/digest-gnome-pilot-2.0.10-r2 b/app-pda/gnome-pilot/files/digest-gnome-pilot-2.0.10-r2
new file mode 100644
index 000000000000..5d9552fba37d
--- /dev/null
+++ b/app-pda/gnome-pilot/files/digest-gnome-pilot-2.0.10-r2
@@ -0,0 +1 @@
+MD5 840ed31beddf1398ea4bb3c01b6caa70 gnome-pilot-2.0.10.tar.bz2 710069
diff --git a/app-pda/gnome-pilot/files/gnome-pilot-2.0.10-invalid-linguas.patch b/app-pda/gnome-pilot/files/gnome-pilot-2.0.10-invalid-linguas.patch
new file mode 100644
index 000000000000..040f734df2d2
--- /dev/null
+++ b/app-pda/gnome-pilot/files/gnome-pilot-2.0.10-invalid-linguas.patch
@@ -0,0 +1,12 @@
+diff -ruN gnome-pilot-2.0.10.orig/configure gnome-pilot-2.0.10/configure
+--- gnome-pilot-2.0.10.orig/configure	2003-07-16 09:30:39.000000000 -0700
++++ gnome-pilot-2.0.10/configure	2005-12-06 11:42:56.000000000 -0800
+@@ -10729,7 +10729,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/gnome-pilot-2.0.10-r2.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.10-r2.ebuild
new file mode 100644
index 000000000000..640a2e423aec
--- /dev/null
+++ b/app-pda/gnome-pilot/gnome-pilot-2.0.10-r2.ebuild
@@ -0,0 +1,60 @@
+# 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/gnome-pilot-2.0.10-r2.ebuild,v 1.1 2006/01/21 22:04:31 compnerd Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome Pilot apps"
+HOMEPAGE="http://live.gnome.org/GnomePilot"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.0.0
+	>=gnome-base/libglade-2.0.0
+	>=gnome-base/orbit-2.6.0
+	>=gnome-base/libbonobo-2.0.0
+	>=gnome-base/gnome-panel-2.0
+	>=gnome-base/gconf-2.0
+	>=dev-util/gob-2.0.5
+	>=app-pda/pilot-link-0.11.7"
+
+DEPEND="sys-devel/gettext
+		>=dev-lang/perl-5.6.0
+		${RDEPEND}"
+
+DOCS="AUTHORS COPYING* ChangeLog README NEWS"
+SCROLLKEEPER_UPDATE="0"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-usb --enable-network --enable-pilotlinktest"
+}
+
+src_unpack() {
+	unpack  ${A}
+
+	# patch to fix crashes with memo file syncing
+	# http://bugzilla.gnome.org/show_bug.cgi?id=114361
+	epatch ${FILESDIR}/${P}-memofile.patch
+
+	# add treo600 support
+	# http://bugzilla.gnome.org/show_bug.cgi?id=124254
+	epatch ${FILESDIR}/${P}-treo600.patch
+
+	# prevent segv if /proc/bus/usb/devices is missing
+	# http://mail.gnome.org/archives/gnome-pilot-list/2004-February/msg00013.html
+	cd ${S}; epatch ${FILESDIR}/${P}-missing_proc.patch
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=52550 -- add new clie model
+	epatch ${FILESDIR}/${P}-clie.patch
+
+	# gcc-3.4 patches
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
+	# Invalid linguas fix (bug #114650)
+	# patch by Philippe Troin <phil@fifi.org>
+	epatch ${FILESDIR}/${PN}-2.0.10-invalid-linguas.patch
+}