Version bump.

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

4 files changed, 97 insertions, 16 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 38f38c3fd60d..11bd93d1caa2 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/gpm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.90 2012/10/26 20:45:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.91 2012/10/28 11:35:56 vapier Exp $
+
+*gpm-1.20.7 (28 Oct 2012)
+
+  28 Oct 2012; Mike Frysinger <vapier@gentoo.org> +gpm-1.20.7.ebuild,
+  files/gpm.rc6-2:
+  Version bump.
 
 *gpm-1.20.6-r1 (26 Oct 2012)
 
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 9179ff9f6f3a..e889e18743e4 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -7,20 +7,28 @@ AUX gpm-1.20.5-abi.patch 383 SHA256 aafaa4c1e3f216b6ad5880653dfb6fd8eb264644cbca
 AUX gpm-1.20.6-disablestatic.patch 1985 SHA256 a4e22041737b6c463bcc6dca88e20d4cc405da3ee82b326d21ba8f3519ee2e7c SHA512 8eb27cdada8d2dc8f600e5c73c93ab0cef5fce3e0ce849f8947d4c5da480da4f52fe9376e3c7a8a7621c22e721d6688d47493997e242e2317b02e2cdc79dab61 WHIRLPOOL 1878bb20214e9bdc13882ea49291949e7fa967b525241d52e98f95ce31b30c00a7fac8e4c5bd79a06579936ce8fcfa45af45374f2eee94e7908fee2337336719
 AUX gpm.conf.d 580 SHA256 73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8 SHA512 14a4306a7454d1a12fda29973b51aadd6d1a5cf4833b1be5298cfe0c1ebc63a479cc79490007ae92c6ae24368e19215dfc4bd50ef5b0cfa0fef88cf69db67065 WHIRLPOOL 61039423b5749f65505db3d0c3355599f5776b8807b7e79720d9498916f1dc1312070209ec470375d0bcb9a36919ad0dbde1f5c6a283454c7ea9be3cc3e33c43
 AUX gpm.rc6 951 SHA256 b893aa660a50014ea3dae4ce9925117b3b8bec9d50abf10f2da946a845789d04 SHA512 521305b536549b89e26a5eb380756134f4086f679180e516e5375da8c104050a6db1d290cd87fa15b15faa8c2826fc20ebae01ac0a4f1f102211de25b67f9dad WHIRLPOOL 78d14e7b1a66072ba55d02281c183e1cb881a3cb1cff97e8e8aec1745329d019dce05617561ab00e2f8cac7014f303df7c6012ce04571ac7cad47686744c8290
-AUX gpm.rc6-2 665 SHA256 ede426795efd3e549fced9d5e620492dc81cf0655a432ad06039d9a8900662bf SHA512 6fa127bba9befdc3cb032509229fdce08b992afd78409bfb181c3d15ac0504ce02a93b0da49800eaea1edfd6fc6b6056d886404f066c21389610f8a2cfab48f4 WHIRLPOOL a4e45a2676acdef8b8a06843d0aa399323c2df88789361d47a3c28929e48e00eeebbdb84f732854ff810347a6fb91b4990ce317f2979bb41927865c59a61ef4f
+AUX gpm.rc6-2 655 SHA256 e692e7b97efdd79f6e92fbdaed60f7a71bfd23a82c5561b160b88a7aa50c8461 SHA512 a3d0725c67cb8c6bbf2068e0088e74cadf25baec96cabd65641537142ab2cebc7c32e2132e3a2efc28db67f46499da6be7c85b420cb8e877470927b7b138b98c WHIRLPOOL 216a6c87f2b5b8701ccd0caab5308aa270a369feb0de75c01f27473727b6487e1712cf37191fc70c9cbc8c6b7d90840b58d8ca0f7502d2a8e6a1bfd0fcadb8c9
 DIST gpm-1.20.6.tar.lzma 1280871 SHA256 27abb8a9142d3f7c31aeade2f2f1ed4b76bc760e181f552c504a7a9be00a868f SHA512 6f12d49cb690506ed116251376f0a2c946d86d323e93e11b9c71e7c40212fcc25b9ed364cd4dca3e5f0666fc7d9c38f1c3cdf6e80924cc68aef8623b39c0e623 WHIRLPOOL 05bee4c9156bbde78ea6ee06d7c4afba39899d2877a90a72e60bdab8c921fca9041cbebe5fa0afcc055a1cec2b0674392bcb9b3f1712103f236172e54e15b3b9
