Proxy commit from Kevin McCarthy: version bump to 0.6.3: cleanup with EAPI=3, fix dependencies, don't install the ROM dumps as their license is unclear, fix buffer overflow, add readline USE flag and fix build with it disabled. Update metadata.

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

8 files changed, 138 insertions, 123 deletions

diff --git a/app-emulation/x48/ChangeLog b/app-emulation/x48/ChangeLog
index 29ae5ebae206..e440cb9c5408 100644
--- a/app-emulation/x48/ChangeLog
+++ b/app-emulation/x48/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/x48
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/x48/ChangeLog,v 1.17 2009/09/22 17:56:44 vostorga Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/x48/ChangeLog,v 1.18 2011/01/30 19:47:27 flameeyes Exp $
+
+*x48-0.6.3 (30 Jan 2011)
+
+  30 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> -x48-0.4.3.ebuild,
+  -x48-0.6.1.ebuild, +x48-0.6.3.ebuild, +files/x48-0.6.3-no-readline.patch,
+  +files/x48-0.6.3-off-by-one.patch, metadata.xml:
+  Proxy commit from Kevin McCarthy: version bump to 0.6.3: cleanup with EAPI=3,
+  fix dependencies, don't install the ROM dumps as their license is unclear,
+  fix buffer overflow, add readline USE flag and fix build with it disabled.
+  Update metadata.
 
 *x48-0.6.1 (22 Sep 2009)
 
diff --git a/app-emulation/x48/Manifest b/app-emulation/x48/Manifest
index 583b57cfaae1..b6a42e8de697 100644
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX x48-0.6.3-no-readline.patch 480 RMD160 599f2b67be88b8ccdb5975e9e88b00d5d5f69698 SHA1 de549d3063b16e1d7c902dfdabfa3fd039bd124d SHA256 d3369e44a0c6c646c3243ca698f33d777fa10ed7b4b61239f5ecae48b9e8e773
+AUX x48-0.6.3-off-by-one.patch 770 RMD160 87798e6747989b5bafe488fed62d70cfaafdef97 SHA1 0782f2c628d4956f7f4e7a99962cd70fac8e855c SHA256 345661ef9bb83aaae60b86098b29cd93b2cc337b93c749d8b96d887e8fb1ab07
 DIST gxrom-r.zip 330144 RMD160 aa2d45393939464746ba8236b6a282c9f85b1546 SHA1 66c31cf5db985eabcf557cf83a99f4f5bb491a51 SHA256 42bd270bc17548c2f89ffa87b416ef22576303d1e39397d38219a4ba36d6ab7e
 DIST sxrom-j.zip 190826 RMD160 f87e4a9ca242fa840ae7dccf637823eba3ce8a20 SHA1 1bec0affbb6ecc1981325030a2939021aa771290 SHA256 e94b48b4dac571ad1b074e57f5632b42c115d8819225cbfe40d3760e0c8e1bae
 DIST x48-0.4.3.tar.gz 128263 RMD160 5bc31db7c2b390561701429f42ab38cc41923986 SHA1 8e6d5cbd66a59c4fd78165e267bd6df49f1f5191 SHA256 5efb6bfdae8b980ec497d7569c19edd01c579640ebb30eb27f727b182a1fb809
-DIST x48-0.6.1.tar.gz 243712 RMD160 2ad0f9977a5a042a14bc2908eef693bbaa1a3933 SHA1 e4f0372620c4ba7d0e8e3f2c7ab62c54127ad1db SHA256 d8353b800106a7adddeef9456c82b58f5322b1c08f692f4623b5c3530d4d2ac6
+DIST x48-0.6.3.tar.gz 319892 RMD160 e5f80f8c49cda0e9d63da63fbe641fcbc11d121a SHA1 cf7771682ce8894502d23a3b7c679f5dabb9e6b6 SHA256 c765bfa3b059e31ed9034a7c7f1bee102a228fd164dfc555c8d2e6ae342c7638
 EBUILD x48-0.4.3-r1.ebuild 1823 RMD160 e4a7fb28f94bc693bc3fd5e1fefbbba8a45cd738 SHA1 ea8b3f92c9f32147808cd4ce87ffa1cc8cef362f SHA256 c4547b0faf2c6882f1e55ca72ff70c55cd4ec92ce3deb01e4942ef6187d8e68e
