disable debug by default

9 files changed, 22 insertions, 219 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 465ce9e82ea8..ddaa0ad62a15 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.72 2004/04/20 15:40:17 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.73 2004/04/20 19:54:51 foser Exp $
+
+  20 Apr 2004; foser <foser@gentoo.org> abiword-2* :
+  Disable debugging to be on the safe side, it's a bit too intrusive
 
   20 Apr 2004; Guy Martin <gmsoft@gentoo.org> abiword-2.0.5.ebuild:
   Marked stable on hppa.
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 6e36d0e26ddb..8c83f34e2a23 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,17 +1,13 @@
-MD5 4a2487178305a2cd47a8a62bf0eb8373 ChangeLog 10897
-MD5 f8482a5b912f190e0e31ced3bbb23acc abiword-1.0.6-r1.ebuild 1923
+MD5 22222b2a248acf7b56cee918559af3db abiword-2.0.5.ebuild 2533
+MD5 b0c016c12468243998e794cd4fb22b2e abiword-2.0.2.ebuild 2253
+MD5 079f827b920127d3044a0e4037be7342 abiword-2.0.6.ebuild 2388
 MD5 f8ed2f89b5cd1abf83ecd4a6f5344821 abiword-2.0.1.ebuild 2179
-MD5 abfb2e2e507d908d06169c5a8d4378d5 abiword-2.0.2.ebuild 2266
-MD5 232c5a4ec65a706f4b1436df697891df abiword-2.0.3-r1.ebuild 2541
-MD5 ead077c87f8cd92b1641f95af63970d1 abiword-2.0.5.ebuild 2543
+MD5 e180515ab31242ba1709e9c5a789d731 ChangeLog 11019
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 b99ab3a290df8b82a73a5bac782ea3d6 abiword-2.0.6.ebuild 2391
-MD5 31616e14907aefda2489036cc3d1db3d files/AbiWord.desktop 901
-MD5 1ebcd22c6249c06e631c13491113d8ef files/AbiWord2.desktop 166
-MD5 55d85bca7cd645ef338336da3d6e6a7e files/digest-abiword-1.0.6-r1 67
-MD5 de17339aaab5c0b950381a7f36cf4c58 files/digest-abiword-2.0.5 68
+MD5 cd037c182094f6ba10b7dd9e15035efd files/abiword-2.0.3-amd64.patch 8632
 MD5 28dcae4a10f58c12a4a73346a7ab1ed0 files/digest-abiword-2.0.1 142
 MD5 20b01c6c3348c63e1b088cf107398e0c files/digest-abiword-2.0.2 68
+MD5 de17339aaab5c0b950381a7f36cf4c58 files/digest-abiword-2.0.5 68
 MD5 98793f926bc55d7e2398a9990d36fe18 files/digest-abiword-2.0.6 68
