do not try to install *.css which are not available, #305543, thanks Christophe LEFEBVRE for the patches

(Portage version: 2.2_rc65/cvs/Linux x86_64)

4 files changed, 59 insertions, 24 deletions

diff --git a/app-text/vilistextum/ChangeLog b/app-text/vilistextum/ChangeLog
index 4f3446eca616..f65c7f0c064a 100644
--- a/app-text/vilistextum/ChangeLog
+++ b/app-text/vilistextum/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/vilistextum
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/ChangeLog,v 1.24 2008/02/13 20:02:33 pclouds Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/ChangeLog,v 1.25 2010/03/06 21:55:52 jlec Exp $
+
+*vilistextum-2.6.7-r1 (06 Mar 2010)
+
+  06 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +vilistextum-2.6.7-r1.ebuild, vilistextum-2.6.9.ebuild:
+  do not try to install *.css which are not available, #305543, thanks
+  Christophe LEFEBVRE for the patches
 
 *vilistextum-2.6.9 (13 Feb 2008)
 
diff --git a/app-text/vilistextum/vilistextum-2.6.7-r1.ebuild b/app-text/vilistextum/vilistextum-2.6.7-r1.ebuild
new file mode 100644
index 000000000000..1844b5a689db
--- /dev/null
+++ b/app-text/vilistextum/vilistextum-2.6.7-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/vilistextum-2.6.7-r1.ebuild,v 1.1 2010/03/06 21:55:52 jlec Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="Html to ascii converter specifically programmed to get the best out of incorrect html."
+HOMEPAGE="http://bhaak.dyndns.org/vilistextum/"
+SRC_URI="http://bhaak.dyndns.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+#IUSE="unicode kde"
+IUSE="unicode"
+
+DEPEND=""
+# KDE support will be available once a version of kaptain in stable
+#	 kde? ( kde-misc/kaptain )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/${P}-use-glibc-iconv.diff"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable unicode multibyte) || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc README CHANGES || die
+	dohtml doc/*.html || die
+}
diff --git a/app-text/vilistextum/vilistextum-2.6.7.ebuild b/app-text/vilistextum/vilistextum-2.6.7.ebuild
index 3aa8e0f9107a..4071537735c8 100644
--- a/app-text/vilistextum/vilistextum-2.6.7.ebuild
+++ b/app-text/vilistextum/vilistextum-2.6.7.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/vilistextum-2.6.7.ebuild,v 1.10 2008/01/11 21:46:17 grobian Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/vilistextum-2.6.7.ebuild,v 1.11 2010/03/06 21:55:52 jlec Exp $
 
 inherit eutils autotools
 
diff --git a/app-text/vilistextum/vilistextum-2.6.9.ebuild b/app-text/vilistextum/vilistextum-2.6.9.ebuild
index a7fffbc8592e..a34e0d2efc07 100644
--- a/app-text/vilistextum/vilistextum-2.6.9.ebuild
+++ b/app-text/vilistextum/vilistextum-2.6.9.ebuild
@@ -1,43 +1,36 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/vilistextum-2.6.9.ebuild,v 1.1 2008/02/13 20:02:33 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/vilistextum-2.6.9.ebuild,v 1.2 2010/03/06 21:55:52 jlec Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+EAPI="2"
 
 inherit eutils autotools
 
-DESCRIPTION="Vilistextum is a html to ascii converter specifically programmed to get the best out of incorrect html."
+DESCRIPTION="Html to ascii converter specifically programmed to get the best out of incorrect html."
 HOMEPAGE="http://bhaak.dyndns.org/vilistextum/"
 SRC_URI="http://bhaak.dyndns.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 #IUSE="unicode kde"
 IUSE="unicode"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND=""
 # KDE support will be available once a version of kaptain in stable
 #	 kde? ( kde-misc/kaptain )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.diff"
-
 	eautoreconf
 }
 
-src_compile() {
-	econf \
-		$(use_enable unicode multibyte) \
-		|| die "econf failed"
-	emake || die "emake failed"
+src_configure(){
+	econf $(use_enable unicode multibyte)
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README CHANGES
-	dohtml doc/*.{html,css}
+	emake DESTDIR="${D}" install || die
+	dodoc README CHANGES || die
+	dohtml doc/*.html || die
 }