move from USE=tetex to USE=latex and change virtual/tetex to virtual/latex-base; clean up the applied patches; quote some variables; add app-text/wdiff as RDEPEND, reported in bug 218796 by Matthias Wieding-Drewes <m AT wieding-drewes DOT de>; dropped KEYWORDS for arm, sh, s390, ppc64 and hppa

Package-Manager: portage-2.1.4.4

3 files changed, 29 insertions, 27 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 39ecd2e5fe91..eff7ad95dbda 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.79 2008/04/29 12:22:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.80 2008/05/12 08:35:25 opfer Exp $
+
+  12 May 2008; Christian Faulhammer <opfer@gentoo.org> a2ps-4.14.ebuild:
+  move from USE=tetex to USE=latex and change virtual/tetex to
+  virtual/latex-base; clean up the applied patches; quote some variables; add
+  app-text/wdiff as RDEPEND, reported in bug 218796 by Matthias Wieding-Drewes
+  <m AT wieding-drewes DOT de>; dropped KEYWORDS for arm, sh, s390, ppc64 and
+  hppa
 
   29 Apr 2008; Raúl Porcel <armin76@gentoo.org> a2ps-4.13c-r6.ebuild:
   ia64 stable wrt #212050
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 83d137065608..35e016fd1c08 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 4.13c-gcc34.patch 348 RMD160 c516143bb1528b70c3abd836abdf530eb60fd0bf SHA1 2904d6dc351347984ad85181c497c2f6f2f21e5c SHA256 0e4ab84eed2dc0b73a5c393f16dea4687d4cc1d649186c2d2e8ccb7585f96159
 AUX 50a2ps-gentoo.el 253 RMD160 4e98bec1dd60efb072e7cf7b6e6e3f58d53a4ead SHA1 210038d9f7e39a14fa8639aa02cb7c81945883b1 SHA256 3d114d11eca3eb4f96e656d188e90082432a1206f39fd471d72c0d4e392d7615
 AUX a2ps-4.13-fixcachecheck.patch 444 RMD160 6a26c535b9af9be96d5a2ac32689b19daacc83f9 SHA1 64dadd08f018a65e380fd798157ce04af3a8f6b2 SHA256 d7f37d72ed46d73e26261c3473c738174ef8156f8a1dd9355850fcaa9befd622
@@ -20,6 +23,13 @@ DIST a2ps-4.14.tar.gz 2552507 RMD160 a5105d6256a809483e099519325979aaaff7219e SH
 EBUILD a2ps-4.13c-r2.ebuild 1987 RMD160 548712574431f0023b032fd4ff199a7a83fe7760 SHA1 a0233c322332a7918d4ace0d7dc473839176b5fb SHA256 e69b549d71da7a630607d73ad47c7b669223433b956a419e38b5f3233404252f
 EBUILD a2ps-4.13c-r5.ebuild 3043 RMD160 b24ce20ea767f7b71cbeb38e7ac50d27daa71a8b SHA1 d8288d61a452709201d7a98d4ca21b7645542c3c SHA256 0da707f72719e90531d682f9c3d7fd4b1785fc51b7bafee4a05477a821b26149
 EBUILD a2ps-4.13c-r6.ebuild 3366 RMD160 47117b5fcb587969c5509baeda8bd7c2e0c926b7 SHA1 3a5a8dde39599cc29430c9bc8f2a08fba8f5fa78 SHA256 a5d57d9b6e870d4e5f70f7fe683854975538773688de33e55eb70b56b95e424a
-EBUILD a2ps-4.14.ebuild 3425 RMD160 14717aa193833a636636c6a5be880ab76d690e76 SHA1 44af832ff38c084c461bd17dbf3bab34e3b662e4 SHA256 967146083038ce464153d18d08f21869fb6c146abdbc9f7248f3e2c036603b56
-MISC ChangeLog 11565 RMD160 ca0e591ab3898caaedcaca3d5f880c4959a48f0e SHA1 e16e60c737ae9b1b9eb9cbb13501ddccadc3daa3 SHA256 40e908a5458ddf351bb7c9773c0036fef70129611c53af77b9815a0a052fa833
+EBUILD a2ps-4.14.ebuild 2962 RMD160 6158d9c4df7ad523571a9e144a110f8cc3c58065 SHA1 798356199843547f9161f4117d8ddbad8d1cbfea SHA256 33884c51fcf202f1bb18d9cf803caf1a352f7ceee54f02c712f0ec7ef240eca1
+MISC ChangeLog 11942 RMD160 9dde59d0ccf07c93f2f36722ddfea9a78fa71677 SHA1 ad71ef7a67e317cc29d0a2a17b29d090f37b458e SHA256 eee8e16228e4424ae3dcf7a02c875ca712953ea645238ad16571bff73fabf825
 MISC metadata.xml 178 RMD160 1823829273be97b95b286540a3439d152281baf1 SHA1 e0647c54037d344aabf04d0ce6bb79d133bfcc18 SHA256 70722a9097b3b57eb4b153054cc852b0938c47120de0fdfd233cac6b209b412a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgoAVQACgkQNQqtfCuFneM7ogCfb5KHxhgSPhwB1ClLesLTwWw5
