Version bump #228065 by Conrad Kostecki.

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25 x86_64

4 files changed, 87 insertions, 8 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 35436638541b..963b9ec24940 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/gpm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.69 2008/06/08 21:17:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.70 2008/06/19 01:13:40 vapier Exp $
+
+*gpm-1.20.5 (19 Jun 2008)
+
+  19 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/gpm-1.20.5-abi.patch, +gpm-1.20.5.ebuild:
+  Version bump #228065 by Conrad Kostecki.
 
   08 Jun 2008; Mike Frysinger <vapier@gentoo.org> gpm-1.20.4.ebuild:
   Append _GNU_SOURCE to CPPFLAGS to fix building with glibc-2.8 #225375 by
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index d32205096cdd..f489dce89c18 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -3,22 +3,23 @@ Hash: SHA1
 
 AUX gpm-1.20.3-no-emacs-dir.patch 347 RMD160 3f5af18f717c3d0d7ae244a1acd3cfc606898b14 SHA1 71a4d47efb764ffa28d50dbc5967635f8ce95acb SHA256 3c90aaffb2a430e78f92eb7209dc14ac336b6d7fa822fa17670e4722de31149f
 AUX gpm-1.20.4-abi.patch 383 RMD160 f6e6f13b6b66f18dfda274c563212d5f34e4ba93 SHA1 106108f5436d6115a916c84ef8e48ac50899aca2 SHA256 86eb8d3abac69c7a7bf97bf61dbe9c3f5d3d062eb5b67bf1521f83d6d2fe9211
+AUX gpm-1.20.5-abi.patch 383 RMD160 782fc099dc3e10b0de022a9a89fdf77d0559f359 SHA1 c6db4819c5bfd296971cf135d7052194f41990a4 SHA256 aafaa4c1e3f216b6ad5880653dfb6fd8eb264644cbca08dad219bab7a9cefda5
 AUX gpm-configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee SHA1 56ecd1d6f2e4bd0b35ac108be72a4f6f60212c38 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b
 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.5.tar.bz2 9045 RMD160 911d3e6f2d4c37f9d1fedf436b346969331e9ce2 SHA1 9ac747abed5979953d6f812b8380063d3c198116 SHA256 9aeb116b17258ac4729c8476edef8d8efed332213df07e0a879061c152812d0c
 DIST gpm-1.20.1.tar.bz2 565014 RMD160 2650ae1e3e87fcf8bdad80acf62777e8a62b6582 SHA1 c48d937e62abb438c2f6439b34ef3332c89af8d1 SHA256 11fabe7f27a205ff1ea6aee23e1dc2bb2dc5dbfc45ff0320fca0cd559806a936
-DIST gpm-1.20.3.tar.lzma 1139678 RMD160 d3e122b0d3a328a423b3779b070406b43fa8a851 SHA1 17ae1be5e3b30691b7876873eadb4922bd477eb8 SHA256 97daa06c83e9ed26a69058214fba8bb2d2889b6fc0d1c73412ccf3e28dec5ecc
 DIST gpm-1.20.4.tar.lzma 1131907 RMD160 597ac52ce8a90bb1f011b4d12a969194c124497a SHA1 7993adcd8ad6a822f6f994a594f6d9bff6fee619 SHA256 b95819af58f5867d51d4d866418aa351c5cbe6f99e8b1f6e91ebf3a427a859ef
+DIST gpm-1.20.5.tar.lzma 1298963 RMD160 eacb47488d48b7281b70568b24ca3cfa523567df SHA1 4edff15d7fd8a5052b89e8506efefc08c7e26fd3 SHA256 1ecb09421507e9bc409a5d7052ae56a6159d706982a951ba150b2c6fde29ad06
 EBUILD gpm-1.20.1-r6.ebuild 1929 RMD160 6d57060e8cabbf24e4fcb518b828817dda29b415 SHA1 35dd2d3b705c9cef248cef1380be56897991cb9f SHA256 7447e20a91ec43d85b41dc86cc557629e6905acbf5eb68b04e5d079264870450