-MD5 ddf70a53b4fc5671c7ed5cb4acb4a6e8 files/digest-abiword-2.0.3-r1 68
-MD5 cd037c182094f6ba10b7dd9e15035efd files/abiword-2.0.3-amd64.patch 8632
+MD5 31616e14907aefda2489036cc3d1db3d files/AbiWord.desktop 901
+MD5 1ebcd22c6249c06e631c13491113d8ef files/AbiWord2.desktop 166
diff --git a/app-office/abiword/abiword-1.0.6-r1.ebuild b/app-office/abiword/abiword-1.0.6-r1.ebuild
deleted file mode 100644
index 108937b1b4a9..000000000000
--- a/app-office/abiword/abiword-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.6-r1.ebuild,v 1.5 2004/04/18 01:43:06 khai Exp $
-
-inherit flag-o-matic
-
-replace-flags "-O?" "-O1"
-IUSE="nls spell jpeg xml2 gnome"
-
-S=${WORKDIR}/${P}/abi
-
-DESCRIPTION="Word processor"
-SRC_URI="mirror://sourceforge/abiword/${P}.tar.gz"
-HOMEPAGE="http://www.abisource.com"
-
-KEYWORDS="x86 ~ppc sparc"
-LICENSE="GPL-2"
-SLOT="1"
-
-DEPEND="virtual/x11
-	media-libs/libpng
-	>=dev-libs/libunicode-0.4-r1
-	=x11-libs/gtk+-1.2*
-	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	xml2?  ( >=dev-libs/libxml2-2.4.10 )
-	spell? ( >=app-text/aspell-0.50.2-r1 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-		<gnome-extra/gal-1.99
-		>=gnome-base/bonobo-1.0.9-r1 )"
-
-src_compile() {
-	local myconf
-
-	use gnome \
-		&& myconf="${myconf} --with-gnome --enable-gnome"; \
-		export ABI_OPT_BONOBO=1
-
-	use spell \
-		&& myconf="${myconf} --with-pspell --disable-static"
-
-	use xml2 \
-		&& myconf="${myconf} --with-libxml2" \
-		|| myconf="${myconf} --without-libxml2"
-	use jpeg \
-		&& myconf="${myconf} --with-libjpeg" \
-		|| myconf="${myconf} --without-libjpeg"
-
-	use nls \
-		&& myconf="${myconf} --enable-bidi"
-
-	./autogen.sh
-	einfo "Ignore above errors if it does not cause the build to fail"
-
-	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
-
-	# we got enough of the perl problems for now
-	econf ${myconf} --disable-scripting
-
-	make || die
-}
-
-src_install() {
-	dodir /usr/{bin,lib}
-
-	einstall
-
-	dosed "s:${D}::g" /usr/bin/AbiWord
-
-	rm -f ${D}/usr/bin/abiword
-	dosym /usr/bin/AbiWord /usr/bin/abiword
-
-	dodoc BUILD COPYING *.txt, *.TXT
-
-	# Install icon and .desktop for menu entry
-	use gnome && ( \
-		insinto /usr/share/pixmaps
-		newins ${WORKDIR}/${P}/abidistfiles/icons/abiword_48.png AbiWord.png
-		insinto /usr/share/gnome/apps/Applications
-		doins ${FILESDIR}/AbiWord.desktop
-	)
-}
diff --git a/app-office/abiword/abiword-2.0.2.ebuild b/app-office/abiword/abiword-2.0.2.ebuild
index 0a33def39cf6..c9fce7f25a15 100644
--- a/app-office/abiword/abiword-2.0.2.ebuild
+++ b/app-office/abiword/abiword-2.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.2.ebuild,v 1.4 2004/03/25 08:21:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.2.ebuild,v 1.5 2004/04/20 19:54:52 foser Exp $
 
 inherit eutils
 
-IUSE="spell jpeg xml2 gnome debug"
+IUSE="spell jpeg xml2 gnome"
 
 S=${WORKDIR}/${P}/abi
 S_P=${WORKDIR}/${P}/${PN}-plugins
