gentoo resync : 10.02.2019

3 files changed, 144 insertions, 4 deletions

diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index 347e2a654ab6..25d42c8dd584 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -5,5 +5,6 @@ AUX gnokii-9999-icon.patch 239 BLAKE2B 17253cc10ccb2b7520c0967821e4a57f56e2292d2
 AUX gnokii-9999-translations.patch 196 BLAKE2B e703e57517f370852858bbe945be12697a249dc9743bce5f05b0f3ac1a04bc5c48d16217b7f2f0ef89ed0930cbadff2d758b6407a16bb1d785d329d1a47afc13 SHA512 ac167f1d93abf9ed00cd4761ae3b86fdfda33ec5690bf1c0c62a136fe09d0f57dd0d3abe172a3adafb499cc01655995111bc84343932bc6054d45a8e70097af6
 DIST gnokii-0.6.31.tar.bz2 1237865 BLAKE2B d94c5d44e7075b875037c55448b63c76a27116ad09eeb3c450597d6d65d0cabae65aefc904dcdd868b30fbd17989ce50aecfb2d08dce8ac55e36d1976f0b61da SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d
 EBUILD gnokii-0.6.31-r1.ebuild 3406 BLAKE2B 05dc21f33f49a26ad64e97dcef8a5664dd5c041e539bd1c52a0a46a4fcdaed78b894e842a4c14dc622b9293a4d0d04c7c05cd1e2d7c63b29e4b163b99471690e SHA512 ee152a9844dc03bf2a006183eef4a494ea98845a56029d4d0aa2ee78355ccac732c3aad6a39953c99fcf6ae1e023bc90b22048b56c29c498152f9b238637630a
-EBUILD gnokii-9999.ebuild 3329 BLAKE2B 86eec528c3dc6ad9e9209d4c6519fe2ad7d5af43c4c72c7b1312330e4c983ce76e9b4292ef40e6e4b3f8f06f1286a6ad3eda95988bcfbc246862d2e4114497bb SHA512 1521e6f7baffbcbbc11d3ed499134ab7f56ece40c809853d03e07f12b77dd6a4d02ef8c001fffcc711d026920f0b5ddc0a0bc8f5058296c75a132e84cc5fca6a
+EBUILD gnokii-0.6.31-r2.ebuild 3428 BLAKE2B 46fecaf90d718eb2544fb34ce108ffbedb01162239d241be186fbf163eb66e0f336e959850aa8bf6191affa0e3104192462d2033506076ba6fffde6d9ddde3ca SHA512 85ee63e471ee56afed7aa9ae7bbef4d617a4b49e4f37b12c4f85ae7e9339c2c2e821497091df26217df330399abd43101c65bdef45357aa9bfd022ec3232e83e
+EBUILD gnokii-9999.ebuild 3345 BLAKE2B eaa9d12ab32122e380b8e03f4eada301b6d670754a3418d046db6b4da6e9a8aa1f666707512ccb1d727447bfbba5642808d554305b4f2b462d47e4ab996b9e97 SHA512 a81aa4c2460d8564250bf2a8416ff21cc8584db928b3c4f32fe9eb871c128f8ac58b97e1c56320870292625ab0c06df60e082172cda3d152020077e0622f5864
 MISC metadata.xml 756 BLAKE2B 840e51ec7099b1ae34694dfa328d908147c90a32689165201a98bbc6559c1d6db8c63dffc0264210203775ba502d1c64d3245b32c4def375abf7a7685539c458 SHA512 7fbdd7684cd7810fe6114146a3378c346ca8d01df54adbbea292b0727fb039d5ceec29e4a5fd4d3031c17f9f229a4de0d635ae23e57eb507103255ebcb057983
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r2.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r2.ebuild
new file mode 100644
index 000000000000..30ba63e2ac49
--- /dev/null
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop eutils linux-info
+
+HOMEPAGE="http://www.gnokii.org/"
+if [[ $PV == *9999 ]]; then
+	EGIT_REPO_URI="
+		git://git.savannah.nongnu.org/${PN}.git
+		http://git.savannah.gnu.org/r/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+DESCRIPTION="User space driver and tools for use with mobile phones"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
+
+RDEPEND="
+	!app-mobilephone/smstools
+	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
+	ical? ( dev-libs/libical:= )
+	pcsc-lite? ( sys-apps/pcsc-lite )
+	sms? (
+		dev-libs/glib:2
+		postgres? ( dev-db/postgresql:* )
+		mysql? ( dev-db/mysql-connector-c:= )
+	)
+	usb? ( virtual/libusb:0 )
+	X? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	irda? ( virtual/os-headers )
+	nls? ( sys-devel/gettext )
+"
+
+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"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+)
+
+src_prepare() {
+	[[ $PV == *9999 ]] && \
+		PATCHES=(
+			"${FILESDIR}"/${P}-icon.patch
+			"${FILESDIR}"/${P}-translations.patch
+		)
+
+	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
+
+	default
+	mv configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	strip-linguas ${MY_AVAILABLE_LINGUAS}
+
+	local config_xdebug
+	if use X && use debug; then
+		config_xdebug="--enable-xdebug"
+	else
+		config_xdebug="--disable-xdebug"
+	fi
+
+	econf \
+		--disable-static \
+		--enable-security \
+		--disable-unix98test \
+		$(use_enable bluetooth) \
+		${config_xdebug} \
+		$(use_enable debug fulldebug) \
+		$(use_enable debug rlpdebug) \
+		$(use_enable ical libical) \
+		$(use_enable irda) \
+		$(use_enable mysql) \
+		$(use_enable nls) \
+		$(use_enable pcsc-lite libpcsclite) \
+		$(use_enable postgres) \
+		$(use_enable sms smsd) \
+		$(use_enable usb libusb) \
+		$(use_with X x)
+}
+
+src_test() {
+	echo common/phones/fake.c >> po/POTFILES.in || die
+	default
+}
+
+src_install() {
+	default
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /etc
+	doins Docs/sample/gnokiirc
+
+	# only one file needs suid root to make a pseudo device
+	fperms 4755 /usr/sbin/mgnokiidev
+
+	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
+
+	if use sms; then
+		cd smsd || die
+
+		docinto smsd
+		use mysql && dodoc sms.tables.mysql.sql README.MySQL
+		use postgres && dodoc sms.tables.pq.sql
+		dodoc README ChangeLog README.Tru64 action
+	fi
+}
+
+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 af17537e188b..39ddb284ab7e 100644
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild
+++ b/app-mobilephone/gnokii/gnokii-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils linux-info
+inherit autotools desktop eutils linux-info
 
 HOMEPAGE="http://www.gnokii.org/"
 if [[ $PV == *9999 ]]; then
@@ -29,7 +29,7 @@ RDEPEND="
 	sms? (
 		dev-libs/glib:2
 		postgres? ( dev-db/postgresql:* )
-		mysql? ( virtual/mysql:= )
+		mysql? ( dev-db/mysql-connector-c:= )
 	)
 	usb? ( virtual/libusb:0 )
 	X? ( x11-libs/gtk+:2 )"