clean up and mark as amd64 craptastic

Package-Manager: portage-2.0.51.22-r1

2 files changed, 37 insertions, 48 deletions

diff --git a/dev-util/gambas/Manifest b/dev-util/gambas/Manifest
index 99a1cf774603..5e2c67175a55 100644
--- a/dev-util/gambas/Manifest
+++ b/dev-util/gambas/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 622720c5c5e309d4457ff037f8a4175f metadata.xml 222
 MD5 290a046cc6b8bde61608b6d58008eb9f ChangeLog 5560
+MD5 622720c5c5e309d4457ff037f8a4175f metadata.xml 222
+MD5 9e69535f56b0579bbc292b2d1e905310 gambas-1.0.5.ebuild 2133
 MD5 33d0e74f564ecce5e64b845e6c2566ed gambas-1.0.4.ebuild 2344
-MD5 8efb2acb21b4b4c43327946103a04108 gambas-1.0.5.ebuild 2345
 MD5 39016f3bbaf4069a963b10796d8f48f1 files/WebHome.html 692
-MD5 13a65dd33d4fd1d346206b80aaf3a1ff files/Makefile.am-0.97a 1528
-MD5 cb40c4d6cc8de988f3e5d60e53108472 files/Makefile.am-1.0_rc2 1508
-MD5 0b4e0cd89a1d1ed6a2250a19918528f9 files/digest-gambas-1.0.4 66
 MD5 265e986859806469c43d4ad4cebbf967 files/digest-gambas-1.0.5 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCakgl6J2i8a8J4okRAiCJAKDWZRisUMtHG97dgXyjnZnVhPZa7wCghyI0
-KS5lO6xOYxvy0s83kbuJiYw=
-=vsFS
------END PGP SIGNATURE-----
+MD5 0b4e0cd89a1d1ed6a2250a19918528f9 files/digest-gambas-1.0.4 66
+MD5 cb40c4d6cc8de988f3e5d60e53108472 files/Makefile.am-1.0_rc2 1508
+MD5 13a65dd33d4fd1d346206b80aaf3a1ff files/Makefile.am-0.97a 1528
diff --git a/dev-util/gambas/gambas-1.0.5.ebuild b/dev-util/gambas/gambas-1.0.5.ebuild
index af5a0d53b190..1975bada5fdb 100644
--- a/dev-util/gambas/gambas-1.0.5.ebuild
+++ b/dev-util/gambas/gambas-1.0.5.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-1.0.5.ebuild,v 1.2 2005/04/23 13:01:34 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-1.0.5.ebuild,v 1.3 2005/06/01 23:40:50 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="a RAD tool for BASIC"
-HOMEPAGE="http://gambas.sourceforge.net"
+HOMEPAGE="http://gambas.sourceforge.net/"
 SRC_URI="http://gambas.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="postgres mysql sdl doc curl debug sqlite xml xsl zlib kde"
+KEYWORDS="-amd64 ~x86"
+IUSE="postgres mysql sdl doc curl debug sqlite xml xsl zlib kde bzip2"
 
-DEPEND=">=sys-devel/automake-1.7.5
-	>=x11-libs/qt-3.2
+RDEPEND=">=x11-libs/qt-3.2
 	kde? ( >=kde-base/kdelibs-3.2 )
 	sdl? ( media-libs/libsdl media-libs/sdl-mixer sys-libs/gpm )
 	mysql? ( dev-db/mysql )
@@ -23,7 +22,10 @@ DEPEND=">=sys-devel/automake-1.7.5
 	sqlite? ( dev-db/sqlite )
 	xml? ( dev-libs/libxml2 )
 	xsl? ( dev-libs/libxslt )
-	zlib? ( sys-libs/zlib app-arch/bzip2 )"
+	zlib? ( sys-libs/zlib )
+	bzip2? ( app-arch/bzip2 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7.5"
 
 src_unpack() {
 	unpack ${A}
@@ -38,45 +40,42 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
-	myconf="${myconf} --enable-qt  --enable-net --enable-vb"
-	myconf="${myconf} `use_enable mysql`"
-	myconf="${myconf} `use_enable postgres`"
-	myconf="${myconf} `use_enable sqlite`"
-	myconf="${myconf} `use_enable sdl`"
-	myconf="${myconf} `use_enable curl`"
-	myconf="${myconf} `use_enable zlib`"
-	myconf="${myconf} `use_enable xml libxml`"
-	myconf="${myconf} `use_enable xsl xslt`"
-	myconf="${myconf} `use_enable zlib bzlib2`"
-	myconf="${myconf} `use_enable kde`"
-
-	if use debug ; then
-		myconf="${myconf} --disable-optimization --enable-debug --enable-profiling"
-	else
-		myconf="${myconf} --enable-optimization --disable-debug --disable-profiling"
-	fi
-
-	econf ${myconf} || die
+	econf \
+		--enable-qt \
+		--enable-net \
+		--enable-vb \
+		$(use_enable mysql) \
+		$(use_enable postgres) \
+		$(use_enable sqlite) \
+		$(use_enable sdl) \
+		$(use_enable curl) \
+		$(use_enable zlib) \
+		$(use_enable xml libxml) \
+		$(use_enable xsl xslt) \
+		$(use_enable bzip2 bzlib2) \
+		$(use_enable kde) \
+		$(use_enable !debug optimization) \
+		$(use_enable debug) \
+		$(use_enable debug profiling) \
+		|| die
 
 	emake || die
 }
 
 src_install() {
 	export PATH="${D}/usr/bin:${PATH}"
-	make DESTDIR="$D" install || die
+	make DESTDIR="${D}" install || die
 
 	dodoc README INSTALL NEWS AUTHORS ChangeLog TODO
 
 	# only install the API docs and examples with USE=doc
-	if use doc; then
-		mv ${D}/usr/share/${PN}/help ${D}/usr/share/doc/${PF}/html
-		mv ${D}/usr/share/${PN}/examples ${D}/usr/share/doc/${PF}/examples
+	if use doc ; then
+		mv "${D}"/usr/share/${PN}/help "${D}"/usr/share/doc/${PF}/html
+		mv "${D}"/usr/share/${PN}/examples "${D}"/usr/share/doc/${PF}/examples
 	else
 		dohtml ${FILESDIR}/WebHome.html
 	fi
-	rm -rf ${D}/usr/share/${PN}/help ${D}/usr/share/${PN}/examples
+	rm -r "${D}"/usr/share/${PN}/help "${D}"/usr/share/${PN}/examples
 	dosym ../doc/${PF}/html /usr/share/${PN}/help
 	dosym ../doc/${PF}/examples /usr/share/${PN}/examples
 }