version bump (bug #351594) and prefix support (bug #431164)

Package-Manager: portage-2.2.0_alpha125/cvs/Linux i686

5 files changed, 160 insertions, 22 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index 52359d43a864..e6e8882e69cd 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.114 2012/09/05 09:20:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.115 2012/09/11 04:17:55 ottxor Exp $
+
+*gnokii-0.6.31 (11 Sep 2012)
+
+  11 Sep 2012; Christoph Junghans <ottxor@gentoo.org> +gnokii-0.6.31.ebuild,
+  gnokii-9999.ebuild, metadata.xml:
+  version bump (bug #351594) and prefix support (bug #431164)
 
   05 Sep 2012; Justin Lecher <jlec@gentoo.org> gnokii-0.6.27-r2.ebuild,
   gnokii-0.6.27-r4.ebuild, gnokii-0.6.28.1.ebuild, gnokii-0.6.29.ebuild,
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index 5a05f80e3539..08a9a0f3e3a1 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -10,18 +10,23 @@ AUX gnokii-9999-translations.patch 361 SHA256 4aa65a26c7ad6cc08b3d34491652830fc3
 DIST gnokii-0.6.27.tar.bz2 1491564 SHA256 69f1d75f755a2918e9577cf28dacea9d6fca9b9d722813341d50d12acb8ee886 SHA512 45ce74f28ed127022f7062c0b57532662859f79bb8fdb52236789de27af86b7ad5684a0c70786bd13e408b393c28296609730a420bb7dae6f2a2cc3bfb783d10 WHIRLPOOL e4d6dbee60609d0ee3ef2c42982584527b12a970f3e67191cd27e233fb66f1dae43486dc803abb50e57c2352dffc1baae2cee1f452263a17a30fa6056d8c44f3
 DIST gnokii-0.6.28.1.tar.bz2 1271287 SHA256 58659ccd8a6d4b38cbfcc820ec4705acea6e5ba63f89c9a5494d03c63e71aced SHA512 f8f2e17bf415db1f832ded159f17443543a3a5df7b3390c5e55f6e83a0b5d66f8323608d245bda04140c6145ccb52ced15cce03339a950bc7f78442fc9250d06 WHIRLPOOL 091d7e0ed566db7d22a53b4f22296b731ef79ed4b408ce2239a20363ae99bcbd52cb802e11163f1fc71fe3974fd8689fa6d21760c83ec8183c8696f9a82ebb95
 DIST gnokii-0.6.29.tar.bz2 1302020 SHA256 d1633e934b6b43c681ea96c5830d44683a85f05e64ea03c3ecf0d5096aee8470 SHA512 0d080b4f06163d00fcae5f27fe3b66886c12cf0356c245a5200552e1f98e4347f15b0101d5e709a3d6f98b3ffc55ede12789bec779cc0c9d566db1e4a050ae32 WHIRLPOOL 8ebb2e2613187bd79de19bcc8841016966b49762579d130a4f4c89e2d126d9068630db8c11d119ba57ad58a4ca3dd9e2ff6ddadbeeacb0a31a1a0a2e958d6910
+DIST gnokii-0.6.31.tar.bz2 1237865 SHA256 8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501 SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d WHIRLPOOL a14927d205748647187336f408fc7449808e48ff2b6de0df8cc14562d25a67643d1bb4cb97f50c27a5c2acad2bdb503bcec049a4fdac534ce48c763b9715cae7
 EBUILD gnokii-0.6.27-r2.ebuild 2749 SHA256 c98865e9583d4973009a43c36a6e52017d1001609c53ba991cf24c61662da5f4 SHA512 3166a402c97d0f40ada2a22b9c34a22ef68750be842fd32c7f068b552d2b7d347f5da1f1ca3e94ebc3eb10fedfafbfe7e603c26e4d3df94b53a71581d2540802 WHIRLPOOL 19309b085b4893d8ec2e639f8ddf702465db2d7ee4e80bdfc2a653d478fd296df222a51e941a1129925a8781fab26dd13ce68962bc8717586679ae311af9e931
 EBUILD gnokii-0.6.27-r4.ebuild 3431 SHA256 0eba112017dd8d0fafab4b9ee22e2966fede103143afb54c0cd1ea42ac91a81a SHA512 071ccf3d73c9923404297a182425ee7292e69d5fd85bba71d1653d42b347bee901016672546c10dbb0cd28e89cd0de41bc9254c2ace327bdc64014b3a23df05b WHIRLPOOL b83521b1d6c905d7a4059c70bb8681c0d0745a87c207d1942a72ea8c25c0ac86a514a6a9593e089e152744aecddfeab4290387adebbfa95b606f288b41a4e3f4
 EBUILD gnokii-0.6.28.1.ebuild 3512 SHA256 6efe060efb67464ef413fa04e5cc79cc7eac00aec9fb71196928b2bbb11c62e5 SHA512 49638469a85c71656204acbf9bac5ff37260c98619bef646d551e0995334a4f22003ceb3263522bce08d301b3b69de33673f318c64675a7574db4328900ae224 WHIRLPOOL 74c9ff87d76de7f9290115cdff4c0f525bff92773ee83878dd2ef099533033801267140f45c3d20c46a2b4417d0bcc6895e1b5c772efb7462a599d357c6b81ed
 EBUILD gnokii-0.6.29.ebuild 3417 SHA256 b040c694baad90ba8f5226703da17956ef29f38f86bb6acab0491decad72a80f SHA512 eb9fb769c60086c9877b651152e5e1c2e4d1ba8fceca16f35700befb03223fd89d9e3eac795f8faf1ec9f4e8e77efc372bb12d6087699a10aafdaea0b983d35a WHIRLPOOL ba497128847047eb22ebf2115f7ec9c237bc028e42eeac210c2d8d14b72610b4c3562a2d78ced20fce248e93d9233b130baea39dbcb3f004b49bb422f3367eb7
-EBUILD gnokii-9999.ebuild 3317 SHA256 33799438fbab6102c73eb5373d72f9d137af2ca777e595278f9c4b1baf58059d SHA512 0a079e0b408df48dc8fc982b8c45979b8572b46e30df88b93efaa13db3fa62974bf0646cefb854b95ea38c9d867c92c644737168fc20173b1bd901206bd5d07b WHIRLPOOL 4a33d227cffd96c33611621911b06a8b2e9016625529719f49db1382cf0c898751f889ce4871c50c74ceadf9acabf000e221053168e17516e0404d531e22747b
-MISC ChangeLog 21073 SHA256 fd5e9fc34901769487a04b0b9c87e1b1380ad39e232ba41405f4c0f6996ceefd SHA512 51700625fe013b852c71a504fe30e8c604d9445373e256066315aa8440d86b4edd01a6e1386f91097a5e5ea100891c595889ca8c568fc1182e45b56cce59b606 WHIRLPOOL b6dbb10749ddbaf51ba52680dbe20b17ead08aea78009c8223b4225199fd175c8070cc63c285ecf0d2c30590d81d8dbd6a5eb53b72b2dfed15cd78a7d840052c
-MISC metadata.xml 663 SHA256 8275ef9e2f500c48cc7c6620246bfafdf15e0bbd62bbe5f7fe286ebf5650a5ca SHA512 cb7da8890e6ae7031e0273627b8e67e7e1e61e20b8f31d73ecfdfc8ddda2bea8f729e4752536219d5d38ab1848f1662fa2dc8c29926028582df06b62c9e85c2a WHIRLPOOL 865875995c85c51db972601633125e47abb3090a64f27788febf670e6fa4b6538cb957b30bc2faad0b8f03b30fd2a0984a08a028f1ba268e65c21669ce9f37b8
+EBUILD gnokii-0.6.31.ebuild 3526 SHA256 73ae31b5d20ceadd7dbe23d50292aac83461eec58d7a97136562744ad05ef7f1 SHA512 56d3551e021b36d68523c503e87f51be0a560568eea2f116b9b6bcb7eb99c7dea8b2e13ab7a806b1de65ebeb411258417788d4246d3f3776543e17160e48d225 WHIRLPOOL acbf35ea23a617c7b2cee90742490cc444e68ee15b1ac529fad9274927d0972e5cf2852f49e0914cffea2d5ccdce68ca757e8699b2c457951a049845589113a9
+EBUILD gnokii-9999.ebuild 3356 SHA256 1bcca7fa20da057f06a67f14c69d551ca6100c9f2d039d259f6f682af3c9dcfd SHA512 565062f99a72450cefe48ea196053355d4403c892ddd035133caa6ccd02361f94d30249dc47afb53f4cd38f39e5ca0b56014ab34094ffa033cc1d880c2d15f24 WHIRLPOOL 7c3b34fc9d7e5e5d958feea7291108c2aabeb194e9c75d9b28cea8f6121351b42e261f668f8bbfb4ece914886318a65caed8441f38bab57aea5b189a42410fec
+MISC ChangeLog 21281 SHA256 0bbf2322e3b923fcbd6c6e15b806f73d7133a5136f944155859bd591e821c38d SHA512 a0f411673c00f40cba17348e5424d748a7a3686b5ba61fe864e54442a5794548d9b64997ab71fe98dfa92e4ac10df6457fda562a586cc868d48a46caf2d0d1ce WHIRLPOOL c7bd33afc8d87613fab4465abdeb2d84bacd4dfca670bc979bcc4514b194a0e20f148124e0873a94fbaadff792837c7687be071f8d8b8c24021520eaa3a1f344
+MISC metadata.xml 755 SHA256 9283b34cca93ff5e9d3a7618c42bc433c370c25936ef4f22685e59ef500648c4 SHA512 aa0be4d8b4d626fc65890f8c198bdbcfe8a5c6eb75f09e10c5803f3832cf8843b47116ec231e722d8339cb3f2a361894f5017d800bf9ea7d17d02a98bf33dbb4 WHIRLPOOL 52ac844b0951ceaa7081befca9e72b1841adfa7e6b1ea3b85dd9d9c1b4ebb529d5d085f77c99effa03d489c80d2952a38076f03dcc1a64091656020cc545fd35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBHGVcACgkQgAnW8HDreRZWbgCdE20II8KFWYZ0FfBs43zlH2ma
-srMAn0+IjeUNgnZYrpoyxY7LWGLWAVcN
-=0ihl
+iQEcBAEBCAAGBQJQTrt6AAoJEOeBhlrCAAWGru0H/02qdcQpTBST6k/vtjbfhZPk
+js3pZqu5NZewROSjYVz0IsdJZ4nZs7BSYU0qsLA5KuJG4Fz/uPCeoisfUnU4i9IL
+uCtkDeEsjWDD8wjNE5tJDd+Kys+aokvkRZlRS2jbFCKrdd7KZY4zOKBXoC5otuB3
+ijkNqzeeSC1a2+qgM2fG99+8SOHte7qrFrb3aoC2eGh38PzllkO4ukh5DFuDzIzb
+XTXlW3oyRti89f2UK8UR6wU3ZYTPYT43/z4bbhXelryJqhcXFbpOTIIu8Dz6p1GD
+TTL+yGcJITRxNae/CKt2PrvGQKdqBHDs7XUSG9uoE4D2mmuV3LWi8i1BkMUGfqc=
+=RgmU
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31.ebuild
new file mode 100644
index 000000000000..5b2a50bffb78
--- /dev/null
+++ b/app-mobilephone/gnokii/gnokii-0.6.31.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.31.ebuild,v 1.1 2012/09/11 04:17:55 ottxor Exp $
+
+EAPI=4
+
+inherit eutils linux-info autotools
+
+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 ~amd64-linux ~x86-linux ~ppc-macos"
+else
+	SRC_URI=""
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/${PN}.git
+		http://git.savannah.gnu.org/r/${PN}.git"
+	inherit git-2
+fi
+DESCRIPTION="user space driver and tools for use with mobile phones"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls bluetooth ical irda sms postgres mysql usb X debug +pcsc-lite"
+
+RDEPEND="!app-mobilephone/smstools
+	pcsc-lite? ( sys-apps/pcsc-lite )
+	X? ( x11-libs/gtk+:2 )
+	bluetooth? ( kernel_linux? ( 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}"/${P}-fix_xgnokii_inclusion.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 \
+		$(use_enable pcsc-lite libpcsclite)
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins Docs/sample/gnokiirc
+	sed -i -e 's:/usr/local:'"${EPREFIX}"'/usr:' "${ED}/etc/gnokiirc"
+
+	# only one file needs suid root to make a pseudo device
+	fperms 4755 /usr/sbin/mgnokiidev
+
+	if use X; then
+		newicon 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
+}
diff --git a/app-mobilephone/gnokii/gnokii-9999.ebuild b/app-mobilephone/gnokii/gnokii-9999.ebuild
index d6faab8b207e..9b56e3b65451 100644
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild
+++ b/app-mobilephone/gnokii/gnokii-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2012 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.10 2012/09/05 09:20:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-9999.ebuild,v 1.11 2012/09/11 04:17:55 ottxor Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils linux-info autotools
 
 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"
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 else
 	SRC_URI=""
 	KEYWORDS=""
@@ -21,12 +21,12 @@ DESCRIPTION="user space driver and tools for use with mobile phones"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls bluetooth ical irda sms postgres mysql usb X debug"
+IUSE="nls bluetooth ical irda sms postgres mysql usb X debug +pcsc-lite"
 
 RDEPEND="!app-mobilephone/smstools
-	sys-apps/pcsc-lite
+	pcsc-lite? ( sys-apps/pcsc-lite )
 	X? ( x11-libs/gtk+:2 )
-	bluetooth? ( net-wireless/bluez )
+	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
 	sms? (
 		!app-mobilephone/smstools
 		>=dev-libs/glib-2
@@ -78,16 +78,15 @@ src_configure() {
 		$(use_enable debug rlpdebug) \
 		--enable-security \
 		--disable-unix98test \
-		--enable-libpcsclite \
-		|| die "configure failed"
+		$(use_enable pcsc-lite libpcsclite)
 }
 
 src_install() {
-	einstall || die "make install failed"
+	default
 
 	insinto /etc
 	doins Docs/sample/gnokiirc
-	sed -i -e 's:/usr/local:/usr:' "${D}/etc/gnokiirc"
+	sed -i -e 's:/usr/local:'"${EPREFIX}"'/usr:' "${ED}/etc/gnokiirc"
 
 	# only one file needs suid root to make a pseudo device
 	fperms 4755 /usr/sbin/mgnokiidev
@@ -111,9 +110,9 @@ pkg_postinst() {
 	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}."
+		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
 }
diff --git a/app-mobilephone/gnokii/metadata.xml b/app-mobilephone/gnokii/metadata.xml
index 38d8aa65cd18..d3ad74e22cf5 100644
--- a/app-mobilephone/gnokii/metadata.xml
+++ b/app-mobilephone/gnokii/metadata.xml
@@ -12,5 +12,6 @@ depending on the phone you have.
   <flag name='ical'>Enable support for <pkg>dev-libs/libical</pkg></flag>
   <flag name='irda'>Enable infrared support</flag>
   <flag name='sms'>Enable SMS support (build smsd)</flag>
+  <flag name='pcsc-lite'>Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
 </use>
 </pkgmetadata>