Disable assembler code as it seems to be unstable

6 files changed, 166 insertions, 5 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index 7b2a85765617..be56bdd4bf3e 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/kvirc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.8 2003/04/30 18:36:48 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.9 2003/05/22 07:52:32 pauldv Exp $
+
+*kvirc-3.0.0_beta2-r1 (22 May 2003)
+
+  22 May 2003; Paul de Vrieze <pauldv@gentoo.org> kvirc-3.0.0_beta1-r1.ebuild,
+  kvirc-3.0.0_beta2-r1.ebuild:
+  Disable the use of assembly, as it appears to be instable.
 
   30 Apr 2003; Caleb Tennis <caleb@gentoo.org> kvirc-3.0.0_beta2.ebuild :
   
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 039ff51ad2a7..94882461c81a 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,9 +1,13 @@
-MD5 9febff29e6230f09548e68f4806dbb88 kvirc-3.0.0_pre20021217.ebuild 2272
-MD5 10ada8bca697a2ea232b11896c1ebb23 kvirc-3.0.0_beta2.ebuild 2368
-MD5 f821a2b98a00986befb800cd43dc554a kvirc-3.0.0_beta1.ebuild 2159
-MD5 0671df51002e57a01850b7c30224d058 ChangeLog 2169
+MD5 d1f5da363e4ce42771c8d03b079a97c4 ChangeLog 2379
 MD5 8d327394e3a0456ed2913718f096d79a kvirc-2.1.1-r1.ebuild 1040
+MD5 f821a2b98a00986befb800cd43dc554a kvirc-3.0.0_beta1.ebuild 2159
+MD5 10ada8bca697a2ea232b11896c1ebb23 kvirc-3.0.0_beta2.ebuild 2368
+MD5 9febff29e6230f09548e68f4806dbb88 kvirc-3.0.0_pre20021217.ebuild 2272
+MD5 8fa1649d425c786f9ae1220ed3033c7c kvirc-3.0.0_beta1-r1.ebuild 2208
+MD5 8a120c4ac4f0db6b7e2c2b82950c7a3c kvirc-3.0.0_beta2-r1.ebuild 2422
 MD5 61edbd9f57dbf08ef506bd7867a0c2da files/digest-kvirc-2.1.1-r1 65
 MD5 4cea7b0d2f1dad834e7758adaebc9d73 files/digest-kvirc-3.0.0_beta1 70
 MD5 68d2153371007bdad609f225fdba63be files/digest-kvirc-3.0.0_beta2 70
 MD5 419067fcdc6443b92b211410c356035b files/digest-kvirc-3.0.0_pre20021217 68
