new development version with lots of improvements, cleanup of old ebuilds

10 files changed, 42 insertions, 373 deletions

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index de7ebc103eff..4b34ba555011 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,21 +1,12 @@
 MD5 144371398dbe030e96f2e320cf8470c2 abiword-1.0.6-r1.ebuild 1930
 MD5 1abe03d14ed3a4064bb061324361cab9 abiword-1.0.2-r1.ebuild 4687
-MD5 e3d0cef204cc5934cc63eb9893ba7311 abiword-1.99.2.ebuild 2131
-MD5 39185131de010ab17ce359f7b63ac9a7 abiword-1.0.6.ebuild 2011
+MD5 3b84d70d93e5ce1d6172306a35d2543e abiword-1.99.2.ebuild 2121
 MD5 1ac8b02dd63859b53ddf415ebbbcd0bf abiword-1.99.1.ebuild 2478
-MD5 3e1f2eee9eef98b6c5529a9a6fd51029 abiword-1.0.3.ebuild 4640
-MD5 b5633e276c19c4a25cc46f126689ee20 abiword-1.9.1.ebuild 2412
-MD5 2f020a502288e9eeee5c7620e3fcf90e ChangeLog 6792
+MD5 aef277562cb783d352f8898b17926e16 ChangeLog 7075
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 24e5e79582e10e3a1bde1472b096c790 abiword-1.0.5.ebuild 2012
 MD5 d9c89710f2f6df8316f4506ee7d9f542 files/digest-abiword-1.99.1 68
 MD5 f080426cc26d779158e955db2b3a57af files/digest-abiword-1.99.2 143
-MD5 72290ce66c077f82a228166b0c21f259 files/digest-abiword-1.99.1-r1 143
 MD5 4ab387fa04b0102a395a4b654f0714df files/abiword-1.1.4-wv_configure_fooling.patch 1575
-MD5 ec999635047cabecdcece23cd40d4bd9 files/digest-abiword-1.0.3 67
-MD5 41164f9198cc3cf8a02759a7c5aba5af files/digest-abiword-1.0.5 67
-MD5 55d85bca7cd645ef338336da3d6e6a7e files/digest-abiword-1.0.6 67
-MD5 5932156df44ca8ad04841c4ba8b29e4c files/digest-abiword-1.9.1 68
 MD5 31616e14907aefda2489036cc3d1db3d files/AbiWord.desktop 901
 MD5 1ebcd22c6249c06e631c13491113d8ef files/AbiWord2.desktop 166
 MD5 e6d9565092f5a6c2243401eccf1ca5a1 files/abiword-1.0.3-aspell.patch 812
