diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-06-02 19:17:45 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-06-02 19:17:45 +0000 |
| commit | 229d1fa505fbb1ede416a24d2852ccc85593c00b (patch) | |
| tree | aecad56c3cb7f58988ac7dd2d7d10bc0249d02b5 /app-text | |
| parent | Make build again, EAPI bump, no prestripped files (bug 252030) (diff) | |
| download | gentoo-2-229d1fa505fbb1ede416a24d2852ccc85593c00b.tar.gz gentoo-2-229d1fa505fbb1ede416a24d2852ccc85593c00b.tar.bz2 gentoo-2-229d1fa505fbb1ede416a24d2852ccc85593c00b.zip | |
Use eqmake4 and remove redundant flags.
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/highlight/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/highlight/highlight-3.3.ebuild | 13 | ||||
| -rw-r--r-- | app-text/highlight/highlight-3.4.ebuild | 13 |
3 files changed, 19 insertions, 13 deletions
diff --git a/app-text/highlight/ChangeLog b/app-text/highlight/ChangeLog index 960bdaa55212..9c867e171c8c 100644 --- a/app-text/highlight/ChangeLog +++ b/app-text/highlight/ChangeLog @@ -1,6 +1,10 @@ # 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.37 2011/06/02 11:38:20 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.38 2011/06/02 19:17:45 radhermit Exp $ + + 02 Jun 2011; Tim Harder <radhermit@gentoo.org> highlight-3.3.ebuild, + highlight-3.4.ebuild: + Use eqmake4 and remove redundant flags. 02 Jun 2011; Tim Harder <radhermit@gentoo.org> highlight-3.3.ebuild, highlight-3.4.ebuild: diff --git a/app-text/highlight/highlight-3.3.ebuild b/app-text/highlight/highlight-3.3.ebuild index 28c84945a4d1..bd74dc891b30 100644 --- a/app-text/highlight/highlight-3.3.ebuild +++ b/app-text/highlight/highlight-3.3.ebuild @@ -1,10 +1,10 @@ # 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.3 2011/06/02 11:38:20 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.4 2011/06/02 19:17:45 radhermit Exp $ EAPI=4 -inherit toolchain-funcs eutils +inherit toolchain-funcs eutils qt4-r2 DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight" HOMEPAGE="http://www.andre-simon.de/" @@ -24,11 +24,8 @@ RDEPEND="${DEPEND}" pkg_setup() { myhlopts=( "CXX=$(tc-getCXX)" - "LINK=$(tc-getCXX)" "AR=$(tc-getAR)" "LDFLAGS=${LDFLAGS}" - "LFLAGS=${LDFLAGS}" - "CXXFLAGS=${CXXFLAGS}" "CFLAGS=${CXXFLAGS}" "DESTDIR=${ED}" "PREFIX=${EPREFIX}/usr" @@ -46,7 +43,11 @@ src_prepare() { src_compile() { emake -f makefile "${myhlopts[@]}" - use qt4 && emake -f makefile "${myhlopts[@]}" gui + 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}/\\\"' + emake + fi } src_install() { diff --git a/app-text/highlight/highlight-3.4.ebuild b/app-text/highlight/highlight-3.4.ebuild index cb0c31855e75..178e32734796 100644 --- a/app-text/highlight/highlight-3.4.ebuild +++ b/app-text/highlight/highlight-3.4.ebuild @@ -1,10 +1,10 @@ # 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.2 2011/06/02 11:38:20 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.4.ebuild,v 1.3 2011/06/02 19:17:45 radhermit Exp $ EAPI=4 -inherit toolchain-funcs +inherit toolchain-funcs qt4-r2 DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight" HOMEPAGE="http://www.andre-simon.de/" @@ -24,11 +24,8 @@ RDEPEND="${DEPEND}" pkg_setup() { myhlopts=( "CXX=$(tc-getCXX)" - "LINK=$(tc-getCXX)" "AR=$(tc-getAR)" "LDFLAGS=${LDFLAGS}" - "LFLAGS=${LDFLAGS}" - "CXXFLAGS=${CXXFLAGS}" "CFLAGS=${CXXFLAGS}" "DESTDIR=${ED}" "PREFIX=${EPREFIX}/usr" @@ -44,7 +41,11 @@ src_prepare() { src_compile() { emake -f makefile "${myhlopts[@]}" - use qt4 && emake -f makefile "${myhlopts[@]}" gui + 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}/\\\"' + emake + fi } src_install() { |