Convert to EAPI=2, use the auto option with gen_usr_ldscript, update HOMEPAGE/SRC_URI #349358 by Mr. Anderson, and add upstream fix for parallel make warnings #206291 by Michael A. Smith.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

4 files changed, 65 insertions, 30 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 8191422451f3..2b211aa25960 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/gpm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.86 2010/10/10 18:49:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.87 2010/12/24 20:39:33 vapier Exp $
+
+  24 Dec 2010; Mike Frysinger <vapier@gentoo.org>
+  +files/0001-fixup-make-warnings.patch, gpm-1.20.6.ebuild:
+  Convert to EAPI=2, use the auto option with gen_usr_ldscript, update
+  HOMEPAGE/SRC_URI #349358 by Mr. Anderson, and add upstream fix for
+  parallel make warnings #206291 by Michael A. Smith.
 
   10 Oct 2010; Raúl Porcel <armin76@gentoo.org> gpm-1.20.6.ebuild:
   sparc stable wrt #334967
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 6aa3df452263..6bf26bcbaad4 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,13 +1,9 @@
 AUX 0001-daemon-use-sys-ioctl.h-for-ioctl.patch 1145 RMD160 61a5c2d0d7c84baf8d2916dcdab21b64eb0d9849 SHA1 5199e94ec3e1c78c66bbe5a0d9b25cb64f5513ad SHA256 e9e2690d2c29e5e166f726638d90e1bfbc54815d36336b5cc539a31ff56650bf
+AUX 0001-fixup-make-warnings.patch 821 RMD160 b35b555d7b34fe7262f9393f6ceabd0f10cacbf0 SHA1 2bf12ad7897ed30b4f37a2a7e63564a70db21503 SHA256 590bedebcb1ff168a84610e9ee5e10012fd4fd65cd26bc61380cc1d8a2ba9568
 AUX gpm-1.20.5-abi.patch 383 RMD160 782fc099dc3e10b0de022a9a89fdf77d0559f359 SHA1 c6db4819c5bfd296971cf135d7052194f41990a4 SHA256 aafaa4c1e3f216b6ad5880653dfb6fd8eb264644cbca08dad219bab7a9cefda5
 AUX gpm.conf.d 580 RMD160 5ce706d89a3e2c01b75a01dd614267f918290be9 SHA1 44035e2059ac0fc178bfe427900d43ad33aeaa2a SHA256 73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8
 AUX gpm.rc6 951 RMD160 770208133f13fd02207095f7b71a63ac790467d7 SHA1 ca001d11faa1e28a16bfffc1ad880763399b354b SHA256 b893aa660a50014ea3dae4ce9925117b3b8bec9d50abf10f2da946a845789d04
-DIST gpm-1.20.1-patches-1.6.tar.bz2 9884 RMD160 70deedec137e82f6c02b14cef6721b8f2ff26bd7 SHA1 3f0e12f2b298e7b2d015fa3a488012b35bf3495d SHA256 7f5d0ca5936a863b1e2c281ca8a4748dc80f88ead567ebf60bcecb252c6a9cc4
-DIST gpm-1.20.1.tar.bz2 565014 RMD160 2650ae1e3e87fcf8bdad80acf62777e8a62b6582 SHA1 c48d937e62abb438c2f6439b34ef3332c89af8d1 SHA256 11fabe7f27a205ff1ea6aee23e1dc2bb2dc5dbfc45ff0320fca0cd559806a936
-DIST gpm-1.20.5.tar.lzma 1298963 RMD160 eacb47488d48b7281b70568b24ca3cfa523567df SHA1 4edff15d7fd8a5052b89e8506efefc08c7e26fd3 SHA256 1ecb09421507e9bc409a5d7052ae56a6159d706982a951ba150b2c6fde29ad06
 DIST gpm-1.20.6.tar.lzma 1280871 RMD160 c51995e868fa824aa25fa3333e74ac6b6496b07f SHA1 4677da0eb2f1910a5a744bbefa08fea82e0dca0c SHA256 27abb8a9142d3f7c31aeade2f2f1ed4b76bc760e181f552c504a7a9be00a868f
