| 1 |
radhermit 11/06/02 11:38:20 |
| 2 |
|
| 3 |
Modified: ChangeLog highlight-3.4.ebuild highlight-3.3.ebuild |
| 4 |
Log: |
| 5 |
Respect C(XX)FLAGS (bug #217964), respect LDFLAGS (bug #369793), and add dependency on qt-core. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.37 app-text/highlight/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/ChangeLog?rev=1.37&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/ChangeLog?rev=1.37&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/ChangeLog?r1=1.36&r2=1.37 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v |
| 19 |
retrieving revision 1.36 |
| 20 |
retrieving revision 1.37 |
| 21 |
diff -u -r1.36 -r1.37 |
| 22 |
--- ChangeLog 1 Jun 2011 23:54:36 -0000 1.36 |
| 23 |
+++ ChangeLog 2 Jun 2011 11:38:20 -0000 1.37 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for app-text/highlight |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.36 2011/06/01 23:54:36 radhermit Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.37 2011/06/02 11:38:20 radhermit Exp $ |
| 29 |
+ |
| 30 |
+ 02 Jun 2011; Tim Harder <radhermit@g.o> highlight-3.3.ebuild, |
| 31 |
+ highlight-3.4.ebuild: |
| 32 |
+ Respect C(XX)FLAGS (bug #217964), respect LDFLAGS (bug #369793), and add |
| 33 |
+ dependency on qt-core. |
| 34 |
|
| 35 |
*highlight-3.4 (01 Jun 2011) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 app-text/highlight/highlight-3.4.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.4.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.4.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.4.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: highlight-3.4.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.4.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- highlight-3.4.ebuild 1 Jun 2011 23:54:36 -0000 1.1 |
| 53 |
+++ highlight-3.4.ebuild 2 Jun 2011 11:38:20 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.4.ebuild,v 1.1 2011/06/01 23:54:36 radhermit Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.4.ebuild,v 1.2 2011/06/02 11:38:20 radhermit Exp $ |
| 59 |
|
| 60 |
EAPI=4 |
| 61 |
|
| 62 |
@@ -17,13 +17,20 @@ |
| 63 |
|
| 64 |
DEPEND="dev-lang/lua |
| 65 |
dev-libs/boost |
| 66 |
- qt4? ( x11-libs/qt-gui:4 )" |
| 67 |
+ qt4? ( x11-libs/qt-gui:4 |
| 68 |
+ x11-libs/qt-core:4 )" |
| 69 |
RDEPEND="${DEPEND}" |
| 70 |
|
| 71 |
pkg_setup() { |
| 72 |
myhlopts=( |
| 73 |
"CXX=$(tc-getCXX)" |
| 74 |
- "DESTDIR=${D}" |
| 75 |
+ "LINK=$(tc-getCXX)" |
| 76 |
+ "AR=$(tc-getAR)" |
| 77 |
+ "LDFLAGS=${LDFLAGS}" |
| 78 |
+ "LFLAGS=${LDFLAGS}" |
| 79 |
+ "CXXFLAGS=${CXXFLAGS}" |
| 80 |
+ "CFLAGS=${CXXFLAGS}" |
| 81 |
+ "DESTDIR=${ED}" |
| 82 |
"PREFIX=${EPREFIX}/usr" |
| 83 |
"doc_dir=${EPREFIX}/usr/share/doc/${PF}/" |
| 84 |
"conf_dir=${EPREFIX}/etc/highlight/" |
| 85 |
@@ -33,10 +40,6 @@ |
| 86 |
src_prepare() { |
| 87 |
sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \ |
| 88 |
src/core/datadir.cpp || die |
| 89 |
- |
| 90 |
- sed -i -e 's:-O2::' \ |
| 91 |
- -e 's:CFLAGS:CXXFLAGS:g' \ |
| 92 |
- src/makefile || die |
| 93 |
} |
| 94 |
|
| 95 |
src_compile() { |
| 96 |
@@ -51,6 +54,6 @@ |
| 97 |
if use examples ; then |
| 98 |
docompress -x /usr/share/doc/${PF}/examples |
| 99 |
else |
| 100 |
- rm -rf "${D}"/usr/share/doc/${PF}/examples |
| 101 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples |
| 102 |
fi |
| 103 |
} |
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
1.3 app-text/highlight/highlight-3.3.ebuild |
| 108 |
|
| 109 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.3.ebuild?rev=1.3&view=markup |
| 110 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.3.ebuild?rev=1.3&content-type=text/plain |
| 111 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.3.ebuild?r1=1.2&r2=1.3 |
| 112 |
|
| 113 |
Index: highlight-3.3.ebuild |
| 114 |
=================================================================== |
| 115 |
RCS file: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v |
| 116 |
retrieving revision 1.2 |
| 117 |
retrieving revision 1.3 |
| 118 |
diff -u -r1.2 -r1.3 |
| 119 |
--- highlight-3.3.ebuild 9 Feb 2011 11:48:50 -0000 1.2 |
| 120 |
+++ highlight-3.3.ebuild 2 Jun 2011 11:38:20 -0000 1.3 |
| 121 |
@@ -1,6 +1,6 @@ |
| 122 |
# Copyright 1999-2011 Gentoo Foundation |
| 123 |
# Distributed under the terms of the GNU General Public License v2 |
| 124 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.2 2011/02/09 11:48:50 radhermit Exp $ |
| 125 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.3 2011/06/02 11:38:20 radhermit Exp $ |
| 126 |
|
| 127 |
EAPI=4 |
| 128 |
|
| 129 |
@@ -17,13 +17,20 @@ |
| 130 |
|
| 131 |
DEPEND="dev-lang/lua |
| 132 |
dev-libs/boost |
| 133 |
- qt4? ( x11-libs/qt-gui:4 )" |
| 134 |
+ qt4? ( x11-libs/qt-gui:4 |
| 135 |
+ x11-libs/qt-core:4 )" |
| 136 |
RDEPEND="${DEPEND}" |
| 137 |
|
| 138 |
pkg_setup() { |
| 139 |
myhlopts=( |
| 140 |
"CXX=$(tc-getCXX)" |
| 141 |
- "DESTDIR=${D}" |
| 142 |
+ "LINK=$(tc-getCXX)" |
| 143 |
+ "AR=$(tc-getAR)" |
| 144 |
+ "LDFLAGS=${LDFLAGS}" |
| 145 |
+ "LFLAGS=${LDFLAGS}" |
| 146 |
+ "CXXFLAGS=${CXXFLAGS}" |
| 147 |
+ "CFLAGS=${CXXFLAGS}" |
| 148 |
+ "DESTDIR=${ED}" |
| 149 |
"PREFIX=${EPREFIX}/usr" |
| 150 |
"doc_dir=${EPREFIX}/usr/share/doc/${PF}/" |
| 151 |
"conf_dir=${EPREFIX}/etc/highlight/" |
| 152 |
@@ -35,10 +42,6 @@ |
| 153 |
|
| 154 |
sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \ |
| 155 |
src/core/datadir.cpp || die |
| 156 |
- |
| 157 |
- sed -i -e 's:-O2::' \ |
| 158 |
- -e 's:CFLAGS:CXXFLAGS:g' \ |
| 159 |
- src/makefile || die |
| 160 |
} |
| 161 |
|
| 162 |
src_compile() { |
| 163 |
@@ -53,6 +56,6 @@ |
| 164 |
if use examples ; then |
| 165 |
docompress -x /usr/share/doc/${PF}/examples |
| 166 |
else |
| 167 |
- rm -rf "${D}"/usr/share/doc/${PF}/examples |
| 168 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples |
| 169 |
fi |
| 170 |
} |
Archives