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

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

5 files changed, 73 insertions, 27 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/Manifest b/app-text/vilistextum/Manifest
index 41655acc908e..512bea6482ec 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vilistextum-2.6.7-gentoo.diff 770 RMD160 f8948cfe4f533372b376f0fff81905b7e33a0867 SHA1 b96a42a50b57c0be2cf9169101f365a124618677 SHA256 a9d58adaf0d9b9813f45b0658db97b9ee2b43de230b629cdbb78f079398fb587
 AUX vilistextum-2.6.7-use-glibc-iconv.diff 16367 RMD160 e7710d7a9db530a998c0725fa8daba4c4cd87c03 SHA1 ccd7abcc1eb6f8dc1abdf3925be398ab30acd7bc SHA256 01d2c7ba44ffa7b3ef0aaed163820fa25881b6ab4d383fa79364a9fd1965baaf
 AUX vilistextum-2.6.9-gentoo.diff 763 RMD160 fb5295451d84bedf2be72dc99e54775bb0ef2276 SHA1 19cbd726b18fca10dc0699106755015638fc30c7 SHA256 39bce048c11e797c2d0eaaa5e83eff0ddc1832a4c617bbca382c87b1ee12fe0a
 DIST vilistextum-2.6.7.tar.bz2 144815 RMD160 b12efbf5b2cfc7313ac0406cb4c471f93a791912 SHA1 8cde5a11e7b69d2453ef9c2129280039c59cb840 SHA256 b91746536631530a51150bf4ac6b053659e109b411932065b8a153737498ebf3
 DIST vilistextum-2.6.9.tar.bz2 147743 RMD160 3e041a1c368f3f7e4c370474e18829ed49fba206 SHA1 24d8978c5ebd76c9eacb2ba2381eb119e4d0f7bf SHA256 dddf05b4b9dbb408ea37b5654666f8cf57b5c1da0dd722de763bc86788723d0f
-EBUILD vilistextum-2.6.7.ebuild 1107 RMD160 8c479cee9d60e89046fcf0e9ac688f4d75b129f6 SHA1 fb919c38d90f850a0bea147c6c3fa131ec0326f2 SHA256 22940b579d7452c5eb36e7f8d29618bd2b16ac8372fa5953ebcd8f955579346e
-EBUILD vilistextum-2.6.9.ebuild 1062 RMD160 1d9b9da87e757ccbef77ec87cf630bf6a76dbfb5 SHA1 0a3cf1eb2b5e6137d7226dbdbebe83e647844b97 SHA256 fbbcf79ae79f49e7aa475066c03c85f85cbab5a2d04e8065867ffdf37957d18a
-MISC ChangeLog 2982 RMD160 6b3fffa7af8eab86d874f33332ea0ac6c3af91b9 SHA1 afc6c2ad1324c32a332f25df83cd9345e1058800 SHA256 4c779c1603cfa92baebbc8286764eb3e9acab3ed5746373297aae8f487bf04e5
+EBUILD vilistextum-2.6.7-r1.ebuild 969 RMD160 04522bae6b1641c8b3705a57f497abf8001a3d9a SHA1 8b015e5bc5ca2f0edc5a19d70e694c23f49af972 SHA256 fa76b933272ba3a6d8892216eca361b4d470b03f2f677381cf1d684767110e11
+EBUILD vilistextum-2.6.7.ebuild 1057 RMD160 585ac6c4e3d0663e06d6a9bf5addc700456588ad SHA1 82f5b6d2634163fc511edf6f7aa2936459e1d5cf SHA256 3f9d17b2187c2611ae2d415182296f24fe9c8d7eb642198c40ec7da8db9e161a
+EBUILD vilistextum-2.6.9.ebuild 910 RMD160 b4c846ea1554005c014c82c588cb6377bdb31930 SHA1 3d707442e988dc32bfaf0b8a97209ff0b85f11fc SHA256 658ea1c58047cba0ff00c2480fb878d379f5c4ae4d4fe80e0faf994ed53de200
+MISC ChangeLog 3238 RMD160 6fb0e4985141b3a276946f1c87ebe99715560ded SHA1 b1fbead456bb5e3df343a168cdc5b777efa4deae SHA256 0baa234bc95ffd2d660f481b7e2a89adb8039ca3e6289edd653c8b369ff4fa41
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuSz24ACgkQgAnW8HDreRajBwCfdhzCVJBdqYRIP/Ij51LwVBBf
+GksAoL9BrNwdfQxNuuDMvr81XZ6YrjUR
+=dOWi
+-----END PGP SIGNATURE-----
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
 }