@@ -57,7 +57,7 @@ src_compile() {
 		`use_enable gnome` \
 		`use_with xml2 libxml2` \
 		`use_enable spell enchant` \
-		`use_enable debug` \
+		--disable-debug \
 		--enable-bidi \
 		--enable-threads \
 		--without-ImageMagick \
diff --git a/app-office/abiword/abiword-2.0.3-r1.ebuild b/app-office/abiword/abiword-2.0.3-r1.ebuild
deleted file mode 100644
index 51033064238c..000000000000
--- a/app-office/abiword/abiword-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.3-r1.ebuild,v 1.3 2004/03/25 08:21:27 mr_bones_ Exp $
-
-inherit eutils
-
-IUSE="spell jpeg xml2 gnome debug doc"
-
-S_P=${S}/${PN}-plugins
-S_D=${S}/${PN}-docs
-S=${WORKDIR}/${P}/abi
-
-DESCRIPTION="Fully featured yet light and fast cross platform word processor"
-HOMEPAGE="http://www.abisource.com"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
-LICENSE="GPL-2"
-SLOT="2"
-
-RDEPEND="virtual/x11
-	virtual/xft
-	>=media-libs/fontconfig-2.1
-	media-libs/libpng
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=app-text/wv-1
-	>=dev-libs/fribidi-0.10.4
-	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )
-	!xml2? ( dev-libs/expat )
-	spell? ( >=app-text/enchant-1 )
-	gnome? ( >=gnome-base/libgnomeui-2.2
-		>=gnome-base/libgnomeprint-2.2.1
-		>=gnome-base/libgnomeprintui-2.2.1
-		>=gnome-base/libbonobo-2 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/automake
-	dev-util/pkgconfig"
-
-src_compile() {
-	# Abiword is not 64-bit safe.  This is a patch for AMD64.
-	if [ $ARCH = "amd64" ] ; then
-		epatch ${FILESDIR}/abiword-2.0.3-amd64.patch || die
-	fi
-
-	# this is a hack since I don't want to go hack in the gnome-vfs headerfiles.
-	# The issue is about gnome-vfs containing "long long" which makes gcc 3.3.1 balk
-	cp configure configure.old
-	cat configure.old |sed s:-pedantic::g >configure
-	rm -f configure.old
-
-	econf \
-		`use_enable gnome` \
-		`use_with xml2 libxml2` \
-		`use_enable spell enchant` \
-		`use_enable debug` \
-		--enable-bidi \
-		--enable-threads \
-		--without-ImageMagick \
-		--disable-scripting \
-		--with-sys-wv || die
-
-	emake all-recursive || die
-
-	# Build plugins
-
-	cd ${S_P}
-
-	econf \
-		`use_enable debug` \
-		--enable-all \
-		--with-abiword=${S} \
-		--without-ImageMagick || die
-
-	emake || die
-
-}
-
-src_install() {
-
-	dodir /usr/{bin,lib}
-
-	einstall PERLDEST=${D} || die
-
-	dosed "s:Exec=abiword:Exec=abiword-2.0:" /usr/share/applications/abiword.desktop
-
-	rm -f ${D}/usr/bin/abiword-2.0
-	rm -f ${D}/usr/bin/abiword
-	dosym AbiWord-2.0 /usr/bin/abiword-2.0
-
-	dodoc COPYING *.TXT docs/build/BUILD.TXT user/wp/readme.txt
-
-	# install plugins
-
-	cd ${S_P}
-
-	make DESTDIR=${D} install || die
-
-	# install documentation
-
-	use doc && (
-		cd ${WORKDIR}/${P}/abiword-docs
-		sed -e 's:prefix = /usr/local:prefix = /usr:g' Makefile > Makefile.new
-		mv Makefile.new Makefile
-		make DESTDIR=${D} || die
-	)
-
-}
-
-USE_DESTDIR="1"
diff --git a/app-office/abiword/abiword-2.0.5.ebuild b/app-office/abiword/abiword-2.0.5.ebuild
index b4826d0fa30c..4868458f1f41 100644
--- a/app-office/abiword/abiword-2.0.5.ebuild
+++ b/app-office/abiword/abiword-2.0.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.5.ebuild,v 1.4 2004/04/20 15:40:18 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.5.ebuild,v 1.5 2004/04/20 19:54:52 foser Exp $
 
 inherit eutils
 
-IUSE="spell jpeg xml2 gnome debug doc"
+IUSE="spell jpeg xml2 gnome doc"
 
 S_P=${S}/${PN}-plugins
 S_D=${S}/${PN}-docs
@@ -57,7 +57,7 @@ src_compile() {
 		`use_enable gnome` \
 		`use_with xml2 libxml2` \
 		`use_enable spell enchant` \
-		`use_enable debug` \
+		--disable-debug \
 		--enable-bidi \
 		--enable-threads \
 		--without-ImageMagick \
diff --git a/app-office/abiword/abiword-2.0.6.ebuild b/app-office/abiword/abiword-2.0.6.ebuild
index dc54cbb7efaf..9e30284d8591 100644
--- a/app-office/abiword/abiword-2.0.6.ebuild
+++ b/app-office/abiword/abiword-2.0.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.6.ebuild,v 1.3 2004/04/19 08:23:07 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.6.ebuild,v 1.4 2004/04/20 19:54:52 foser Exp $
 
 inherit eutils
 
-IUSE="spell jpeg xml2 gnome debug doc"
+IUSE="spell jpeg xml2 gnome doc"
 
 S_P=${S}/${PN}-plugins
 S_D=${S}/${PN}-docs
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.abisource.com"
 
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64 ~hppa"
 LICENSE="GPL-2"
 SLOT="2"
 
@@ -52,7 +52,7 @@ src_compile() {
 		`use_enable gnome` \
 		`use_with xml2 libxml2` \
 		`use_enable spell enchant` \
-		`use_enable debug` \
+		--disable debug \
 		--enable-bidi \
 		--enable-threads \
 		--without-ImageMagick \
diff --git a/app-office/abiword/files/digest-abiword-1.0.6-r1 b/app-office/abiword/files/digest-abiword-1.0.6-r1
deleted file mode 100644
index d0a527459fa3..000000000000
--- a/app-office/abiword/files/digest-abiword-1.0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b35ea76f8d3eb70a94c3432a44e4a9d9 abiword-1.0.6.tar.gz 18598390
diff --git a/app-office/abiword/files/digest-abiword-2.0.3-r1 b/app-office/abiword/files/digest-abiword-2.0.3-r1
deleted file mode 100644
index a253760d64df..000000000000
--- a/app-office/abiword/files/digest-abiword-2.0.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa97aec08c353356dcb95b7634b56e9d abiword-2.0.3.tar.bz2 22072758