Bump to EAPI=3, add prefix keywords & patch

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 48 insertions, 12 deletions

diff --git a/app-text/code2html/ChangeLog b/app-text/code2html/ChangeLog
index 4d64897d17d4..bc88814f03a1 100644
--- a/app-text/code2html/ChangeLog
+++ b/app-text/code2html/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/code2html
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/code2html/ChangeLog,v 1.19 2009/07/03 00:47:51 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/code2html/ChangeLog,v 1.20 2010/04/05 22:24:08 abcd Exp $
+
+  05 Apr 2010; Jonathan Callen <abcd@gentoo.org> code2html-0.9.1-r1.ebuild,
+  +files/code2html-0.9.1-prefix.patch:
+  Bump to EAPI=3, add prefix keywords & patch
 
   03 Jul 2009; Jeroen Roovers <jer@gentoo.org> code2html-0.9.1-r1.ebuild:
   Do not install LICENSE.
diff --git a/app-text/code2html/code2html-0.9.1-r1.ebuild b/app-text/code2html/code2html-0.9.1-r1.ebuild
index 1f551d94b057..c75f5065d122 100644
--- a/app-text/code2html/code2html-0.9.1-r1.ebuild
+++ b/app-text/code2html/code2html-0.9.1-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 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/code2html/code2html-0.9.1-r1.ebuild,v 1.5 2009/07/03 00:47:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/code2html/code2html-0.9.1-r1.ebuild,v 1.6 2010/04/05 22:24:08 abcd Exp $
 
-inherit eutils
+EAPI="3"
+
+inherit eutils prefix
 
 DESCRIPTION="Converts source files to colored HTML output."
 HOMEPAGE="http://www.palfrader.org/code2html/"
@@ -12,16 +14,13 @@ SRC_URI="http://www.palfrader.org/code2html/all/${P}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND=""
 RDEPEND=">=dev-lang/perl-5"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# Be consistent in color codes (bug #119406)
 	epatch "${WORKDIR}"/${P}-lowercase_color_codes.patch
 
@@ -30,10 +29,13 @@ src_unpack() {
 
 	# Improved Ada support (bug #133176)
 	epatch "${WORKDIR}"/${P}-ada_identifiers.patch
+
+	# For prefix paths
+	epatch "${FILESDIR}"/${P}-prefix.patch
+	eprefixify code2html
 }
 
-src_install () {
-	into /usr
+src_install() {
 	dobin code2html
 	dodoc ChangeLog CREDITS README
 	doman code2html.1
diff --git a/app-text/code2html/files/code2html-0.9.1-prefix.patch b/app-text/code2html/files/code2html-0.9.1-prefix.patch
new file mode 100644
index 000000000000..cc27296fb71c
--- /dev/null
+++ b/app-text/code2html/files/code2html-0.9.1-prefix.patch
@@ -0,0 +1,30 @@
+--- code2html
++++ code2html
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
+ use locale;
+ my $vernr = "0.9.1";
+ my $monthshort = "Jan";
+@@ -45,9 +45,9 @@
+ # PP: A hash would be nicer but then it would not possible to get the keys in this very order (AFAIK)
+ # PP: If names contain meta characters, then those must be metaquoted (if you don't want the meta chars to be meta chars of course)
+ my @CGI_ENCODING = (
+-		    ['bzip2'     , '/usr/bin/bzip2'    , '--stdout' ],
+-		    ['gzip'      , '/bin/gzip'         , '--stdout' ],
+-		    ['compress'  , '/usr/bin/compress' , '-c' ]
++		    ['bzip2'     , '@GENTOO_PORTAGE_EPREFIX@/usr/bin/bzip2'    , '--stdout' ],
++		    ['gzip'      , '@GENTOO_PORTAGE_EPREFIX@/bin/gzip'         , '--stdout' ],
++		    ['compress'  , '@GENTOO_PORTAGE_EPREFIX@/usr/bin/compress' , '-c' ]
+ 		   );
+ 
+ 
+@@ -147,7 +147,7 @@
+       # building up the database
+       # newer entries overwrite old ones
+       my @CONFIG_FILES;
+-      push @CONFIG_FILES, "/etc/code2html.config";
++      push @CONFIG_FILES, "@GENTOO_PORTAGE_EPREFIX@/etc/code2html.config";
+       push @CONFIG_FILES, $ENV{'HOME'}."/.code2html.config"   if (defined($ENV{'HOME'}));
+       push @CONFIG_FILES, split(/:/,$ENV{'CODE2HTML_CONFIG'}) if ($ENV{'CODE2HTML_CONFIG'});
+       push @CONFIG_FILES, split(/:/,$params{'langfile'})      if defined($params{'langfile'});