summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-06-02 11:38:20 +0000
committerTim Harder <radhermit@gentoo.org>2011-06-02 11:38:20 +0000
commit8642da7b9efe3adeb2f0066c6879ff75e813254d (patch)
tree2d14746d426881e0e94f0953d5e27c6ff973b14f /app-text
parentVersion bump to 0.9.7.1 (diff)
downloadhistorical-8642da7b9efe3adeb2f0066c6879ff75e813254d.tar.gz
historical-8642da7b9efe3adeb2f0066c6879ff75e813254d.tar.bz2
historical-8642da7b9efe3adeb2f0066c6879ff75e813254d.zip
Respect C(XX)FLAGS (bug #217964), respect LDFLAGS (bug #369793), and add dependency on qt-core.
Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64
Diffstat (limited to 'app-text')
-rw-r--r--app-text/highlight/ChangeLog7
-rw-r--r--app-text/highlight/Manifest20
-rw-r--r--app-text/highlight/highlight-3.3.ebuild19
-rw-r--r--app-text/highlight/highlight-3.4.ebuild19
4 files changed, 38 insertions, 27 deletions
diff --git a/app-text/highlight/ChangeLog b/app-text/highlight/ChangeLog
index f9edc50902ae..960bdaa55212 100644
--- a/app-text/highlight/ChangeLog
+++ b/app-text/highlight/ChangeLog
@@ -1,6 +1,11 @@
# 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.36 2011/06/01 23:54:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.37 2011/06/02 11:38:20 radhermit Exp $
+
+ 02 Jun 2011; Tim Harder <radhermit@gentoo.org> highlight-3.3.ebuild,
+ highlight-3.4.ebuild:
+ Respect C(XX)FLAGS (bug #217964), respect LDFLAGS (bug #369793), and add
+ dependency on qt-core.
*highlight-3.4 (01 Jun 2011)
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 26a0cad30dcb..6c50b96c6668 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -6,18 +6,18 @@ DIST highlight-2.9.tar.bz2 378746 RMD160 b058772aaeb2cc844cb0ae620c2866d02884b59
DIST highlight-3.3.tar.bz2 740651 RMD160 9a020443e70c0c19215a3bfa14ea78493df98a24 SHA1 338fdecc1b30002a8d6624ace76fe2daba05ced4 SHA256 96c415d62488c6522e9933ecdfce447eb8eecd3b88a1064f42908c936ea02d87
DIST highlight-3.4.tar.bz2 755597 RMD160 55e6b808e08eb3c160ded9b04f1e16d0e477240e SHA1 c17ab1dfb052fee807c3d48c7577b5d8fc1b5593 SHA256 6c3159465e8973917e0a7cbb964c27c2dc91db8b4ad49a0ae7034aa04c66fa9e
EBUILD highlight-2.9.ebuild 1508 RMD160 d8f7e81f289eb41d232c2178a27ef999420a12ab SHA1 7a65727050fed262ab9b4ac623ed42d6e6b0a0cf SHA256 88a00e3c60f37f25e13f81c6c507c2015851c3fc77cf518806c039be3d931b37
-EBUILD highlight-3.3.ebuild 1433 RMD160 e84c7184ea16632ed0cdbc017ececf219eba0423 SHA1 513304ea2177c0d3ab043a99f0b45c53ca8f5377 SHA256 70bdf84afc4ef42963ce8c6dc1a092d1d7aec036aa3ecfb4b31ce32c73b04cf0
-EBUILD highlight-3.4.ebuild 1378 RMD160 692c7f0656b2b18b64589c924743ad23a6ce68d8 SHA1 eab85ea91a111f5a18b26e84778423a5b5b85622 SHA256 b1f82d19e7dd98d6c3b0f9b5c4fd0713cdf1c3ef047facb8d6ab2d68085bb591
-MISC ChangeLog 4849 RMD160 ad4930bb46e02c11fcf74115441c9c260beb42f3 SHA1 c77e8b3ae9bf7e56745e052f61779484ce049e14 SHA256 75ec5019118c8eca4a35de8f8b67ca917f13e1e98907db92bbfebc5040a824cc
+EBUILD highlight-3.3.ebuild 1515 RMD160 b388f205793a4ae4856f9425ed4e08052980bd1d SHA1 b23c0d6cf1f7f5ce966b5235a1f7ee2d2b3922dd SHA256 87d2f038c8f656b49aa78a57b06ab5db4ef46e33a14e8371cab30df453ba0541
+EBUILD highlight-3.4.ebuild 1460 RMD160 d2ff3651353092617fcd2670cb899274e23d2141 SHA1 cefaa211542b0de829c9e50cc176081e74bca73c SHA256 c281d52bdb23159e54cbdaf817b082dccdc650831c2d64a5393b08014a2b35e2
+MISC ChangeLog 5045 RMD160 e04317a1b48e4bbd7cb9c9cf274e99a7501578d2 SHA1 4f342af954955b72721b40cb5c36a6ef6e1195b1 SHA256 6b384c9af5fab1b47816b0932dd7bca687eee8700c43378d90039d422082945a
MISC metadata.xml 176 RMD160 4c10f88bb3b4c3c8f85b05a0bbef8238212ae884 SHA1 239dc089587796161139a7a9928cee878b99c147 SHA256 be997c23d8e59987382e8e46c1aa92ab261a676a929139908b7a8242d0157e81
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBAgAGBQJN5tFHAAoJEEqz6FtPBkyjAJgH/jGgta3k2Ro2DZ9ucYFfjhQz
-EneaKgukZTJeja/jNh91r7u/BSoIRE6Eu169QgPhBxuNYvqBi/Gu4/hn3PTnJ0lc
-rsy4mNdH+AyDfpMJ8UQ9UM8EcYQe2uhzyQoDnYm8+1kUCuta3LNQwpIEWk22N/PL
-BBXlJTERtAt5/6GaohjKC5bTB0iUQtFT6yHHBJ2Xqe6yBWIItp3/sm9HBiDP1v5e
-ZKJpkicQUBp9CtE9NaOzIw64jhZ+BLMZAm1FXkdGSz+JrsyIBa7kIcxszxulA7aA
-SL0N++PbrjPwNxXDLzKcC+cIh/ye7a/S65JTySNjmg8m/ZAoBThmcLzhGIbmxDk=
-=1tx8
+iQEcBAEBAgAGBQJN53Y1AAoJEEqz6FtPBkyjsYIH/AizuSVw8mW23Bxf3aM2zVNl
+E4dpERqkeqjTqxr8pXj3KX1u03/+nhuphA5GESs2+fektho4Vjs1Dc5tb/+RvIFo
+fRv2M9KULMsFTfn2+LJlfZajaEAuXQypthFgGwMNa1dXDCrac45/1UTjIOnTEMuh
+vBKWrgGSXshs97Wnqo9twcSXQDdSPgIti9GQDrtwf66ZZyc6iUD8ztL6IYqO+gKa
+1xfmGDGkhLf0bffgKqTkg7P5KFZuAsRkUv4Wdxz4wfpztQc2mnpQCdjcEMbHpiLw
+unVx2yB6QRTTPjqJ2rcC9CiwJY2/EjOavnPKUz+sWd/BbkESzm9//xMifWbBxbg=
+=rpnz
-----END PGP SIGNATURE-----
diff --git a/app-text/highlight/highlight-3.3.ebuild b/app-text/highlight/highlight-3.3.ebuild
index afa3f4e7231d..28c84945a4d1 100644
--- a/app-text/highlight/highlight-3.3.ebuild
+++ b/app-text/highlight/highlight-3.3.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.3.ebuild,v 1.2 2011/02/09 11:48:50 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.3 2011/06/02 11:38:20 radhermit Exp $
EAPI=4
@@ -17,13 +17,20 @@ IUSE="examples qt4"
DEPEND="dev-lang/lua
dev-libs/boost
- qt4? ( x11-libs/qt-gui:4 )"
+ qt4? ( x11-libs/qt-gui:4
+ x11-libs/qt-core:4 )"
RDEPEND="${DEPEND}"
pkg_setup() {
myhlopts=(
"CXX=$(tc-getCXX)"
- "DESTDIR=${D}"
+ "LINK=$(tc-getCXX)"
+ "AR=$(tc-getAR)"
+ "LDFLAGS=${LDFLAGS}"
+ "LFLAGS=${LDFLAGS}"
+ "CXXFLAGS=${CXXFLAGS}"
+ "CFLAGS=${CXXFLAGS}"
+ "DESTDIR=${ED}"
"PREFIX=${EPREFIX}/usr"
"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
"conf_dir=${EPREFIX}/etc/highlight/"
@@ -35,10 +42,6 @@ src_prepare() {
sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
src/core/datadir.cpp || die
-
- sed -i -e 's:-O2::' \
- -e 's:CFLAGS:CXXFLAGS:g' \
- src/makefile || die
}
src_compile() {
@@ -53,6 +56,6 @@ src_install() {
if use examples ; then
docompress -x /usr/share/doc/${PF}/examples
else
- rm -rf "${D}"/usr/share/doc/${PF}/examples
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples
fi
}
diff --git a/app-text/highlight/highlight-3.4.ebuild b/app-text/highlight/highlight-3.4.ebuild
index 2341dc9dd132..cb0c31855e75 100644
--- a/app-text/highlight/highlight-3.4.ebuild
+++ b/app-text/highlight/highlight-3.4.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.4.ebuild,v 1.1 2011/06/01 23:54:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.4.ebuild,v 1.2 2011/06/02 11:38:20 radhermit Exp $
EAPI=4
@@ -17,13 +17,20 @@ IUSE="examples qt4"
DEPEND="dev-lang/lua
dev-libs/boost
- qt4? ( x11-libs/qt-gui:4 )"
+ qt4? ( x11-libs/qt-gui:4
+ x11-libs/qt-core:4 )"
RDEPEND="${DEPEND}"
pkg_setup() {
myhlopts=(
"CXX=$(tc-getCXX)"
- "DESTDIR=${D}"
+ "LINK=$(tc-getCXX)"
+ "AR=$(tc-getAR)"
+ "LDFLAGS=${LDFLAGS}"
+ "LFLAGS=${LDFLAGS}"
+ "CXXFLAGS=${CXXFLAGS}"
+ "CFLAGS=${CXXFLAGS}"
+ "DESTDIR=${ED}"
"PREFIX=${EPREFIX}/usr"
"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
"conf_dir=${EPREFIX}/etc/highlight/"
@@ -33,10 +40,6 @@ pkg_setup() {
src_prepare() {
sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
src/core/datadir.cpp || die
-
- sed -i -e 's:-O2::' \
- -e 's:CFLAGS:CXXFLAGS:g' \
- src/makefile || die
}
src_compile() {
@@ -51,6 +54,6 @@ src_install() {
if use examples ; then
docompress -x /usr/share/doc/${PF}/examples
else
- rm -rf "${D}"/usr/share/doc/${PF}/examples
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples
fi
}