+cdIAn3A/092ZnY6B0BqrZazKZljly8Sn
+=UwfU
+-----END PGP SIGNATURE-----
diff --git a/app-text/a2ps/a2ps-4.14.ebuild b/app-text/a2ps/a2ps-4.14.ebuild
index c71acc675fc3..f8e95c5ae038 100644
--- a/app-text/a2ps/a2ps-4.14.ebuild
+++ b/app-text/a2ps/a2ps-4.14.ebuild
@@ -1,6 +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/a2ps/a2ps-4.14.ebuild,v 1.4 2008/04/19 14:13:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14.ebuild,v 1.5 2008/05/12 08:35:25 opfer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -15,22 +15,23 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cjk emacs nls tetex vanilla userland_BSD userland_GNU"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="cjk emacs nls latex vanilla userland_BSD userland_GNU"
 
 DEPEND=">=dev-util/gperf-2.7.2
 	|| ( >=dev-util/yacc-1.9.1 sys-devel/bison )
 	virtual/ghostscript
 	>=app-text/psutils-1.17
 	emacs? ( virtual/emacs )
-	tetex? ( virtual/tetex )
+	latex? ( virtual/latex-base )
 	nls? ( sys-devel/gettext )"
 RDEPEND="virtual/ghostscript
+	app-text/wdiff
 	userland_GNU? ( || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp ) )
 	userland_BSD? ( sys-freebsd/freebsd-ubin )
 	>=app-text/psutils-1.17
 	emacs? ( virtual/emacs )
-	tetex? ( virtual/tetex )
+	latex? ( virtual/latex-base )
 	nls? ( virtual/libintl )"
 
 SITEFILE=50${PN}-gentoo.el
@@ -39,21 +40,12 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
 
-	# applied by upstream
-	#epatch "${FILESDIR}/${PN}-4.13-select-freebsd.patch"
 	epatch "${FILESDIR}/${PN}-4.13c-locale-gentoo.diff"
 	# this will break
 	#epatch "${FILESDIR}/${PN}-4.13c-stdarg.patch"
 	use vanilla || epatch "${FILESDIR}/${PN}-4.13-stdout.diff"
-	# applied by upstream
-	#epatch "${FILESDIR}/${PV}-gcc34.patch"
 	use cjk && epatch "${DISTDIR}/${P}-ja_nls.patch.gz"
 
-	# improve tempfile handling
-	# applied by upstream
-	#epatch "${FILESDIR}/${P}-fixps.patch"
-	#epatch "${FILESDIR}/${P}-psmandup.diff"
-
 	# fix fnmatch replacement, bug #134546
 	epatch "${FILESDIR}/${PN}-4.13c-fnmatch-replacement.patch"
 
@@ -63,14 +55,6 @@ src_unpack() {
 	# fix emacs printing, bug #114627
 	epatch "${FILESDIR}/a2ps-4.13c-emacs.patch"
 
-	# fix psset with sed-4.1, bug #126403
-	# applied by upstream
-	#epatch "${FILESDIR}/a2ps-4.13c-psset.patch"
-
-	# fix >=autoconf-2.60, bug 138161
-	# this will break
-	#epatch "${FILESDIR}/a2ps-4.13-fixcachecheck.patch"
-
 	# fix chmod error, #167670
 	epatch "${FILESDIR}/a2ps-4.13-manpage-chmod.patch"
 
@@ -86,6 +70,7 @@ src_unpack() {
 src_compile() {
 	#export YACC=yacc
 	export COM_netscape=no
+	use latex || COM_latex=no
 	econf --sysconfdir=/etc/a2ps \
 		--includedir=/usr/include \
 		$(useq emacs || echo EMACS=no) \
@@ -99,8 +84,8 @@ src_compile() {
 
 src_install() {
 	einstall \
-		sysconfdir=${D}/etc/a2ps \
-		includedir=${D}/usr/include \
+		sysconfdir="${D}"/etc/a2ps \
+		includedir="${D}"/usr/include \
 		lispdir="${D}${SITELISP}/${PN}" \
 		|| die "einstall failed"