From e130c485a31ac5f8a011812482f3828e0470dbf0 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 25 Jun 2011 14:54:52 +0000
Subject: Fix for Prefix

Package-Manager: portage-2.2.01.18826-prefix/cvs/Darwin powerpc
---
 app-text/highlight/ChangeLog            |  5 ++++-
 app-text/highlight/Manifest             | 12 ++++++------
 app-text/highlight/highlight-3.5.ebuild |  9 ++++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'app-text/highlight')

diff --git a/app-text/highlight/ChangeLog b/app-text/highlight/ChangeLog
index 8a90e1d08a1a..3aee509bb19e 100644
--- a/app-text/highlight/ChangeLog
+++ b/app-text/highlight/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/highlight
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.41 2011/06/08 18:37:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.42 2011/06/25 14:54:52 grobian Exp $
+
+  25 Jun 2011; Fabian Groffen <grobian@gentoo.org> highlight-3.5.ebuild:
+  Fix for Prefix
 
   08 Jun 2011; Markus Meier <maekke@gentoo.org> highlight-3.3.ebuild:
   x86 stable, bug #369715
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index ea902b4a06c5..a59885bfce8b 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -7,13 +7,13 @@ DIST highlight-3.3.tar.bz2 740651 RMD160 9a020443e70c0c19215a3bfa14ea78493df98a2
 DIST highlight-3.5.tar.bz2 756541 RMD160 257ed4992311e8a95096cd4ac29ee7b400f086ad SHA1 0e57b45103b6f471a96f987f98dc5e09fed138b5 SHA256 485c1ad40ba7ade4f42ff14055c13317e3ea361e0556f95f5eb558ee446bf14a
 EBUILD highlight-2.9.ebuild 1508 RMD160 d8f7e81f289eb41d232c2178a27ef999420a12ab SHA1 7a65727050fed262ab9b4ac623ed42d6e6b0a0cf SHA256 88a00e3c60f37f25e13f81c6c507c2015851c3fc77cf518806c039be3d931b37
 EBUILD highlight-3.3.ebuild 1569 RMD160 5bf3497d8e7f26dda7118eb56a376797496f2657 SHA1 c3e8ff08046d2b1b54335dc8a77c3a0ff20e906c SHA256 a7bf2763b53002e62d907605a5d2a4c59044d1be669332fdcaa8f747f27dad62
-EBUILD highlight-3.5.ebuild 1519 RMD160 916fac22320859931892756f91d599d45ffd9107 SHA1 29fad8bf9d7d534a7ff06863e350527a46551d6d SHA256 c9f9a20ab95487b3e4a0d1ed48d11d0a0bb48d2176087148177c8334311dce64
-MISC ChangeLog 5546 RMD160 3897a9f8624c96b7489cd89c4702a0ad31a23828 SHA1 6ef3fc50ba55b5f157030ddb42c72a69de88d291 SHA256 66fb4f11d7f846c6d8d0bb5d6bf7cc4178a372bcbed53d7ce47ea3f94d1d6827
+EBUILD highlight-3.5.ebuild 1666 RMD160 09c5450611b9b0cf6d173d6fcaedfa31b600501f SHA1 aec2beb73b28e98cc06b2a28c988e6395843b858 SHA256 c76f67864dffcb19a62f003cb0221c89a4559f77452d800c222046623c86b4e3
+MISC ChangeLog 5638 RMD160 bf42cf76f96e875718325afc63c3715d83a90bb4 SHA1 149d9da804aee8f7403e6db3de18b08a6e6946f3 SHA256 7bc1c18d6c78dfbbaab2933db60f098cb4f5a322d527e0fb1b78dd61015e8165
 MISC metadata.xml 176 RMD160 4c10f88bb3b4c3c8f85b05a0bbef8238212ae884 SHA1 239dc089587796161139a7a9928cee878b99c147 SHA256 be997c23d8e59987382e8e46c1aa92ab261a676a929139908b7a8242d0157e81
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.17 (Darwin)
 
-iEYEARECAAYFAk3vwZEACgkQkKaRLQcq0GLs2gCeNTgA5qIddj6AEC1+QtpnX/o1
-esEAnRDRD7dspqOQRDEcp6PyfO1cbq2s
-=yKHI
+iEYEARECAAYFAk4F9pUACgkQX3X2B8XHTolzpwCgnffEdVK6zzSS0dDdvmMxqnBf
+x30An1l5QGi8jmtUv0elGeJfxheLFLsA
+=dMYK
 -----END PGP SIGNATURE-----
diff --git a/app-text/highlight/highlight-3.5.ebuild b/app-text/highlight/highlight-3.5.ebuild
index 2806e34e0deb..f6277cd6f791 100644
--- a/app-text/highlight/highlight-3.5.ebuild
+++ b/app-text/highlight/highlight-3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.5.ebuild,v 1.1 2011/06/04 08:12:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.5.ebuild,v 1.2 2011/06/25 14:54:52 grobian Exp $
 
 EAPI=4
 
@@ -27,8 +27,11 @@ pkg_setup() {
 		"AR=$(tc-getAR)"
 		"LDFLAGS=${LDFLAGS}"
 		"CFLAGS=${CXXFLAGS}"
-		"DESTDIR=${ED}"
+		"DESTDIR=${D}"
 		"PREFIX=${EPREFIX}/usr"
+		"LUA_CFLAGS="
+		"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+		"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
 		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
 		"conf_dir=${EPREFIX}/etc/highlight/"
 	)
@@ -43,7 +46,7 @@ src_compile() {
 	emake -f makefile "${myhlopts[@]}"
 	if use qt4 ; then
 		cd src/gui-qt
-		eqmake4 'DEFINES+=DATA_DIR=\\\"/usr/share/${PN}/\\\" CONFIG_DIR=\\\"/etc/${PN}/\\\" DOC_DIR=\\\"/usr/share/doc/${PF}/\\\"'
+		eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
 		emake
 	fi
 }
-- 
cgit v1.2.3-65-gdbad