+DIST gpm-1.20.7.tar.lzma 789691 SHA256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9 WHIRLPOOL d3d142c3aa385e2ef4b16c96e0f94c04b3666376d893c516d439737c2f3016a12fff7884a8f18b5e6b58e4ba21d82379204b18621a2f338d8ab6d478e4e1ec1a
 EBUILD gpm-1.20.6-r1.ebuild 1709 SHA256 4e5fe4ceb45d51db6ebcc13d8624783486d2b704e0d3f7968450469b377e48ea SHA512 e568ea4f87c0db383fee74b550aef2f97ab07534ea55366e84b411f073898921ff64f28ad73163aef39fd415b7caa87e30ca417af35eb67df9f95feacd9cefa4 WHIRLPOOL 58cb1abc2ad13a1f88dd1808263c74e1196b4a5b46b106ecf8ae3cfb6b3ffdfc1b3bd2ebb93955b9520c4a3502dcae8e6cbad5be3169da833ce21d20cb7de0da
 EBUILD gpm-1.20.6.ebuild 1472 SHA256 b059fa68f6a83bb35874727523f894f88d64d5424ba704a0666ffed310835423 SHA512 10dd80a2f81179babfddbfc6e9d6a15db262c8dc9b8a2bf3db51de1a5b32b02b0d55b7054516bcfb28666bc38f958e0453d20f87027459c6b0cc218403c0aeb6 WHIRLPOOL dff03034a7a70ec5838bf1ddd329a9a30fbdebb4088217dd3c19f52b827959a05cac2bb2933865714d418a081ad071d676b96c943632c862446702852a7a8834
-MISC ChangeLog 12601 SHA256 fa383d83cee231aa7fe215afbf965c8722eaaed6f6a0ee22f4a18ccdfc806456 SHA512 ecd9b1589fa006ce00b04c53e0cac5ec0d987e2fc0268245535525172ffb1c4127b716782597ac30cfcbe2c754d0806c73aa293bc24d09514268e123d8fdac97 WHIRLPOOL 3e62fc5d471a5af376ccfe107d8dfe45d578877d73f6a4d077aad9942252e80ea428d096195421df1384000c21067be92ca7f631cdb904880e2dfeb80d520dd6
+EBUILD gpm-1.20.7.ebuild 1481 SHA256 f227028332ada91847aa09247ee34987a9ebbdbc41a9f521ec26ec35fc8ead7f SHA512 67c88ea8b37faf8471ef6c5d134e14ba6be505e41cb3bc487b5061195e88e8570e1512fa5f7e545fba7ca8155e2ad0f95cbf2d237bdf9ca4569de75bbdfb35be WHIRLPOOL cbaa89e5ded9a98a60d73cce86be0e57dc132adc967c15944a9666f3ab45631d844e2ddf40793d17b22e3e04d212a12dc7171f5242fd1d214e64f281af32ace9
+MISC ChangeLog 12731 SHA256 f5fd753eb83da3587931eb9834cab75933056a5fd2f69f9b6374a89acfacf304 SHA512 2c1dd1fe1718627b0a8e3937de4d2b7e93485cdb2a5e39aa396ef85fd529683dc0a2ea01523de927cff738719430f9deb13e6c5913ead6feea7a794b6aa3960f WHIRLPOOL db3dc4997556c94f465378feefb36d7d75134feec7aa61effb419302ea5be8169f741191c694eef6c1efee3a3d1d749e12f20b8900465d9462a17cc838aec750
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQivgPAAoJEBzRPIrUMBNCq0wIAILTe5Y7GMUVnRp5FRCe+EG7
-NjUZDqymBonaCLv1e0ne9fZl5IFe9/IkLURSAJ2kacTi1IaloC+CH8bAcOfb+Flq
-kMi9AX3DuS6mvYI7PZyOaWHFex91nQGcqjklUC8MF+p5J946SVWGte9VAwbDnzQq
-5/FhOsLcXun3+AmRhc21VDtg743eDcYrmTsXB1g5echHtMAKezEhUP9SwaqzrAFt
-sgXs4QwtjOZpVnTQ24WL1awRms15iraw0k5rkqCdp1UGY3/4xZCiFAnhNA4WSeyM
-awf/XJ8Ob3yKw7Eo4Yhy475U0Om3h2txMGPCbB4StrXL7DrCVkRVBKxrfbB1rF4=
-=CLJC
+iQIcBAEBCAAGBQJQjRijAAoJELEHsLL7fEFWPzQP/iSaOgZmP9ECik0QMTQ8AzYN
+NFOFzQlhYdbG7L2OWHLFVL/mj0S9aCbGt0o43g9uO0cDL8Dcrz+Y7BVinI+/pQml
+zod3NTHbhDjF1BWynbcRhU6KzRTC4ZqohPfxnbFhpFAH5RhsnIsa4w5VRykhIBdA
+JXIB4/mguLuLYeBi11cG62dOy7CoADJBazmjvLydlHmm/46ctwr8JFkPOyCWyxLR
+CQBK5OYGB9SrV774V/BIY5r3lMmZNzYiHItLWb4p1+8Hj/kKWLswJyul8lR+PH5Y
+lMQVO0sxqH3UIu4RabkiWGtnwctVg2ww3KhmFRep9/BRw5VTwaRLeFVFN1zLnmuG
+I487wIUEO87al0YEoXNnSJ7hzc2COuRGfixh7vKpmjrYs0gHOL1ke3WqfmVEpij6
+iBY34JrlpXHV37oH3+3ktQoAaLAMPgVWaRp2ie2DnwZlycfIVNEptc2I7MlKQbbk
+SHXM/jw1CmbPUzUGLAm8l9fkoFL1QEQsbRb8c5JWUDBbKHe4pZs91tU/AN2VZCM3
+iSj2fIwNlJsMBolMzH0c/wL02fATGQIFMLrsU9SjEyKCn0yAPO63FSype6iYktFg
+LoN7EnDqJmsGUMkYiF20eA4tKG+SPxk03bfR9z3s6AdfqCnxOO1KqYznX4Cpylio
+tQJA2WpqdbPOdQbZzlEf
+=hg9J
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/gpm/files/gpm.rc6-2 b/sys-libs/gpm/files/gpm.rc6-2
index a93c059d0582..1e0aaf3e1523 100644
--- a/sys-libs/gpm/files/gpm.rc6-2
+++ b/sys-libs/gpm/files/gpm.rc6-2
@@ -1,15 +1,18 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6-2,v 1.1 2012/10/26 20:45:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6-2,v 1.2 2012/10/28 11:35:56 vapier Exp $
 
 #NB: Config is in /etc/conf.d/gpm
 
 command=/usr/sbin/gpm