-EBUILD x48-0.4.3.ebuild 1170 RMD160 47ec6b9592a4bf8ee5e1d48dbc92b03bb58fbad7 SHA1 ad2d8d47c6871638938ecb125518b557dd73e2d5 SHA256 1a73f7f22806cb4fde439c39587dac471d82d8e9d96cb23a92da488711e423e7
-EBUILD x48-0.6.1.ebuild 1811 RMD160 fd2f541e2a1ede992ddc9160638ee8fc7a9b4093 SHA1 7ac18b630f662d2170a4fbafa057747188dd4bf6 SHA256 4a04e64a22e3474461041a07198c527b546f02e68b60c69db2a21b19170b9e98
-MISC ChangeLog 2264 RMD160 1f3936a11d929feb17c510f669d468f4bd163854 SHA1 fb5c3d6effeee3b5619700415ef6f1686a5cdf67 SHA256 26671a3cb72b355413201dcf9e0eb80786ca6f000097838b18d1e7cf20187ed6
-MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+EBUILD x48-0.6.3.ebuild 1687 RMD160 774e3470b63d42018850c3885eda72b801c65ddb SHA1 648b3dd417ed92421e584f5ebd3f456bceec9bd1 SHA256 845cd01c7a1502403361ca030bb5d9a5dac1372fbb772a1746e4eb1402388323
+MISC ChangeLog 2747 RMD160 a357c0fc794924c55420ae22f9128abbabad2608 SHA1 1b7a529a061333b6941ef6c94013b83f7d2c98d3 SHA256 5e6a925ac283627b34dc45bc05ac761eee58ea100d26b73d928220b90d916279
+MISC metadata.xml 508 RMD160 7b29ba8f2e78a31a5b86aa38ea06e1a30c379a5c SHA1 e61f91fd6963968d9761214ffc8993c340cd4ef4 SHA256 cb3f5e98c49347bf9203dfa3ede50f5dd4963d3a87d2db57655f4a21d91d56c3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1FwE4ACgkQAiZjviIA2XgXDgCfXtNaWY5gwbRKvbUvAmT77DMk
+yccAn0aFMdqw+wHr7H6rO5gv/zyMO9Jl
+=CNyc
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/x48/files/x48-0.6.3-no-readline.patch b/app-emulation/x48/files/x48-0.6.3-no-readline.patch
new file mode 100644
index 000000000000..90c7d7854b39
--- /dev/null
+++ b/app-emulation/x48/files/x48-0.6.3-no-readline.patch
@@ -0,0 +1,11 @@
+--- x48-0.6.3.orig/configure.ac	2011-01-30 12:35:56.960715403 -0500
++++ x48-0.6.3/configure.ac	2011-01-30 12:35:41.746142323 -0500
+@@ -82,7 +82,7 @@
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([fcntl.h memory.h stdlib.h string.h sys/ioctl.h sys/time.h termios.h unistd.h])
++AC_CHECK_HEADERS([fcntl.h memory.h stdlib.h string.h sys/ioctl.h sys/time.h termios.h unistd.h stdint.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
diff --git a/app-emulation/x48/files/x48-0.6.3-off-by-one.patch b/app-emulation/x48/files/x48-0.6.3-off-by-one.patch
new file mode 100644
index 000000000000..b71f23abe663
--- /dev/null
+++ b/app-emulation/x48/files/x48-0.6.3-off-by-one.patch
@@ -0,0 +1,25 @@
+--- x48-0.6.3.orig/src/debugger.c	2011-01-29 12:58:24.432244663 -0500
++++ x48-0.6.3/src/debugger.c	2011-01-29 13:06:46.750769284 -0500
+@@ -1919,10 +1919,7 @@
+ 	      free (cl);
+               cl = (char *) 0;
+             }
+-	  if (old_line)
+-	    cl = strcpy ((char *) malloc (strlen (old_line)), old_line);
+-	  else
+-	    cl = strcpy ((char *) malloc (strlen ("(null)")), "(null)");
++	  cl = strdup (old_line == NULL ? "(null)" : old_line);
+ 	}
+       else
+ 	{
+@@ -1936,8 +1933,8 @@
+ 	      free (old_line);
+               old_line = (char *) 0;
+ 	    }
+-	  cl = strcpy ((char *) malloc (strlen (rl)), rl);
+-	  old_line = strcpy ((char *) malloc (strlen (rl)), rl);
++	  cl = strdup (rl);
++	  old_line = strdup (rl);
+ #ifdef HAVE_READLINE
+ 	  add_history (rl);
+ #endif
diff --git a/app-emulation/x48/metadata.xml b/app-emulation/x48/metadata.xml
index 9f3fdee2246b..76210502a74e 100644
--- a/app-emulation/x48/metadata.xml
+++ b/app-emulation/x48/metadata.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+  <herd>no-herd</herd>
+
+  <maintainer>
+    <email>signals42@gmail.com</email>
+    <name>Kevin McCarthy</name>
+    <description>Proxied maintainer, assign bugs to him</description>
+  </maintainer>
+
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+    <name>Diego Elio Pettenò</name>
+    <description>Proxy maintainer, CC him on bugs</description>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/x48/x48-0.4.3.ebuild b/app-emulation/x48/x48-0.4.3.ebuild
deleted file mode 100644
index f2224c6d6be2..000000000000
--- a/app-emulation/x48/x48-0.4.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/x48/x48-0.4.3.ebuild,v 1.6 2008/10/13 18:51:39 bangert Exp $
-
-inherit eutils
-
-DESCRIPTION="HP48 Calculator Emulator"
-HOMEPAGE="http://x48.berlios.de/"
-SRC_URI="mirror://berlios/x48/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="x11-proto/xextproto
-	app-text/rman"
-DEPEND="${RDEPEND}
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-misc/imake
-	app-text/rman
-	sys-libs/readline
-	sys-libs/ncurses
-	sys-libs/gpm"
-
-src_compile() {
-	xmkmf || die
-	emake CCOPTIONS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin src/checkrom src/dump2rom src/mkcard src/x48
-
-	newman src/x48.man x48.1
-
-	dodir /usr/lib/X11/app-defaults
-	insinto /usr/lib/X11/app-defaults/
-	newins src/X48.ad X48
-
-	dodoc doc/CARDS.doc doc/ROMDump.doc
-	dodoc romdump/ROMDump romdump/ROMDump.s
-}
-
-pkg_postinst() {
-	elog "The X48 emulator requires an HP48 ROM Image to run."
-	elog
-	elog "You can use the ROMDump utility and documentation included with this"
-	elog "package to obtain this from your HP48 calculator."
-}
diff --git a/app-emulation/x48/x48-0.6.1.ebuild b/app-emulation/x48/x48-0.6.1.ebuild
deleted file mode 100644
index 26a3ad2ebe62..000000000000
--- a/app-emulation/x48/x48-0.6.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/x48/x48-0.6.1.ebuild,v 1.1 2009/09/22 17:56:44 vostorga Exp $
-
-inherit eutils
-
-DESCRIPTION="HP48 Calculator Emulator"
-HOMEPAGE="http://x48.berlios.de/"
-SRC_URI="mirror://berlios/x48/${P}.tar.gz
-	http://www.hpcalc.org/hp48/pc/emulators/sxrom-j.zip
-	http://www.hpcalc.org/hp48/pc/emulators/gxrom-r.zip"
-LICENSE="|| ( ( GPL-2 free-noncomm ) GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	app-text/rman
-	sys-libs/readline
-	sys-libs/ncurses
-	app-arch/unzip
-	sys-libs/gpm"
-
-src_compile() {
-	econf
-	emake CCOPTIONS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin src/checkrom src/dump2rom src/mkcard src/x48 || die "dobin failed"
-
-	newman src/x48.man x48.1 || die "newman failed"
-
-	dodir /usr/lib/X11/app-defaults || die "dodir failed"
-	insinto /usr/lib/X11/app-defaults/
-
-	dodir /usr/share/hp48 || die "dodir failed"
-	insinto /usr/share/hp48
-	doins "${WORKDIR}"/gxrom-r "${WORKDIR}"/sxrom-j || die "doins failed"
-
-}
-
-pkg_postinst() {
-	elog "The X48 emulator requires an HP48 ROM Image to run."
-	elog
-	elog "If you own an HP-48 calculator, you can use the ROMDump utility"
-	elog "included with this package to obtain this from your calculator."
-	elog
-	elog "Alternatively, HP has provided two ROM images for non-commercial"
-	elog "use only."
-	elog
-	elog "For an HP-48SX type: x48 -rom /usr/share/hp48/sxrom-j"
-	elog "For an HP-48GX type: x48 -rom /usr/share/hp48/gxrom-r"
-	elog
-	elog "(If you're not sure which one you want, go with HP-48GX)"
-	elog
-	elog "Note: you only need to use the '-rom' argument once"
-}
diff --git a/app-emulation/x48/x48-0.6.3.ebuild b/app-emulation/x48/x48-0.6.3.ebuild
new file mode 100644
index 000000000000..ea2ac65de6c9
--- /dev/null
+++ b/app-emulation/x48/x48-0.6.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/x48/x48-0.6.3.ebuild,v 1.1 2011/01/30 19:47:27 flameeyes Exp $
+
+EAPI=3
+
+inherit eutils autotools
+
+DESCRIPTION="HP48 Calculator Emulator"
+HOMEPAGE="http://x48.berlios.de/"
+SRC_URI="mirror://berlios/x48/${P}.tar.gz"
+LICENSE="GPL-3"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="readline"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	readline? ( sys-libs/readline )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-libs/libXt"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-off-by-one.patch"
+	epatch "${FILESDIR}/${P}-no-readline.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable readline)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed."
+	dodoc AUTHORS README ChangeLog
+}
+
+pkg_postinst() {
+	elog "The X48 emulator requires an HP48 ROM image to run."
+	elog
+	elog "If you own an HP-48 calculator, you can use the ROMDump utility"
+	elog "included with this package to obtain this from your calculator."
+	elog
+	elog "Alternatively, HP has provided the ROM images for non-commercial"
+	elog "use only."
+	elog
+	elog "Due to confusion over the legal status of these ROMs you must"
+	elog "manually download one from http://www.hpcalc.org/hp48/pc/emulators/"
+	elog
+	elog "If you do not know which one to use, try 'HP 48GX Revision R ROM.'"
+	elog
+	elog "Once you have a ROM, you will need to install it by running:"
+	elog
+	elog "x48 -rom gxrom-r"
+	elog
+	elog "You will only have to do this the first time you run X48. The"
+	elog "ROM will be stored in ~/.hp48/rom for future runs."
+}