summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-08-05 19:39:59 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-08-05 19:39:59 +0000
commit71b0aa1b53e84efae9c3aa2e45fd175a67f38393 (patch)
tree5f7f10cb769bc97f06b722e62c2aa1bcac6aea29 /media-gfx/greycstoration
parentFix issue with init script when no virtual machines are running (diff)
downloadhistorical-71b0aa1b53e84efae9c3aa2e45fd175a67f38393.tar.gz
historical-71b0aa1b53e84efae9c3aa2e45fd175a67f38393.tar.bz2
historical-71b0aa1b53e84efae9c3aa2e45fd175a67f38393.zip
Remove USE="X" because it's always required wrt #247731.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-gfx/greycstoration')
-rw-r--r--media-gfx/greycstoration/ChangeLog8
-rw-r--r--media-gfx/greycstoration/Manifest4
-rw-r--r--media-gfx/greycstoration/greycstoration-2.9.ebuild16
3 files changed, 15 insertions, 13 deletions
diff --git a/media-gfx/greycstoration/ChangeLog b/media-gfx/greycstoration/ChangeLog
index 62615f7821f4..9d9c027cedde 100644
--- a/media-gfx/greycstoration/ChangeLog
+++ b/media-gfx/greycstoration/ChangeLog
@@ -1,10 +1,14 @@
# ChangeLog for media-gfx/greycstoration
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/ChangeLog,v 1.6 2010/03/10 15:18:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/ChangeLog,v 1.7 2010/08/05 19:39:59 ssuominen Exp $
+
+ 05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+ greycstoration-2.9.ebuild:
+ Remove USE="X" because it's always required wrt #247731.
10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
greycstoration-2.9.ebuild, +files/greycstoration-2.9-libpng14.patch:
- Fix building with -Wl,--as-needed wrt #247731. Fix building with libpng14.
+ Fix building with libpng14.
15 Dec 2009; Peter Volkov <pva@gentoo.org> metadata.xml:
metadata.xml: put required herd tag.
diff --git a/media-gfx/greycstoration/Manifest b/media-gfx/greycstoration/Manifest
index 2fa010df541e..a11142141427 100644
--- a/media-gfx/greycstoration/Manifest
+++ b/media-gfx/greycstoration/Manifest
@@ -1,5 +1,5 @@
AUX greycstoration-2.9-libpng14.patch 839 RMD160 28f49c33e620135f0f722690d745b60859126e3c SHA1 2388447347ef1d3c5545fcc0ab6c340755016c3b SHA256 2fe78bf4b6b82d15c7f7965694614b376574e1fcbc7043ab046229de88f2fcfe
DIST GREYCstoration-2.9.zip 3639412 RMD160 36aa8b2c261ff101a590dde2a136adebc0e56060 SHA1 afacea96db9cda6bd565055aff2a235572533d1a SHA256 dfc867bffd38fc204b5fe6a3952d7aa4ac53c2b75aabf45102ed7f6022c1c7be
-EBUILD greycstoration-2.9.ebuild 1684 RMD160 7afaa4f80e56517032af3d74c9d8998ae24b461a SHA1 f7aaaff138196afbbac8d6707898b941b6d5af4f SHA256 a98f14611da3edaa31ea45e21624685b558f8ee4210d7fa2a7a1d6843e34d5a2
-MISC ChangeLog 1107 RMD160 b57aa2a00171d440c838df2184b5d2660f05eeb1 SHA1 bcff568e90c80f6a19fc5b4b488f8aec7cec060a SHA256 0ede9b86da852108e1191d33a6d6d13089b99fb4e716220a72ce54011fa6aa4b
+EBUILD greycstoration-2.9.ebuild 1650 RMD160 6f71e55310236c7943be207a0ea1023a46244cdc SHA1 f47abf5dd64ff23c09f169e32f77decca13bbbad SHA256 bfef82419e55a6966a39b241ac43765271bdead0dd242b5a5f4c91f0e736a311
+MISC ChangeLog 1203 RMD160 714e8a048f5af27035947dc7e132b907ef044867 SHA1 84b82e541ac01c5cb023d08312e33f3fff7f4210 SHA256 e3e6c6e31a5dd6f549d11c4ab6d534ef292fae4dba31a867585217b6fca72851
MISC metadata.xml 253 RMD160 c8950662719d03599d036e3eb69d051f3bd510ef SHA1 e2917bed8b1a88dc1c08e5448eda832233343182 SHA256 979ef9baba638b0dea7e0604553bd3eb5c1192a1849b989860525b6243a463a8
diff --git a/media-gfx/greycstoration/greycstoration-2.9.ebuild b/media-gfx/greycstoration/greycstoration-2.9.ebuild
index 2b1d621b464a..da03a9ba9f80 100644
--- a/media-gfx/greycstoration/greycstoration-2.9.ebuild
+++ b/media-gfx/greycstoration/greycstoration-2.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/greycstoration-2.9.ebuild,v 1.2 2010/03/10 15:18:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/greycstoration-2.9.ebuild,v 1.3 2010/08/05 19:39:59 ssuominen Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cimg/GREYCstoration-${PV}.zip"
LICENSE="CeCILL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="fftw imagemagick jpeg lapack png tiff X"
+IUSE="fftw imagemagick jpeg lapack png tiff"
RDEPEND="fftw? ( >=sci-libs/fftw-3 )
imagemagick? ( media-gfx/imagemagick )
@@ -20,9 +20,9 @@ RDEPEND="fftw? ( >=sci-libs/fftw-3 )
lapack? ( virtual/lapack )
png? ( media-libs/libpng )
tiff? ( media-libs/tiff )
- X? ( x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr )"
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr"
DEPEND="${RDEPEND}
app-arch/unzip"
@@ -37,9 +37,8 @@ src_prepare() {
}
src_compile() {
- local myconf
+ local myconf="-Dcimg_use_xshm -Dcimg_use_xrandr -lX11 -lXext -lXrandr"
- use X && myconf+=" -Dcimg_use_xshm -Dcimg_use_xrandr -lX11 -lXext -lXrandr"
use png && myconf+=" -Dcimg_use_png -lpng -lz"
use jpeg && myconf+=" -Dcimg_use_jpeg -ljpeg"
use tiff && myconf+=" -Dcimg_use_tiff -ltiff"
@@ -50,8 +49,7 @@ src_compile() {
$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} -fno-tree-pre \
-o greycstoration greycstoration.cpp \
- ${myconf} -lm -lpthread \
- || die
+ ${myconf} -lm -lpthread || die
}
src_install() {