-EBUILD gpm-1.20.1-r6.ebuild 1882 RMD160 af915732f0ec9cfc32da3a326ee3b6f7fc2f3b02 SHA1 5f9953d4561ecd74fccd31eb481f26f0ebe04be9 SHA256 a6993212b8c9cea1d6dfe9430c83c9a04d265cd6b6b863232ce1ba9c170ede68
-EBUILD gpm-1.20.5.ebuild 1601 RMD160 797c13b4daed348eb1b7b3320b9398e89814ca2b SHA1 207687d555e98b6c743fff28361417e67d40b7eb SHA256 c74a6f3a9bd2748011b0ba92e540eb1d02900a8d984b2a9156dc8a56d9c72473
-EBUILD gpm-1.20.6.ebuild 1602 RMD160 621a2b9fe31d30a8dd16f4345e26db8ac54337b8 SHA1 f5af73aacf68161cffc240520efae0f5ca1bb605 SHA256 e024c621fd64615831130cdb02faf7c003bf9b1b28b31bc2cba0bd3fdc0a34f0
-MISC ChangeLog 11670 RMD160 a20fa64925e084d96b26c28b2ed3915290e91acb SHA1 7ffaf7f0b063e489cfa414f1423ebf490aad8f0e SHA256 99a3d8cf8dffb98dc2c6cbf4e8b2d29b3a916fe3fb239cf68bbbdfad8062e87b
+EBUILD gpm-1.20.6.ebuild 1458 RMD160 ad86d3c55f5b37bb81b58bcc261cd948219d6638 SHA1 0da0e1f6e2963e8c794c0065ba973fab6bda8716 SHA256 d84945186ac98a57b5b21f28c4b277657f5e6c7fa7caf6e25644df1836a9b3b4
+MISC ChangeLog 11974 RMD160 b0312a5a9a1512c16f5b6954c0be8f06323c8ab3 SHA1 6a8cfb4efbd8f8e61006ba0718eb7d54c5381113 SHA256 1257b28201a77460ac7779a8c3985cffea23ffb18b659a2b6ccffdfb79166c36
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-libs/gpm/files/0001-fixup-make-warnings.patch b/sys-libs/gpm/files/0001-fixup-make-warnings.patch
new file mode 100644
index 000000000000..c55d2f826d01
--- /dev/null
+++ b/sys-libs/gpm/files/0001-fixup-make-warnings.patch
@@ -0,0 +1,35 @@
+From 1bee81778e7355e6b902986b6e0fc5750546444a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 16 Feb 2009 15:43:40 -0500
+Subject: [PATCH] fixup make warnings
+
+Split the toplevel dep target to use normal make dependencies and use the
+$(MAKE) var rather than hardcoding `make`.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile.in |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 90b92d0..89cbb5e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -26,9 +26,11 @@ SUBDIRS = src doc contrib
+ 
+ all: do-all
+ 
+-dep:
+-	touch src/$(DEPFILE) # to prevent unecessary warnings
+-	make -C src dep
++src/$(DEPFILE):
++	touch $@ # to prevent unecessary warnings
++
++dep: src/$(DEPFILE)
++	$(MAKE) -C src dep
+ 
+ check: all
+ 
+-- 
+1.7.3.1
+
diff --git a/sys-libs/gpm/gpm-1.20.6.ebuild b/sys-libs/gpm/gpm-1.20.6.ebuild
index b81a580a873d..cf5055b6f4cb 100644
--- a/sys-libs/gpm/gpm-1.20.6.ebuild
+++ b/sys-libs/gpm/gpm-1.20.6.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.6.ebuild,v 1.12 2010/10/10 18:49:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.6.ebuild,v 1.13 2010/12/24 20:39:33 vapier Exp $
 
 # emacs support disabled due to #99533 #335900
 
-inherit eutils toolchain-funcs flag-o-matic
+EAPI="2"
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="http://linux.schottelius.org/gpm/"
-SRC_URI="http://linux.schottelius.org/gpm/archives/${P}.tar.lzma"
+HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
+SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,36 +21,32 @@ DEPEND="sys-libs/ncurses
 	app-arch/xz-utils"
 RDEPEND="selinux? ( sec-policy/selinux-gpm )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.20.5-abi.patch
 	epatch "${FILESDIR}"/0001-daemon-use-sys-ioctl.h-for-ioctl.patch #222099
+	epatch "${FILESDIR}"/0001-fixup-make-warnings.patch #206291
+
+	# workaround broken release
+	find -name '*.o' -delete
 }
 
-src_compile() {
+src_configure() {
 	econf \
-		--libdir=/$(get_libdir) \
 		--sysconfdir=/etc/gpm \
-		emacs=/bin/false \
-		|| die "econf failed"
+		emacs=/bin/false
+}
 
-	# workaround broken release
-	find -name '*.o' | xargs rm
+src_compile() {
+	# make sure nothing compiled is left
 	emake clean || die
-	emake -j1 -C doc || die
-
-	emake EMACS=: || die "emake failed"
+	emake EMACS=: || die
 }
 
 src_install() {
-	emake install DESTDIR="${D}" EMACS=: ELISP="" || die "make install failed"
+	emake install DESTDIR="${D}" EMACS=: ELISP="" || die
 
-	dosym libgpm.so.1.20.0 /$(get_libdir)/libgpm.so.1
-	dosym libgpm.so.1 /$(get_libdir)/libgpm.so
-	dodir /usr/$(get_libdir)
-	mv "${D}"/$(get_libdir)/libgpm.a "${D}"/usr/$(get_libdir)/ || die
-	gen_usr_ldscript libgpm.so
+	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
+	gen_usr_ldscript -a gpm
 
 	insinto /etc/gpm
 	doins conf/gpm-*.conf