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 | 6a071c144ac29190685b051fad7f891f0210ae12 (patch) | |
| tree | 64f57b0420fa4470913ebca3495d5aceb01d2aa5 /app-text | |
| parent | Make build again, EAPI bump, no prestripped files (bug 252030) (diff) | |
| download | historical-6a071c144ac29190685b051fad7f891f0210ae12.tar.gz historical-6a071c144ac29190685b051fad7f891f0210ae12.tar.bz2 historical-6a071c144ac29190685b051fad7f891f0210ae12.zip | |
Use eqmake4 and remove redundant flags.
Package-Manager: portage-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/Manifest | 20 | ||||
| -rw-r--r-- | app-text/highlight/highlight-3.3.ebuild | 13 | ||||
| -rw-r--r-- | app-text/highlight/highlight-3.4.ebuild | 13 |
4 files changed, 29 insertions, 23 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/Manifest b/app-text/highlight/Manifest index 6c50b96c6668..f5f94f81e50c 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 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 +EBUILD highlight-3.3.ebuild 1574 RMD160 4ce74f8f1397904cd8e3340dc9fd0b1809f8c036 SHA1 261064da0797676528d76f344ce0b68136edd758 SHA256 768496aea02d8e0da54679a233dd2a03931bd7253b04cffd5f158c2575588085 +EBUILD highlight-3.4.ebuild 1519 RMD160 48b1a04ae059dd0a819bd4935f8e0cdfb7057db2 SHA1 7a7f3bd0912cf93b3e31e90e9a03fdcfe23f163a SHA256 bb4e3d75e04360b79affc46833863f7939f793be8f4e3532a168c8dfac61dcab +MISC ChangeLog 5183 RMD160 ad3702f87f5313791fe36bbbfa1c945dece8e1d5 SHA1 8d5f70ed26d980aaa123db1b9f118640f7c8d400 SHA256 5298265c4263444791909f241824924d8a1867d2f705434b2ca2b376f56f851d MISC metadata.xml 176 RMD160 4c10f88bb3b4c3c8f85b05a0bbef8238212ae884 SHA1 239dc089587796161139a7a9928cee878b99c147 SHA256 be997c23d8e59987382e8e46c1aa92ab261a676a929139908b7a8242d0157e81 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJN53Y1AAoJEEqz6FtPBkyjsYIH/AizuSVw8mW23Bxf3aM2zVNl -E4dpERqkeqjTqxr8pXj3KX1u03/+nhuphA5GESs2+fektho4Vjs1Dc5tb/+RvIFo -fRv2M9KULMsFTfn2+LJlfZajaEAuXQypthFgGwMNa1dXDCrac45/1UTjIOnTEMuh -vBKWrgGSXshs97Wnqo9twcSXQDdSPgIti9GQDrtwf66ZZyc6iUD8ztL6IYqO+gKa -1xfmGDGkhLf0bffgKqTkg7P5KFZuAsRkUv4Wdxz4wfpztQc2mnpQCdjcEMbHpiLw -unVx2yB6QRTTPjqJ2rcC9CiwJY2/EjOavnPKUz+sWd/BbkESzm9//xMifWbBxbg= -=rpnz +iQEcBAEBAgAGBQJN5+HpAAoJEEqz6FtPBkyjKkEIAJfHRE1y3tHlcKWAk26WNUK7 +rNsJbjKSffKe7dvZ1Jy1cMNISdECfZuqlBOMTBwLZ7ukvTnBapMF8G1EQPdw4NIL +Ng/wzW0GyOgD+ViFVe5xUpP0n02hn1RVKZdyL9ZCh9YB4Y3Zn3pW4cGLcFxm+K3y ++zQYnb6izYyEFfuE8NgBZxzSIFBzqet6v72MrXwmM1O2Wx8/QmCnu5Wx7IFIA6b0 +QqkOn7/K0lynMpcsCnIM2KixPB//ZiBqZqw+Bi5/VALLLJvt2n/mGoOB2gD/FFlY +V1x//qpLNWlr+SLreE9MZG28M+fNa+ERSCmfLJvuWPBGxLxHDanMRcpwe+RGXNg= +=a8OL -----END PGP SIGNATURE----- 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() { |