diff --git a/app-office/abiword/abiword-1.0.3.ebuild b/app-office/abiword/abiword-1.0.3.ebuild
deleted file mode 100644
index afcbfc3d0d71..000000000000
--- a/app-office/abiword/abiword-1.0.3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2003 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.3.ebuild,v 1.10 2003/07/02 11:45:09 aliz Exp $
-
-IUSE="perl nls gnome build spell jpeg xml2"
-
-S=${WORKDIR}/${P}/abi
-DESCRIPTION="Text processor"
-SRC_URI="http://download.sourceforge.net/abiword/abiword-${PV}.tar.gz"
-HOMEPAGE="http://www.abisource.com"
-KEYWORDS="x86 ~ppc sparc"
-LICENSE="GPL-2"
-SLOT="0"
-DEPEND="virtual/x11
-	media-libs/libpng
-	>=dev-libs/libunicode-0.4-r1
-	=x11-libs/gtk+-1.2*
-	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	perl?  ( >=dev-lang/perl-5.6 )
-	xml2?  ( >=dev-libs/libxml2-2.4.10 )
-	spell? ( >=app-text/aspell-0.50 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-		<gnome-extra/gal-1.99
-		>=gnome-base/bonobo-1.0.9-r1 )
-	!app-shells/bash-completion"
-
-fix_perl_env() {
-	# new configure scripts is a bit broken
-	export PERL_ARCHLIB="`(perl -V:installarchlib | sed -e "s/\(.*=\|'\|;\)//g\")`"
-	export PERL_LIB="`(perl -V:installprivlib | sed -e "s/\(.*=\|'\|;\)//g\")`"
-	export POD2MAN_EXE="`which pod2man`"
-	export SITE_LIB="`(perl -V:sitelib | sed -e "s/\(.*=\|'\|;\)//g\")`"
-	export SITE_ARCHLIB="`(perl -V:sitearch | sed -e "s/\(.*=\|'\|;\)//g\")`"
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	use perl && ( \
-		fix_perl_env
-
-		# Fix perl stuff install outside sandbox, as well as a bug in 
-		# Abiword's build system (Abiword.3pm did not install, and
-		# the '.packlist' was not generated properly) -- Azarah (25/02/2002).
-		cd ${S}/src/bindings/perl
-		cp GNUmakefile.am GNUmakefile.am.orig
-		sed -e "s:PERL_ARCHLIB = @PERL_ARCHLIB@:PERL_ARCHLIB = ${PERL_ARCHLIB}:" \
-			-e "s:PERL_LIB = @PERL_LIB@:PERL_LIB = ${PERL_LIB}:" \
-			-e "s:POD2MAN_EXE = @POD2MAN_EXE@:POD2MAN_EXE = ${POD2MAN_EXE}:" \
-			-e "s:SITE_LIB = @SITE_LIB@:SITE_LIB = ${SITE_LIB}:" \
-			-e "s:SITE_ARCHLIB = @SITE_ARCHLIB@:SITE_ARCHLIB = ${SITE_ARCHLIB}:" \
-			-e 's:write $(SITE_ARCHLIB)/auto:write $(PERLDEST)/$(SITE_ARCHLIB)/auto:g' \
-			-e 's:blib/lib $(SITE_LIB):blib/lib $(PERLDEST)/$(SITE_LIB):g' \
-			-e 's:blib/arch $(SITE_ARCHLIB):blib/arch $(PERLDEST)/$(SITE_ARCHLIB):g' \
-			-e 's:blib/bin /usr/bin:blib/bin $(PERLDEST)/usr/bin:g' \
-			-e 's:blib/script /usr/bin:blib/script $(PERLDEST)/usr/bin:g' \
-			-e 's:blib/man1 /usr/share/man/man1:blib/man1 $(PERLDEST)/usr/share/man/man1:g' \
-			-e 's:blib/man3 /usr/share/man/man3:blib/man3 $(PERLDEST)/usr/share/man/man3:g' \
-			-e 's:mkpath $(PERL_ARCHLIB):mkpath $(PERLDEST)/$(PERL_ARCHLIB):g' \
-			-e 's:$(PERL_ARCHLIB)/perllocal.pod:$(PERLDEST)/$(PERL_ARCHLIB)/perllocal.pod.new:' \
-			GNUmakefile.am.orig >GNUmakefile.am || die
-		mkdir -p blib/{arch,bin,lib,man1,man3,script}
-		cd ${S}
-	)
-
-	# Fix m4 macro to make it use the new aspell-0.50 instead of
-	# pspell-ispell as before.  MUCH thanks to dom, the abiword project
-	# lead.
-	
-	patch -d ${S} -p1 < ${FILESDIR}/abiword-1.0.3-aspell.patch
-	
-	# clear invalid symlinks
-	rm -f ac-helpers/{install-sh,mkinstalldirs,missing}
-}
-
-src_compile() {
-
-	local myconf
-
-	use gnome \
-		&& myconf="${myconf} --with-gnome --enable-gnome" \
-		&& export ABI_OPT_BONOBO=1
-
-	use perl \
-		&& myconf="${myconf} --enable-scripting"
-	
-	use spell \
-		&& myconf="${myconf} --with-pspell"
-
-	use xml2 \
-		&& myconf="${myconf} --with-libxml2"
-
-	use jpeg \
-		&& myconf="${myconf} --with-libjpeg"
-	
-	use nls \
-		&& myconf="${myconf} --enable-bidi"
-
-	./autogen.sh
-	
-	einfo "Ignore above ERROR as it does not cause build to fail."
-
-	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
-	
-	econf ${myconf}
-#		--enable-extra-optimization \
-
-	# Doesn't work with -j 4 (hallski)
-	make UNIX_CAN_BUILD_STATIC=0 \
-		OPTIMIZER="${CFLAGS}" || die
-}
-
-src_install() {
-
-	dodir /usr/{bin,lib}
-
-	einstall PERLDEST=${D}
-	
-	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
-	)
-}
-
-pkg_postinst() {
-
-	# Appending installation info
-	local perlver="`perl -v | grep -e "This is perl" | cut -d ' ' -f 4`"
-	perlver=${perlver/v/}
-	local perlarch="`perl -V | grep -e " archname" | cut -d '=' -f 4`"
-	if [ -f /usr/lib/perl5/${perlver}/${perlarch}/perllocal.pod.new ] ; then
-		sed -e "s:5.6.0:${perlver}:g" \
-			/usr/lib/perl5/${perlver}/${perlarch}/perllocal.pod.new \
-			>> /usr/lib/perl5/${perlver}/${perlarch}/perllocal.pod
-		rm -rf /usr/lib/perl5/${perlver}/${perlarch}/perllocal.pod.new
-	fi
-}
-
diff --git a/app-office/abiword/abiword-1.0.5.ebuild b/app-office/abiword/abiword-1.0.5.ebuild
deleted file mode 100644
index e7550d0419c6..000000000000
--- a/app-office/abiword/abiword-1.0.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2003 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.5.ebuild,v 1.4 2003/03/31 23:06:24 foser Exp $
-
-inherit flag-o-matic
-
-replace-flags "-O?" "-O1"
-IUSE="nls build spell jpeg xml2"
-
-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 )
-	!app-shells/bash-completion"
-
-# gnome build seems broken <foser@gentoo.org>
-#	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-#		>=gnome-extra/gal-0.13-r1 
-#		>=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 ERROR as it does not cause 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-1.0.6.ebuild b/app-office/abiword/abiword-1.0.6.ebuild
deleted file mode 100644
index 54123656fa4e..000000000000
--- a/app-office/abiword/abiword-1.0.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.2 2003/07/02 11:45:09 aliz Exp $
-
-inherit flag-o-matic
-
-replace-flags "-O?" "-O1"
-IUSE="nls build spell jpeg xml2"
-
-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 )
-	!app-shells/bash-completion"
-
-# gnome build seems broken <foser@gentoo.org>
-#	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-#		>=gnome-extra/gal-0.13-r1 
-#		>=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 ERROR as it does not cause 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-1.9.1.ebuild b/app-office/abiword/abiword-1.99.2.ebuild
index b732356f1af5..99f3875e1264 100644
--- a/app-office/abiword/abiword-1.9.1.ebuild
+++ b/app-office/abiword/abiword-1.99.2.ebuild
@@ -1,28 +1,33 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.9.1.ebuild,v 1.4 2003/07/19 03:11:32 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.99.2.ebuild,v 1.1 2003/07/27 18:17:43 foser Exp $
 
 inherit eutils debug
 
 IUSE="spell jpeg xml2 gnome"
 
 S=${WORKDIR}/${P}/abi
-DESCRIPTION="Fully featured yet light and fast cross platform word processor."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+S_P=${WORKDIR}/${PN}-plugins-${PV}
+
+DESCRIPTION="Fully featured yet light and fast cross platform word processor"
 HOMEPAGE="http://www.abisource.com"
+
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/${PN}-plugins-${PV}.tar.gz"
+
 KEYWORDS="~x86 ~sparc ~alpha ~ppc"
 LICENSE="GPL-2"
 SLOT="2"
 
-DEPEND="virtual/x11
+RDEPEND="virtual/x11
 	virtual/xft
 	>=media-libs/fontconfig-2.1
 	media-libs/libpng
 	>=dev-libs/libunicode-0.4-r1
-	>=dev-libs/libole2-0.2.4-r1
 	>=x11-libs/gtk+-2
 	>=gnome-base/libglade-2
-	>=app-text/wv-0.7.5
+	>=app-text/wv-0.7.6
 	>=dev-libs/fribidi-0.10.4
 	jpeg?  ( >=media-libs/jpeg-6b-r2 )
 	( xml2? >=dev-libs/libxml2-2.4.10 : dev-libs/expat )
@@ -31,37 +36,32 @@ DEPEND="virtual/x11
 		>=gnome-base/libgnomeprintui-2.2.1 
 		>=gnome-extra/gal-1.99 )"
 
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+#	>=dev-libs/libole2-0.2.4-r1
 #	perl?  ( >=dev-lang/perl-5.6 )
 # perl seems broken
 
 # FIXME : do 'real' use switching, add gucharmap support
 # switches do not work by the looks of it
 