+MD5 4cea7b0d2f1dad834e7758adaebc9d73 files/digest-kvirc-3.0.0_beta1-r1 70
+MD5 68d2153371007bdad609f225fdba63be files/digest-kvirc-3.0.0_beta2-r1 70
diff --git a/net-irc/kvirc/files/digest-kvirc-3.0.0_beta1-r1 b/net-irc/kvirc/files/digest-kvirc-3.0.0_beta1-r1
new file mode 100644
index 000000000000..b07a4606c155
--- /dev/null
+++ b/net-irc/kvirc/files/digest-kvirc-3.0.0_beta1-r1
@@ -0,0 +1 @@
+MD5 7fde2ff00014b7e7fdc32d1b4f5040ad kvirc-3.0.0-beta1.tar.gz 2565299
diff --git a/net-irc/kvirc/files/digest-kvirc-3.0.0_beta2-r1 b/net-irc/kvirc/files/digest-kvirc-3.0.0_beta2-r1
new file mode 100644
index 000000000000..f177e39f2761
--- /dev/null
+++ b/net-irc/kvirc/files/digest-kvirc-3.0.0_beta2-r1
@@ -0,0 +1 @@
+MD5 53960975a2002f9b03845f640f0d85d4 kvirc-3.0.0-beta2.tar.gz 2815485
diff --git a/net-irc/kvirc/kvirc-3.0.0_beta1-r1.ebuild b/net-irc/kvirc/kvirc-3.0.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..cc80cce07fd4
--- /dev/null
+++ b/net-irc/kvirc/kvirc-3.0.0_beta1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.0.0_beta1-r1.ebuild,v 1.1 2003/05/22 07:52:33 pauldv Exp $
+
+IUSE="kde esd ipv6"
+inherit kde-base
+
+MYP=${P//_/-}
+MYPV=${PV//_/-}
+S=${WORKDIR}/${MYP}
+DESCRIPTION="An advanced IRC Client"
+SRC_URI="ftp://ftp.kvirc.net/kvirc/${MYPV}/source/${MYP}.tar.gz"
+HOMEPAGE="http://www.kvirc.net"
+
+SLOT="3"
+LICENSE="kvirc"
+KEYWORDS="x86"
+
+use kde && need-kde 3 || need-qt 3
+
+newdepend "esd? ( media-sound/esound )"
+#	   ssl? ( dev-libs/openssl )"
+use kde || newdepend "arts? ( kde-base/arts )"
+
+[ -n "$DEBUG" ]		&& myconf="$myconf --with-debug-symbols"
+
+#The assembly seems to be less than stable
+#[ "$ARCH" == "x86" ]	&& myconf="$myconf --with-ix86-asm"
+
+use ipv6		&& myconf="$myconf --with-ipv6-support" \
+			|| myconf="$myconf --without-ipv6-support"
+# arts support without kde support isn't liked by the configure script
+# possibly it could be made to work but i didn't want to spend time on it
+use kde			&& myconf="$myconf --with-kde-support --with-arts-support" \
+			|| myconf="$myconf --without-kde-support --without-arts-support" 
+use esd			&& myconf="$myconf --with-esd-support" \
+			|| myconf="$myconf --without-esd-support" 
+# no use flag as yet, and a hard dep is rather pointless
+#use audiofile		&& myconf="$myconf --with-arts-support" \
+#			|| myconf="$myconf --without-arts-support" 
+# doesn't compile
+#use ssl			&& myconf="$myconf --with-ssl-support" \
+#			|| myconf="$myconf --without-ssl-support" 
+
+# use aa even when kde support is disabled
+myconf="$myconf --with-aa-fonts"
+
+src_compile() {
+
+    use kde && kde_src_compile myconf
+
+    # always install into /usr regardless of kde support
+    # kvirc doesn't have a kde-like installed file structure anyway
+    myconf="$myconf --prefix=/usr -v"
+    
+    # make sure we disable kde support as the configure script can auto-enable
+    # it when it isn't wanted
+    use kde || export KDEDIR=""
+    
+    kde_src_compile configure make    
+
+}
+
+src_install () {
+    
+    make install DESTDIR=${D} || die
+    make docs DESTDIR=${D} || die
+
+    dodoc ChangeLog INSTALL README TODO
+    
+}
+
+
diff --git a/net-irc/kvirc/kvirc-3.0.0_beta2-r1.ebuild b/net-irc/kvirc/kvirc-3.0.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..05828fc2cc4d
--- /dev/null
+++ b/net-irc/kvirc/kvirc-3.0.0_beta2-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.0.0_beta2-r1.ebuild,v 1.1 2003/05/22 07:52:33 pauldv Exp $
+IUSE="kde esd ipv6 ssl"
+inherit kde-base
+
+MYP=${P//_/-}
+MYPV=${PV//_/-}
+S=${WORKDIR}/${MYP}
+DESCRIPTION="An advanced IRC Client"
+SRC_URI="ftp://ftp.kvirc.net/kvirc/${MYPV}/source/${MYP}.tar.gz"
+HOMEPAGE="http://www.kvirc.net"
+
+SLOT="3"
+LICENSE="kvirc"
+KEYWORDS="~x86"
+
+use kde && need-kde 3 || need-qt 3
+
+newdepend "esd? ( media-sound/esound )
+	   ssl? ( dev-libs/openssl )
+	   oss? ( media-libs/audiofile )"
+use kde || newdepend "arts? ( kde-base/arts )"
+
+[ -n "$DEBUG" ]		&& myconf="$myconf --with-debug-symbols"
+
+#disabling as the assembly is less than stable
+#[ "$ARCH" == "x86" ]	&& myconf="$myconf --with-ix86-asm"
+
+#use ipv6		&& myconf="$myconf --with-ipv6-support" \
+use ipv6		|| myconf="$myconf --without-ipv6-support"
+# arts support without kde support isn't liked by the configure script
+# possibly it could be made to work but i didn't want to spend time on it
+# also, explicitly passing --with-kde-support seems to break configure's logic, so just
+# let it autodetect in that case
+#use kde		&& myconf="$myconf --with-kde-support --with-arts-support" \
+use kde			|| myconf="$myconf --without-kde-support --without-arts-support" 
+#use esd		&& myconf="$myconf --with-esd-support" \
+use esd			|| myconf="$myconf --without-esd-support" 
+use oss			&& myconf="$myconf --with-af--support" \
+			|| myconf="$myconf --without-af-support" 
+#use ssl		&& myconf="$myconf --with-ssl-support" \
+use ssl			|| myconf="$myconf --without-ssl-support" 
+
+# use aa even when kde support is disabled; disable local 8bit character set conversion, doesn't compile
+myconf="$myconf --with-aa-fonts"
+
+src_compile() {
+
+    use kde && kde_src_compile myconf
+
+    # always install into /usr regardless of kde support
+    # kvirc doesn't have a kde-like installed file structure anyway
+    myconf="$myconf --prefix=/usr -v"
+    
+    # make sure we disable kde support as the configure script can auto-enable
+    # it when it isn't wanted
+    use kde || export KDEDIR=""
+    
+    need-automake 1.5
+    need-autoconf 2.5
+    
+    kde_src_compile configure make    
+
+}
+
+src_install () {
+    
+    make install DESTDIR=${D} || die
+    make docs DESTDIR=${D} || die
+
+    dodoc ChangeLog INSTALL README TODO
+    
+}
+
+