version bump with pcsc patch from bug 319243

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 163 insertions, 2 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index 567b7e57adc3..7a44761b661d 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.104 2010/06/17 20:07:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.105 2010/08/10 13:13:34 fauli Exp $
+
+*gnokii-0.6.29 (10 Aug 2010)
+
+  10 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
+  +gnokii-0.6.29.ebuild, +files/gnokii-0.6.29-pcsc.patch:
+  version bump with pcsc patch from bug 319243
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> gnokii-0.6.27-r2.ebuild,
   gnokii-0.6.27-r4.ebuild, gnokii-0.6.28.1.ebuild, gnokii-9999.ebuild:
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index 09e8a85cf1a8..6474c3505bc0 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -1,13 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnokii-0.6.27-TP-PI.patch 711 RMD160 c4060c16f61fd7067a8593070213c5070274f25f SHA1 3b8e5879b9b741415df2d9711f7c4a0ae54649df SHA256 7f570eb6877342882f438449a9a8d93f1db7b1e466467c8341df7e28d53f8d79
 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-0.6.29-pcsc.patch 621 RMD160 af66bd666203885ba5478ad78f22133b49407ce0 SHA1 cbe2412b43ccb351e6ca1f350ad1a9b5b4a90ad4 SHA256 783506cb79575554c323215c8cedb961ff0083a3b5baed98ad65e5bcc98b55ef
 AUX gnokii-9999-icon.patch 429 RMD160 72e247aa0b7df38d985c291ca1022c39e21909e0 SHA1 f860d42789602f9385511ec36df0988282d6a957 SHA256 b42f6cad1287b9aa214d95292f9db23ff81cb9163e4ad8c0b8a9809349886a6e
 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
+DIST gnokii-0.6.29.tar.bz2 1302020 RMD160 85f8501831c20b64bc22c269c97c418662b6189f SHA1 85e0dbdef647ee3dd25e17a7581dccc193dfd0d4 SHA256 d1633e934b6b43c681ea96c5830d44683a85f05e64ea03c3ecf0d5096aee8470
 EBUILD gnokii-0.6.27-r2.ebuild 2774 RMD160 aa85c63e54d30456e3766432d04b1f45ae10779c SHA1 86430bf73216242e3ec414674381b80907135695 SHA256 7d4e346c650583a7eeb6518f7d70948643400fc4a9f375c6e176641a99248cbe
 EBUILD gnokii-0.6.27-r4.ebuild 3466 RMD160 b0f40a4b7db63a20f348a3736b068accc6196903 SHA1 154280676e5bb3ed20d636b32b31deddd37ceeda SHA256 2ec53edd8c02c416c623745a710856c8f2163e26c8a4e02baaa1ec0ca6624ef9
 EBUILD gnokii-0.6.28.1.ebuild 3547 RMD160 535d53d7c435f0c28c8e8e4cba2343e8a49ff3ec SHA1 6760eb4c4f021a3041d46f721dcf931c1feac21a SHA256 1a01f4d2eb74431f5ed64b343c5cb9933bb29b834dab7eb040ae9302a7b8c667
+EBUILD gnokii-0.6.29.ebuild 3454 RMD160 b5cd6642cfc6b909ac05375a00fbaf82610a2c59 SHA1 54143a6b3d0d819c8f84b44caec982d34a0cc36c SHA256 2d0805d489d0f2c6f46806ab2fb1fa3dda26801f97012c397a929f2c14d606d6
 EBUILD gnokii-9999.ebuild 3306 RMD160 78abf8f5d5ab06a0949c6387adb7c76ad7fba645 SHA1 0bd0150a985fcab762b2bb5c039a8ddb9b70f14b SHA256 5ed300f43dd9935012ec7e4b482a513d4d96032db9e4c882d952df8ee771bccf
-MISC ChangeLog 19747 RMD160 5e692d74ccec5a048023f901b2416431be274536 SHA1 38858c95f389ab481ec39ac395e25bb84ffa8233 SHA256 91505cba300fcd4da5a344d2a45767a1236b1faf70dec3adf98c900616c30311
+MISC ChangeLog 19936 RMD160 b6b395847a86c7bf9933e4e799ef9d97a65fd881 SHA1 5a8e61b4945462c9b16f643fbe1adf6039403009 SHA256 1965e7ba7e3847a444eeec8ef10c845bd5a97556f18f46f075f383180575f1b7
 MISC metadata.xml 663 RMD160 3b3b8b1de6315f0068a2b405f3a6a985d976fd6f SHA1 29453a786f8cd9bc457c41db0c2bf1131ac33dce SHA256 8275ef9e2f500c48cc7c6620246bfafdf15e0bbd62bbe5f7fe286ebf5650a5ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxhUToACgkQNQqtfCuFnePdNwCfU9O7OzVRKnFV2wu14L7cvO8Z