-src_unpack() {
-	unpack ${A}
-
-	# Patch to make the wv.h tests work 
-	# 
-	# wv wants libole2 which in it's turn wants glib 1.2
-	# glib.h includes glibconfig.h which is in a non-included path
-	# and makes the tests fail, this patch adds those paths to configure.
-	# Compiling without specifying the path anywhere goes fine.
-	#
-	# April 1st 2003 <foser@gentoo.org>
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.1.4-wv_configure_fooling.patch
-}
-
 src_compile() {
-	local myconf
 
-	use gnome \
-		&& myconf="${myconf} --enable-gnome" \
-		|| myconf="${myconf} --disable-gnome" 
-		
-	econf ${myconf} --with-sys-wv || die  
+	./autogen.sh
+
+	econf `use_enable gnome` --with-sys-wv || die  
 
 	emake all-recursive || die
+
+	# Build plugins
+
+	cd ${S_P}
+
+	./nextgen.sh
+	econf --enable-all --with-abiword=${S} || die
+	emake || die
+
 }
 
 src_install() {  
@@ -75,19 +75,18 @@ src_install() {
 	rm -f ${D}/usr/bin/abiword
 	dosym AbiWord-2.0 /usr/bin/abiword-2.0
 
-	dodoc COPYING *.TXT docs/build/BUILD.TXT
+	# install plugins
+
+	cd ${S_P}
+
+	make DESTDIR=${D} install || die
 
 	# 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/applications/
-		doins ${FILESDIR}/AbiWord2.desktop
-		# Not installing oaf files, not overly stable.
-	)
-}
+	insinto /usr/share/pixmaps
+	newins ${WORKDIR}/${P}/abidistfiles/icons/abiword_48.png AbiWord.png
+	insinto /usr/share/applications/
+	doins ${FILESDIR}/AbiWord2.desktop
 
