Cleaned old, disabled valgrind usage #352604, fixes gcc46 problems, #363489; don't install what is not there #315717; added debug USE

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

6 files changed, 50 insertions, 100 deletions

diff --git a/app-emulation/gxemul/ChangeLog b/app-emulation/gxemul/ChangeLog
index 5ed1220f6a70..12c82720dc3a 100644
--- a/app-emulation/gxemul/ChangeLog
+++ b/app-emulation/gxemul/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/gxemul
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/gxemul/ChangeLog,v 1.15 2010/09/20 21:00:38 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/gxemul/ChangeLog,v 1.16 2011/04/22 12:32:02 jlec Exp $
+
+  22 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/0.6.0-gcc46.patch,
+  -gxemul-0.4.6.2.ebuild, -gxemul-0.4.7.ebuild, gxemul-0.6.0.ebuild:
+  Cleaned old, disabled valgrind usage #352604, fixes gcc46 problems, #363489;
+  don't install what is not there #315717; added debug USE
 
 *gxemul-0.6.0 (20 Sep 2010)
 
diff --git a/app-emulation/gxemul/Manifest b/app-emulation/gxemul/Manifest
index 919902493091..030e296fb3ba 100644
--- a/app-emulation/gxemul/Manifest
+++ b/app-emulation/gxemul/Manifest
@@ -1,8 +1,15 @@
-DIST gxemul-0.4.6.2.tar.gz 2186472 RMD160 f109062c7830b8d308fab9e4dfb4835f38a8adb1 SHA1 e969b476f3ea3b108027b3b4db81a4a6e8d6d4bd SHA256 21c33f6c9da762459ca3e5050d1334c31b07bd66e30f6ea6732c1b5ca8b41179
-DIST gxemul-0.4.7.tar.gz 3375191 RMD160 d55d23473a5edba3939b381d7290febdb858b098 SHA1 4d9dcb465f71cf3650726162529c8b8701b1a49f SHA256 f3a136702319dcaf516b32a258216a8986129f5fb35cf74b386ab88030322623
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.6.0-gcc46.patch 418 RMD160 34a110d773ccdd74273e33986fbba19a249a504b SHA1 9f3944148f1a5111c4aa16e658c2c97475ec11ce SHA256 3339926fbb716535902ea802310a372315e0c34ea85ae1f4d858fc6b491d92e9
 DIST gxemul-0.6.0.tar.gz 3598795 RMD160 ac6291a5f8bc9c0d1988d3ce39750339fe90a8ce SHA1 aa37ad5f200eee045b1da2b1d3f651401cf474af SHA256 d3f85c7964b44b085e088862d88b1f31d907fb99c5321900c0b3a723c82581e8
