Make sure we keep same SONAME as 1.20.1.

Package-Manager: portage-2.2_pre5.spank.spunk

4 files changed, 27 insertions, 9 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 5906ae0474bd..b38ec74a1e03 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.67 2008/05/31 04:25:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.68 2008/06/02 17:06:17 vapier Exp $
+
+  02 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/gpm-1.20.4-abi.patch, gpm-1.20.4.ebuild:
+  Make sure we keep same SONAME as 1.20.1.
 
 *gpm-1.20.4 (31 May 2008)
 
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 58474eb83529..226880740bdd 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -2,6 +2,7 @@
 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-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
@@ -11,13 +12,13 @@ DIST gpm-1.20.3.tar.lzma 1139678 RMD160 d3e122b0d3a328a423b3779b070406b43fa8a851
 DIST gpm-1.20.4.tar.lzma 1131907 RMD160 597ac52ce8a90bb1f011b4d12a969194c124497a SHA1 7993adcd8ad6a822f6f994a594f6d9bff6fee619 SHA256 b95819af58f5867d51d4d866418aa351c5cbe6f99e8b1f6e91ebf3a427a859ef
 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 1543 RMD160 10c0737ea3bcaa448392fd46cb31ae98fd02d8b4 SHA1 c0c3e403e281edf2fcbb7d6ee32c62183e933378 SHA256 c7e817a17e605c88d840ee847013c0d6a0f57176fa005573e5ba1f7d56eaf8e5
-MISC ChangeLog 9367 RMD160 00992cb473e89c76a5bf8ec199c498d210321101 SHA1 a18ce949c8312487972eb009192ed0595a8e8420 SHA256 be255f44e438f4e3a5845d14cb1c886dea0f413ced7bf6520b82f2ec2d24f82c
+EBUILD gpm-1.20.4.ebuild 1555 RMD160 a0bf970d491dfb00bbbb3c53cdf8d0965b20428d SHA1 1f21dcebccefa4d25c25be3d9b75f98fdda474e6 SHA256 759efb8f318dbdaa7a22d5cc4a6424138c0f1a77b05eb8482c0c4af116bb5c6d
+MISC ChangeLog 9511 RMD160 75e4177e454ae2d301354c022053a03dc85f9072 SHA1 61625f4569f3def9d12f0097e6a142a7ebe5f085 SHA256 0c525dd94e12b7713a5b4a1b2de2c494a02c5c77018e91582ed768072eff6827
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIQNMyj9hvisErhMIRAnQ+AKDgR7atnrPfEDG3PIkF+LoCE8OcyQCg5sEP
-GFWnXbFQy8p0ZutBqHVF/v0=
-=mIfd
+iD8DBQFIRCiPj9hvisErhMIRAjmXAKDQtfP55CUKBiTsqdelCauEPf1f3QCgqv/i
+fiIvRv6HJOwu6sKZS4OuJgQ=
+=SDpR
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/gpm/files/gpm-1.20.4-abi.patch b/sys-libs/gpm/files/gpm-1.20.4-abi.patch
new file mode 100644
index 000000000000..f6dd76e2cb18
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.4-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="0"
++abi_lev="1"
++abi_age="20"
diff --git a/sys-libs/gpm/gpm-1.20.4.ebuild b/sys-libs/gpm/gpm-1.20.4.ebuild
index 26de7b1e41de..f1854181bf22 100644
--- a/sys-libs/gpm/gpm-1.20.4.ebuild
+++ b/sys-libs/gpm/gpm-1.20.4.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/sys-libs/gpm/gpm-1.20.4.ebuild,v 1.1 2008/05/31 04:25:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.4.ebuild,v 1.2 2008/06/02 17:06:17 vapier Exp $
 
 # emacs support disabled due to Bug 99533
 
@@ -12,8 +12,7 @@ SRC_URI="http://linux.schottelius.org/gpm/archives/${P}.tar.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
-# need to sort out SONAME first
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="selinux"
 
 DEPEND="sys-libs/ncurses
@@ -24,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.20.3-no-emacs-dir.patch
+	epatch "${FILESDIR}"/${PN}-1.20.4-abi.patch
 }
 
 src_compile() {