-pkg_postinst() {
-	einfo "For stability, install the latest 1.0.x release."
-}
+	dodoc COPYING *.TXT docs/build/BUILD.TXT abi/user/wp/readme.txt
 
+}
diff --git a/app-office/abiword/files/digest-abiword-1.0.3 b/app-office/abiword/files/digest-abiword-1.0.3
deleted file mode 100644
index a1ad6f14824d..000000000000
--- a/app-office/abiword/files/digest-abiword-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01336526136b7fbc66328d80931710e3 abiword-1.0.3.tar.gz 19443331
diff --git a/app-office/abiword/files/digest-abiword-1.0.5 b/app-office/abiword/files/digest-abiword-1.0.5
deleted file mode 100644
index 07bf249fd7d6..000000000000
--- a/app-office/abiword/files/digest-abiword-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dfe86fb72afc4008e51504fd693b224e abiword-1.0.5.tar.gz 18966097
diff --git a/app-office/abiword/files/digest-abiword-1.0.6 b/app-office/abiword/files/digest-abiword-1.0.6
deleted file mode 100644
index d0a527459fa3..000000000000
--- a/app-office/abiword/files/digest-abiword-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b35ea76f8d3eb70a94c3432a44e4a9d9 abiword-1.0.6.tar.gz 18598390
diff --git a/app-office/abiword/files/digest-abiword-1.9.1 b/app-office/abiword/files/digest-abiword-1.9.1
deleted file mode 100644
index 48a70bed91bf..000000000000
--- a/app-office/abiword/files/digest-abiword-1.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 978644437cfaf56d46ea87fa6339ea4c abiword-1.9.1.tar.bz2 10810620
diff --git a/app-office/abiword/files/digest-abiword-1.99.2 b/app-office/abiword/files/digest-abiword-1.99.2
new file mode 100644
index 000000000000..99e4775b5364
--- /dev/null
+++ b/app-office/abiword/files/digest-abiword-1.99.2
@@ -0,0 +1,2 @@
+MD5 6319519f6f8b3eb70b0370bf694350d4 abiword-1.99.2.tar.gz 17197250
+MD5 bc1bcbc16baa1c7026d0b7c0fa3b629b abiword-plugins-1.99.2.tar.gz 1516553