remove 64-bit eclass stuff

(Portage version: 2.0.51.21)

7 files changed, 25 insertions, 32 deletions

diff --git a/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild b/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild
index 0925221402b5..84daee0bad25 100644
--- a/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild
+++ b/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild,v 1.5 2005/03/24 02:10:10 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/kasablanca-0.4.0.1.ebuild,v 1.6 2005/05/05 02:42:41 vapier Exp $
 
-inherit kde 64-bit eutils
+inherit kde eutils
 
 DESCRIPTION="a graphical ftp client for kde. among its features are support for ssl/tls encryption (both commands and data using auth tls, not sftp), fxp (direct ftp to ftp transfer) bookmarks, and queues."
 HOMEPAGE="http://kasablanca.berlios.de/"
@@ -49,9 +49,7 @@ need-kde 3.1
 
 src_unpack() {
 	unpack ${A}
-	if 64-bit ; then
-		epatch ${FILESDIR}/${P}-64bit.patch
-	fi
+	epatch ${FILESDIR}/${P}-64bit.patch
 }
 
 src_install() {
diff --git a/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild b/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild
index 63d1b92e714a..80540239257a 100644
--- a/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild
+++ b/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild,v 1.2 2005/03/11 17:02:46 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild,v 1.3 2005/05/05 02:42:41 vapier Exp $
 
 inherit kde eutils
 
-DESCRIPTION="A graphical ftp client for KDE. It supports ssl/tls encryption, fxp, bookmarks, and queues."
+DESCRIPTION="A graphical ftp client for KDE. It supports ssl/tls encryption, fxp, bookmarks, and queues"
 HOMEPAGE="http://kasablanca.berlios.de/"
 SRC_URI="http://download.berlios.de/kasablanca/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 need-kde 3.1
 
 src_unpack() {
 	kde_src_unpack
-
 	# Fix for 64-bit archs. Patch applied upstream.
-	epatch ${FILESDIR}/${P}-64bit.patch
+	epatch "${FILESDIR}"/${P}-64bit.patch
 }
diff --git a/net-misc/vpnc/vpnc-0.3.2.ebuild b/net-misc/vpnc/vpnc-0.3.2.ebuild
index 558c5f8b64dd..0c9796a3bf65 100644
--- a/net-misc/vpnc/vpnc-0.3.2.ebuild
+++ b/net-misc/vpnc/vpnc-0.3.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.3.2.ebuild,v 1.3 2005/02/11 02:25:02 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.3.2.ebuild,v 1.4 2005/05/05 02:43:30 vapier Exp $
 
-inherit eutils 64-bit
+inherit eutils
 
 DESCRIPTION="Free client for Cisco VPN routing software"
 HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.unix-ag.uni-kl.de/~massar/vpnc/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/libgcrypt-1.1.91
@@ -19,13 +19,9 @@ DEPEND=">=dev-libs/libgcrypt-1.1.91
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	64-bit && epatch ${FILESDIR}/${P}-64-bit.patch
-}
-
-src_compile() {
+	epatch ${FILESDIR}/${P}-64-bit.patch
 	# Workaround for crappy Makefile
 	sed -i -e "s:CFLAGS=-W -Wall -O:CFLAGS=${CFLAGS}:" Makefile
-	emake || die
 }
 
 src_install() {
diff --git a/sci-libs/blas-reference/blas-reference-19940131-r1.ebuild b/sci-libs/blas-reference/blas-reference-19940131-r1.ebuild
index 4550f2ae19ca..56e2b703a4fe 100644
--- a/sci-libs/blas-reference/blas-reference-19940131-r1.ebuild
+++ b/sci-libs/blas-reference/blas-reference-19940131-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-19940131-r1.ebuild,v 1.3 2005/02/02 13:43:29 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-19940131-r1.ebuild,v 1.4 2005/05/05 02:44:35 vapier Exp $
 
-inherit eutils 64-bit fortran
+inherit eutils fortran
 
 Name="blas"
 DESCRIPTION="FORTRAN reference implementation of the BLAS (linear algebra lib)"
@@ -25,7 +25,8 @@ PROVIDE="virtual/blas"
 
 S=${WORKDIR}
 
-64-bit && FORTRAN="g77 ifc" || FORTRAN="g77 f2c ifc" # No f2c on 64-bit systems yet :-/
+#TODO: detect 64bit size from compiler, not eclass
+FORTRAN="g77 ifc" || FORTRAN="g77 f2c ifc" # No f2c on 64-bit systems yet :-/
 
 ifc_info() {
 	if [ -z "${IFCFLAGS}" ]
diff --git a/x11-libs/libast/files/libast-64bit.patch b/x11-libs/libast/files/libast-64bit.patch
index 7aa200279245..15ef6ee1d004 100644
--- a/x11-libs/libast/files/libast-64bit.patch
+++ b/x11-libs/libast/files/libast-64bit.patch
@@ -1,6 +1,5 @@
-diff -Nru libast-0.5.old/include/libast.h libast-0.5/include/libast.h
---- libast-0.5.old/include/libast.h	2004-07-08 13:39:36.837764880 -0400
-+++ libast-0.5/include/libast.h	2004-07-08 13:40:21.287007568 -0400
+--- libast-0.5/include/libast.h
++++ libast-0.5/include/libast.h
 @@ -337,6 +337,7 @@
          /* fill l with c. */ \
          l = (c) | (c)<<8; \
diff --git a/x11-libs/libast/libast-0.5-r2.ebuild b/x11-libs/libast/libast-0.5-r2.ebuild
index 25bdd9c46d5c..e5b84aff6323 100644
--- a/x11-libs/libast/libast-0.5-r2.ebuild
+++ b/x11-libs/libast/libast-0.5-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-0.5-r2.ebuild,v 1.10 2005/03/06 11:01:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libast/libast-0.5-r2.ebuild,v 1.11 2005/05/05 02:46:23 vapier Exp $
 
-inherit 64-bit eutils
+inherit eutils
 
 DESCRIPTION="LIBrary of Assorted Spiffy Things"
 HOMEPAGE="http://www.eterm.org/download/"
@@ -21,7 +21,7 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	64-bit && epatch ${FILESDIR}/libast-64bit.patch
+	epatch ${FILESDIR}/libast-64bit.patch
 }
 
 src_compile() {
diff --git a/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild b/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild
index fb3dff9f9feb..9c50700611bb 100644
--- a/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild
+++ b/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild,v 1.8 2005/04/06 14:19:42 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild,v 1.9 2005/05/05 02:47:10 vapier Exp $
 
-inherit eutils 64-bit
+inherit eutils
 
 MY_P="${P%_pre*}"	# 0.5.0_pre040506 -> 0.5.0
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.waimea.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="truetype xinerama svg"
 
 DEPEND="virtual/x11
@@ -26,7 +26,7 @@ PROVIDE="virtual/blackbox"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	64-bit && epatch ${FILESDIR}/${MY_P}-64bit-clean.patch
+	epatch ${FILESDIR}/${MY_P}-64bit-clean.patch
 	epatch ${FILESDIR}/${MY_P}-font.patch
 	if has_version '>=x11-libs/cairo-0.3' ; then
 		epatch ${FILESDIR}/${MY_P}-includes.patch