-command_args="-m ${MOUSEDEV} -t ${MOUSE} \
-${RESPONSIVENESS:+ -r ${RESPONSIVENESS}} \
-${REPEAT_TYPE:+ -R${REPEAT_TYPE}} \
-${APPEND:+ ${APPEND}}"
+command_args="
+	-m ${MOUSEDEV}
+	-t ${MOUSE}
+	${RESPONSIVENESS:+ -r ${RESPONSIVENESS}}
+	${REPEAT_TYPE:+ -R${REPEAT_TYPE}}
+	${APPEND}
+"
 
 pidfile=/var/run/gpm.pid
 
@@ -19,7 +22,7 @@ depend() {
 }
 
 start_pre() {
-	if [ -z "$MOUSEDEV" ] || [ -z "$MOUSE" ] ; then
+	if [ -z "${MOUSEDEV}" ] || [ -z "${MOUSE}" ] ; then
 		eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first"
 		return 1
 	fi
diff --git a/sys-libs/gpm/gpm-1.20.7.ebuild b/sys-libs/gpm/gpm-1.20.7.ebuild
new file mode 100644
index 000000000000..22df5d47095a
--- /dev/null
+++ b/sys-libs/gpm/gpm-1.20.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.7.ebuild,v 1.1 2012/10/28 11:35:56 vapier Exp $
+
+# emacs support disabled due to #99533 #335900
+
+EAPI="4"
+
+inherit eutils toolchain-funcs autotools
+
+DESCRIPTION="Console-based mouse driver"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux static-libs"
+
+RDEPEND="sys-libs/ncurses
+	selinux? ( sec-policy/selinux-gpm )"
+DEPEND="sys-libs/ncurses
+	app-arch/xz-utils
+	virtual/yacc"
+
+src_prepare() {
+	# fix ABI values
+	sed -i \
+		-e '/^abi_lev=/s:=.*:=1:' \
+		-e '/^abi_age=/s:=.*:=20:' \
+		configure.ac.footer || die
+	sed -i -e '/ACLOCAL/,$d' autogen.sh || die
+	./autogen.sh
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/gpm \
+		$(use_enable static-libs static) \
+		emacs=/bin/false
+}
+
+src_compile() {
+	# make sure nothing compiled is left
+	emake clean
+	emake EMACS=:
+}
+
+src_install() {
+	emake install DESTDIR="${D}" EMACS=: ELISP=""
+
+	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
+	gen_usr_ldscript -a gpm
+
+	insinto /etc/gpm
+	doins conf/gpm-*.conf
+
+	dodoc README TODO
+	dodoc doc/Announce doc/FAQ doc/README*
+
+	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
+	newconfd "${FILESDIR}"/gpm.conf.d gpm
+}