-EBUILD gpm-1.20.3.ebuild 1499 RMD160 ffd86bd3d03e30bfbcd684ac42c6211447a52a0e SHA1 31e5130ca6eb2585b10a7fb807d59a70aff9ba70 SHA256 f966b4f7a88ac7bbe6d7657af4be1a2b42c9fb319f1b5e5696fcf977a2d19107
 EBUILD gpm-1.20.4.ebuild 1604 RMD160 42b5f3d254ea2896f694a61973811068c6396472 SHA1 60ff2da490718a8e3ef3f656c7d88f9a1cfde0e5 SHA256 53c6e2a45b0623e6bfc269cb1d1edd24d21feba2779c3264bdfedca7f862b8b5
-MISC ChangeLog 9670 RMD160 1a13f3ee981ec8e1d3a7d0b3b3bc6ec6d81843bf SHA1 d7ea16f64a355d488486cdbbcc5bf561f1a5fe40 SHA256 3eef20d8a780b72dcc0e562185b7f994e4468b2f5728770b4ab14ccb6d7d05fa
+EBUILD gpm-1.20.5.ebuild 1514 RMD160 27c44963a182ecb243e7484704badb3b920676c8 SHA1 a1631f013a3617e633d2026d024a5c71469f058a SHA256 cd42191157e731ef1f8b00c2f37864641c2c949ca48b38a17fdaec84347b7339
+MISC ChangeLog 9842 RMD160 b062c69281c0d4a0800ca816273cde3a1f6b9d12 SHA1 8f2d17dca7e03c98b96800be4658ce327bff9d0f SHA256 a7666dd6253d55ef1ac2e292ebe73d6ea2ffaf0ee53e2d1263a385702b231567
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFITEyHj9hvisErhMIRAsvFAKCsYi3BsBaKlfzNJ52KeBEZDKijnwCghduo
-HBfmRoQER3flHaQXDDjyKfs=
-=0P7y
+iEYEARECAAYFAkhZsskACgkQ67wieSYcaxeegQCfaSwHBYAiaJ50cIlg+u9h3ITF
+3KcAnRtX4AcE98WrQMMTMMU+xY1+aqut
+=/ESE
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/gpm/files/gpm-1.20.5-abi.patch b/sys-libs/gpm/files/gpm-1.20.5-abi.patch
new file mode 100644
index 000000000000..28980151e7a3
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.5-abi.patch
@@ -0,0 +1,13 @@
+the SONAME upstream was bumped to try and sort out the 1.19.x/1.20.x mess, but
+since we've always had 1.20.x in our tree, we dont care about that breakage.
+
+http://lists.linux.it/pipermail/gpm/2008-June/001026.html
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473496
+
+--- gpm/configure
++++ gpm/configure
+@@ -1736,2 +1736,2 @@
+-abi_lev="2"
+-abi_age="1"
++abi_lev="1"
++abi_age="20"
diff --git a/sys-libs/gpm/gpm-1.20.5.ebuild b/sys-libs/gpm/gpm-1.20.5.ebuild
new file mode 100644
index 000000000000..8870c14c9046
--- /dev/null
+++ b/sys-libs/gpm/gpm-1.20.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.5.ebuild,v 1.1 2008/06/19 01:13:40 vapier Exp $
+
+# emacs support disabled due to Bug 99533
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Console-based mouse driver"
+HOMEPAGE="http://linux.schottelius.org/gpm/"
+SRC_URI="http://linux.schottelius.org/gpm/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"
+
+DEPEND="sys-libs/ncurses
+	app-arch/lzma-utils"
+RDEPEND="selinux? ( sec-policy/selinux-gpm )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.20.5-abi.patch
+}
+
+src_compile() {
+	econf \
+		--libdir=/$(get_libdir) \
+		--sysconfdir=/etc/gpm \
+		|| die "econf failed"
+
+	# workaround broken release
+	find -name '*.o' | xargs rm
+	emake clean || die
+	emake -j1 -C doc || die
+
+	emake EMACS=: || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" EMACS=: ELISP="" || die "make install failed"
+
+	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
+
+	insinto /etc/gpm
+	doins conf/gpm-*.conf
+
+	dodoc BUGS Changes README TODO
+	dodoc doc/Announce doc/FAQ doc/README*
+
+	newinitd "${FILESDIR}"/gpm.rc6 gpm
+	newconfd "${FILESDIR}"/gpm.conf.d gpm
+}