[gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gnokii/

["David Seifert" <soap@gentoo.org>]

commit:     f90995cab590a57502219545af6412fe1243d38b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 22:22:01 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 22:22:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90995ca

app-mobilephone/gnokii: Update live ebuild

* EAPI=6

Package-Manager: portage-2.3.3

 app-mobilephone/gnokii/gnokii-9999.ebuild | 123 +++++++++++++++++-------------
 1 file changed, 71 insertions(+), 52 deletions(-)

diff --git a/app-mobilephone/gnokii/gnokii-9999.ebuild b/app-mobilephone/gnokii/gnokii-9999.ebuild
index 7f237fb..c82a9a1 100644
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild
+++ b/app-mobilephone/gnokii/gnokii-9999.ebuild
@@ -1,58 +1,68 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
-inherit eutils linux-info autotools
+inherit autotools eutils linux-info
 
 HOMEPAGE="http://www.gnokii.org/"
-if [ "$PV" != "9999" ]; then
+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"
-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"
+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"
+IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
 
-RDEPEND="!app-mobilephone/smstools
-	pcsc-lite? ( sys-apps/pcsc-lite )
-	X? ( x11-libs/gtk+:2 )
+RDEPEND="
+	!app-mobilephone/smstools
 	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
+	ical? ( dev-libs/libical:= )
+	pcsc-lite? ( sys-apps/pcsc-lite )
 	sms? (
-		!app-mobilephone/smstools
-		>=dev-libs/glib-2
-		postgres? ( >=dev-db/postgresql-8.0 )
-		mysql? ( >=virtual/mysql-4.1 )
+		dev-libs/glib:2
+		postgres? ( dev-db/postgresql:* )
+		mysql? ( virtual/mysql:= )
 	)
-	ical? ( dev-libs/libical )
-	usb? ( =virtual/libusb-0* )"
+	usb? ( virtual/libusb:0 )
+	X? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
+	dev-util/intltool
 	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
-	dev-util/intltool"
+	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"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+)
+
 src_prepare() {
-	if [ "$PV" = "9999" ]; then
-		epatch "${FILESDIR}"/${P}-icon.patch
-		epatch "${FILESDIR}"/${P}-translations.patch
-		intltoolize --force --copy --automake || die "intltoolize error"
-	fi
+	[[ $PV == *9999 ]] && \
+		PATCHES=(
+			"${FILESDIR}"/${P}-icon.patch
+			"${FILESDIR}"/${P}-translations.patch
+		)
+
+	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
+
+	default
 
 	eautoreconf
 }
@@ -60,48 +70,57 @@ src_prepare() {
 src_configure() {
 	strip-linguas ${MY_AVAILABLE_LINGUAS}
 
-	local config_xdebug="--disable-xdebug"
-	use X && use debug && config_xdebug="--enable-xdebug"
+	local config_xdebug
+	if use X && use debug; then
+		config_xdebug="--enable-xdebug"
+	else
+		config_xdebug="--disable-xdebug"
+	fi
 
 	econf \
-		$(use_enable nls) \
+		--disable-static \
+		--disable-unix98test \
+		$(use_enable bluetooth) \
+		${config_xdebug} \
+		$(use_enable debug fulldebug) \
+		$(use_enable debug rlpdebug) \
 		$(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 nls) \
+		$(use_enable pcsc-lite libpcsclite) \
 		$(use_enable postgres) \
-		$(use_enable debug fulldebug) \
-		${config_xdebug} \
-		$(use_enable debug rlpdebug) \
-		--enable-security \
-		--disable-unix98test \
-		$(use_enable pcsc-lite libpcsclite)
+		$(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
-	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
+	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 
 	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
+		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
 }
 
@@ -109,7 +128,7 @@ 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
+	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/"