Improve ebuild (#215378).

Package-Manager: portage-2.1.4.4

3 files changed, 26 insertions, 38 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index 079e7a3bac37..6425f695bf9b 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.74 2008/06/01 12:18:38 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.75 2008/06/01 21:44:29 mrness Exp $
+
+*gnokii-0.6.26-r1 (01 Jun 2008)
+
+  01 Jun 2008; Alin Năstac <mrness@gentoo.org> -gnokii-0.6.26.ebuild,
+  +gnokii-0.6.26-r1.ebuild:
+  Improve ebuild (#215378).
 
 *gnokii-0.6.26 (01 Jun 2008)
 
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index e3211c1432be..ef86b7b56183 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -14,13 +14,13 @@ EBUILD gnokii-0.6.14-r2.ebuild 3675 RMD160 e24664e5762248dc52016438084d3a8c15429
 EBUILD gnokii-0.6.18-r1.ebuild 3907 RMD160 888fa5dbe07b4ee1faff6eb44f9eb3fdb4dd399e SHA1 3d2c03c140e23bc4442c7a02351006d513d8ba8b SHA256 638588503bf77dcf1013dca20461768a46fed50d7c2fcd14c33d3c99080e30ae
 EBUILD gnokii-0.6.19.ebuild 3541 RMD160 e797a9fa0496dbba45ab5c18d9a82c98cd24d774 SHA1 1c3e071a479179b841ad60a371d1395555606e7f SHA256 ff508cbbaed047a5c94a208695bdfc9f3794c67b0582357f6764a7a552164acf
 EBUILD gnokii-0.6.22-r2.ebuild 4196 RMD160 6a7657b8c92ae13b0b97de63af47112990bf6d09 SHA1 ea85a53f1512c835164e020824c8142527a49774 SHA256 4f792b14918cacdf3fec82d4e00902b505e90792e5c0195645ccd614a64aaaa9
-EBUILD gnokii-0.6.26.ebuild 3003 RMD160 9fd9a32d6af92a4f592a8633552f20b8db9fa736 SHA1 1a0fa071db5a2a9d28e77e485227a6154fcd98eb SHA256 1ba8caf7fe025aef6086b1674dd3d46fc3dd2158f85c0a44fcf6bc5348eb8ecd
-MISC ChangeLog 14603 RMD160 738ab7d5159525af502ec4bd218f1a94db79ebd8 SHA1 4e4ab430b36425ebafca40610f8926e00dad5d85 SHA256 4011c77af38abc267e79f537aed0ae73c7f787e6ab24cdcdc03d1af371440ea2
+EBUILD gnokii-0.6.26-r1.ebuild 2647 RMD160 db4f5331e42a461fba2cdbd4aa577cc9dd7c1950 SHA1 4328fad0408b7be78c4da5e1f5548adb7ae466e4 SHA256 0cd68a292786db3d4b4882e30bc439e8a11180b06765e87b15bbefe40fd8b01e
+MISC ChangeLog 14764 RMD160 955f1214a0ab845c5571f15c81843307717f44d2 SHA1 b957da7b0583ae382627ecf481d240de2ef3b51c SHA256 fc61342e0efb101876ebc7049c18e277cfa9f7a02d83860be6c0be78b6380acd
 MISC metadata.xml 467 RMD160 f4f42815e8e048a9393a44da04ca01dac19c2cb5 SHA1 ffe70f8fab241fb7d19fb7807e6a04a5134fee6e SHA256 568184cf4297917d644b08f231861be42f00830d26e6c3789e3a4d65016430d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhCk6kACgkQ+fWpoTWIA9FZhQCbB4eH2xDQVFy0mR3oh8pZ1fzj
-ATsAnA63ej/Bz3c6k/+yZexXaEUyZ6ze
-=d0uW
+iEYEARECAAYFAkhDGEkACgkQ+fWpoTWIA9Fq5QCeJhLipBJSUhU8b120RiPVYOMI
+TekAn2X2hTPG7yGXsAoheMBs/9aYH3IU
+=PqI2
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnokii/gnokii-0.6.26.ebuild b/app-mobilephone/gnokii/gnokii-0.6.26-r1.ebuild
index b09ecc4b1927..32b0b5df85c9 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.26.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.26.ebuild,v 1.1 2008/06/01 12:18:38 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.26-r1.ebuild,v 1.1 2008/06/01 21:44:29 mrness Exp $
 
 WANT_AUTOMAKE="none"
 
@@ -36,15 +36,10 @@ CONFIG_CHECK="UNIX98_PTYS"
 MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_compile() {
 	strip-linguas ${MY_AVAILABLE_LINGUAS}
-}
 
-src_compile() {
-	config_xdebug="--disable-xdebug"
+	local config_xdebug="--disable-xdebug"
 	use X && use debug && config_xdebug="--enable-xdebug"
 
 	econf \
@@ -54,49 +49,36 @@ src_compile() {
 		$(use_enable irda) \
 		$(use_enable bluetooth) \
 		$(use_with X x) \
-		$(use_enable debug) \
+		$(use_with sms smsd) \
+		$(use_enable debug fulldebug) \
 		${config_xdebug} \
 		$(use_enable debug rlpdebug) \
-	    --enable-security \
+		--enable-security \
 		--disable-unix98test \
+		--disable-libpcsclite \
 		|| die "configure failed"
 
 	emake -j1 || die "make failed"
-
-	if use sms;	then
-		pushd "${S}/smsd"
-		emake || die "smsd make install failed"
-		popd
-	fi
 }
 
 src_install() {
 	einstall || die "make install failed"
 
-	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
-	fi
-
 	insinto /etc
 	doins Docs/sample/gnokiirc
 	sed -i -e 's:/usr/local:/usr:' "${D}/etc/gnokiirc"
 
-	doman Docs/man/*
-
-	dodir "/usr/share/doc/${PF}"
-	cp -r Docs/sample "${D}/usr/share/doc/${PF}/sample"
-	cp -r Docs/protocol "${D}/usr/share/doc/${PF}/protocol"
-	rm -rf Docs/man Docs/sample Docs/protocol
-	dodoc Docs/* ChangeLog TODO MAINTAINERS
-
 	# only one file needs suid root to make a pseudo device
 	fperms 4755 /usr/sbin/mgnokiidev
 
-	if use sms;	then
+	if use X; then
+		insinto /usr/share/pixmaps
+		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+	fi
+
+	if use sms; then
 		pushd "${S}/smsd"
-		einstall || die "smsd make install failed"
-		insinto /usr/share/doc/${PF}/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