+PWkAni9oIEml9F1ETqkTjHHHwz0rvbaE
+=Jp/n
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch b/app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch
new file mode 100644
index 000000000000..539c208f5a9c
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.29-pcsc.patch
@@ -0,0 +1,14 @@
+diff -rupN gnokii-0.6.29.orig/common/phones/pcsc.c gnokii-0.6.29new/common/phones/pcsc.c
+--- gnokii-0.6.29.orig/common/phones/pcsc.c	2010-07-29 08:38:28.000000000 +1000
++++ gnokii-0.6.29/common/phones/pcsc.c	2010-07-29 08:51:29.000000000 +1000
+@@ -199,8 +199,8 @@ static gn_error get_gn_error(PCSC_IOSTRU
+ 	case SCARD_W_UNPOWERED_CARD:
+ 	case SCARD_W_RESET_CARD:
+ 	case SCARD_W_REMOVED_CARD:
+-	case SCARD_W_INSERTED_CARD:
+-	 	return GN_ERR_SIMPROBLEM;
++	/* removed in pscc case SCARD_W_INSERTED_CARD:
++	 	return GN_ERR_SIMPROBLEM; */
+ 	case SCARD_E_NO_MEMORY:
+ 		return GN_ERR_MEMORYFULL;
+ 	case SCARD_F_WAITED_TOO_LONG:
diff --git a/app-mobilephone/gnokii/gnokii-0.6.29.ebuild b/app-mobilephone/gnokii/gnokii-0.6.29.ebuild
new file mode 100644
index 000000000000..83a61c2bf0d7
--- /dev/null
+++ b/app-mobilephone/gnokii/gnokii-0.6.29.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.29.ebuild,v 1.1 2010/08/10 13:13:34 fauli Exp $
+
+EAPI=2
+
+inherit eutils linux-info autotools
+
+DESCRIPTION="user space driver and tools for use with mobile phones"
+HOMEPAGE="http://www.gnokii.org/"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/gnokii.git"
+	inherit git
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls bluetooth ical irda sms postgres mysql usb X debug"
+
+RDEPEND="!app-mobilephone/smstools
+	sys-apps/pcsc-lite
+	X? ( >=x11-libs/gtk+-2 )
+	bluetooth? ( net-wireless/bluez )
+	sms? (
+		!app-mobilephone/smstools
+		>=dev-libs/glib-2
+		postgres? ( >=dev-db/postgresql-base-8.0 )
+		mysql? ( >=virtual/mysql-4.1 )
+	)
+	ical? ( dev-libs/libical )
+	usb? ( =virtual/libusb-0* )"
+DEPEND="${RDEPEND}
+	irda? ( virtual/os-headers )
+	nls? ( sys-devel/gettext )
+	dev-util/intltool"
+
+CONFIG_CHECK="~UNIX98_PTYS"
+
+S="${WORKDIR}/${PN}-${PV%.1}"
+
+# Supported languages and translated documentation
+# Be sure all languages are prefixed with a single space!
+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}"/${PN}-0.6.29-pcsc.patch
+	else
+		epatch "${FILESDIR}"/${P}-icon.patch
+		epatch "${FILESDIR}"/${P}-translations.patch
+		intltoolize --force --copy --automake || die "intltoolize error"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	strip-linguas ${MY_AVAILABLE_LINGUAS}
+
+	local config_xdebug="--disable-xdebug"
+	use X && use debug && config_xdebug="--enable-xdebug"
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable ical libical) \
+		$(use_enable usb libusb) \
+		$(use_enable irda) \
+		$(use_enable bluetooth) \
+		$(use_with X x) \
+		$(use_enable sms smsd) \
+		$(use_enable mysql) \
+		$(use_enable postgres) \
+		$(use_enable debug fulldebug) \
+		${config_xdebug} \
+		$(use_enable debug rlpdebug) \
+		--enable-security \
+		--disable-unix98test \
+		--enable-libpcsclite \
+		|| die "configure failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+
+	insinto /etc
+	doins Docs/sample/gnokiirc
+	sed -i -e 's:/usr/local:/usr:' "${D}/etc/gnokiirc"
+
+	# only one file needs suid root to make a pseudo device
+	fperms 4755 /usr/sbin/mgnokiidev
+
+	if use X; then
+		insinto /usr/share/pixmaps
+		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+	fi
+
+	if use sms; then
+		pushd "${S}/smsd"
+		insinto /usr/share/doc/${PN}/smsd
+		use mysql && doins sms.tables.mysql.sql README.MySQL
+		use postgres && doins sms.tables.pq.sql
+		doins README ChangeLog README.Tru64 action
+		popd
+	fi
+}
+
+src_test() {
+	echo common/phones/fake.c >> ${S}/po/POTFILES.in
+	default
+}
+
+pkg_postinst() {
+	elog "Make sure the user that runs gnokii has read/write access to the device"
+	elog "which your phone is connected to."
+	elog "The simple way of doing that is to add your user to the uucp group."
+	if [ "$PV" == "9999" ]; then
+		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
+		elog "You can keep track of the most recent commits at:"
+		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
+		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
+	fi
+}