-EBUILD gxemul-0.4.6.2.ebuild 987 RMD160 46e1cad74e45acf45246042176d284170985cb07 SHA1 604beb1fac9c7a96beab896b7d2483cea6fead27 SHA256 2ef5006fcc13c06632f7d505a6a20ce0e57969e4059db7bc361f599f12a5d872
-EBUILD gxemul-0.4.7.ebuild 983 RMD160 2ea2c0d814a84350aea3b1ff4c51c8e264e7ee7a SHA1 33e49c38efbb388e1423ce10b2032e12de6478b0 SHA256 cb7562642e22627670ac18d43d0761877f21d8f027b3f412092295feec571d32
-EBUILD gxemul-0.6.0.ebuild 932 RMD160 87ac6c3cda3fe55c1599e2ba1499c9e8bb18b6b5 SHA1 0bfb2077516ce9ce855e2f8cd28a6249df899d46 SHA256 6c0b2c6a6f76949d6cc66803a5a58daad1b5a15ceb965f293f172fbd67242d7e
-MISC ChangeLog 2501 RMD160 00d9ffaffda24a7c9bf74f92b0ce63f81ecb0682 SHA1 3d6345ee6a9ee314ce6c1eb0fa834492735e3fd2 SHA256 0f7db4c0fc351b173bd8660dd285184f3b7ac64b6554a9e44fdab6fab620f754
+EBUILD gxemul-0.6.0.ebuild 1019 RMD160 c016ef88c797de6b1afe98768dfc3c0ff57a6a2f SHA1 f114a2cb4774e571afe26bf9d267cd0c40315f42 SHA256 3bfdcde8676505f416a188ca504e02a9d7a9cc6f9b5771eea2dc9f7646f999b0
+MISC ChangeLog 2783 RMD160 ae5b979405c8e0187a3fcd91a48d867b6c78dd5f SHA1 a46b0050dd19caae95ec6e75e25dd935a3dbd780 SHA256 0b3827ea996a45fed56b1b8001820ed627d1aa8f6525133504edd37c085cbed0
 MISC metadata.xml 406 RMD160 77847e9aca7f1f618b126815f555605d66e28d0d SHA1 9fb7884161a53423459c2de50c50e063effb3554 SHA256 d1407d851982866365e17a7f32a042240c847b3ed62f58ebee7b206483a2b457
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2xdU4ACgkQgAnW8HDreRYlbwCggb215Qq//eLEUtP/xPY8JH9W
+tgEAn1vEPHpgvWvndH9xLpVDf1Z+kNb1
+=bcwQ
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/gxemul/files/0.6.0-gcc46.patch b/app-emulation/gxemul/files/0.6.0-gcc46.patch
new file mode 100644
index 000000000000..eb0ce26b6e1c
--- /dev/null
+++ b/app-emulation/gxemul/files/0.6.0-gcc46.patch
@@ -0,0 +1,16 @@
+ src/include/refcount_ptr.h |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/include/refcount_ptr.h b/src/include/refcount_ptr.h
+index 4645769..ebabd58 100644
+--- a/src/include/refcount_ptr.h
++++ b/src/include/refcount_ptr.h
+@@ -1,6 +1,8 @@
+ #ifndef	REFCOUNT_PTR_H
+ #define	REFCOUNT_PTR_H
+ 
++#include <stddef.h>
++
+ /*
+  *  Copyright (C) 2007-2010  Anders Gavare.  All rights reserved.
+  *
diff --git a/app-emulation/gxemul/gxemul-0.4.6.2.ebuild b/app-emulation/gxemul/gxemul-0.4.6.2.ebuild
deleted file mode 100644
index 43c5b2b32221..000000000000
--- a/app-emulation/gxemul/gxemul-0.4.6.2.ebuild
+++ /dev/null
@@ -1,40 +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/gxemul/gxemul-0.4.6.2.ebuild,v 1.2 2008/02/21 18:06:08 mr_bones_ Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A Machine Emulator, Mainly emulates MIPS, but supports other CPU types."
-HOMEPAGE="http://gavare.se/gxemul/"
-SRC_URI="http://gavare.se/gxemul/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXdmcp )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )"
-
-src_compile() {
-	tc-export CC
-	local myconf=""
-
-	use X || myconf="${myconf} --disable-x"
-
-	einfo "Configuring with: ${myconf}"
-	./configure ${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin gxemul || die "gxemul not found in ${S}"
-	doman man/gxemul.1
-	dodoc HISTORY LICENSE README RELEASE TODO
-	dohtml doc/*
-}
diff --git a/app-emulation/gxemul/gxemul-0.4.7.ebuild b/app-emulation/gxemul/gxemul-0.4.7.ebuild
deleted file mode 100644
index 08d2771542dc..000000000000
--- a/app-emulation/gxemul/gxemul-0.4.7.ebuild
+++ /dev/null
@@ -1,40 +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/gxemul/gxemul-0.4.7.ebuild,v 1.1 2009/01/04 12:07:15 armin76 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A Machine Emulator, Mainly emulates MIPS, but supports other CPU types."
-HOMEPAGE="http://gavare.se/gxemul/"
-SRC_URI="http://gavare.se/gxemul/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXdmcp )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )"
-
-src_compile() {
-	tc-export CC
-	local myconf=""
-
-	use X || myconf="${myconf} --disable-x"
-
-	einfo "Configuring with: ${myconf}"
-	./configure ${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin gxemul || die "gxemul not found in ${S}"
-	doman man/gxemul.1
-	dodoc HISTORY LICENSE README RELEASE TODO
-	dohtml doc/*
-}
diff --git a/app-emulation/gxemul/gxemul-0.6.0.ebuild b/app-emulation/gxemul/gxemul-0.6.0.ebuild
index c8600835bdcb..f2c366e479db 100644
--- a/app-emulation/gxemul/gxemul-0.6.0.ebuild
+++ b/app-emulation/gxemul/gxemul-0.6.0.ebuild
@@ -1,39 +1,41 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/gxemul/gxemul-0.6.0.ebuild,v 1.1 2010/09/20 21:00:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/gxemul/gxemul-0.6.0.ebuild,v 1.2 2011/04/22 12:32:02 jlec Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A Machine Emulator, Mainly emulates MIPS, but supports other CPU types."
+DESCRIPTION="A Machine Emulator, Mainly emulates MIPS, but supports other CPU types"
 HOMEPAGE="http://gxemul.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/gxemul/GXemul/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X"
+IUSE="debug X"
 
 RDEPEND="X? ( x11-libs/libX11 )"
-
 DEPEND="${RDEPEND}
 	X? ( x11-proto/xproto )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gcc46.patch
 	sed -i configure -e 's|-O3||g' || die "sed configure"
+	tc-export CC CXX
 }
 
 src_configure() {
-	tc-export CC CXX
-
 	# no autotools
-	./configure $(use X || echo --disable-x) || die "configure failed"
+	./configure \
+		--disable-valgrind \
+		$(use debug && echo --debug) \
+		$(use X || echo --disable-x) || die "configure failed"
 }
 
 src_install() {
-	dobin gxemul || die
+	dobin gxemul
 	doman man/gxemul.1
-	dodoc HISTORY README RELEASE TODO
-	dohtml doc/*
+	dodoc HISTORY README
+	dohtml -r doc/*
 }