summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Szymaniak <lazy_bum@o2.pl>2011-06-29 20:13:38 +0000
committerPiotr Szymaniak <lazy_bum@o2.pl>2011-06-29 20:13:38 +0000
commitf76b46187541b3b5ee752de83281d00ccf10d8fd (patch)
tree38d17b67688f3f3a2e2e9dba5bab8107819f7697 /sys-apps
parentlicenses/ BSD-NAR: BSD-NAR (diff)
downloadsunrise-f76b46187541b3b5ee752de83281d00ccf10d8fd.tar.gz
sunrise-f76b46187541b3b5ee752de83281d00ccf10d8fd.tar.bz2
sunrise-f76b46187541b3b5ee752de83281d00ccf10d8fd.zip
sys-apps/remendeko: EAPI bump, sorted depends and fixed build without gtk.
svn path=/sunrise/; revision=12180
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/remendeko/ChangeLog3
-rw-r--r--sys-apps/remendeko/Manifest4
-rw-r--r--sys-apps/remendeko/remendeko-0.3.0.ebuild24
3 files changed, 21 insertions, 10 deletions
diff --git a/sys-apps/remendeko/ChangeLog b/sys-apps/remendeko/ChangeLog
index 7b925438f..c15cd8bdc 100644
--- a/sys-apps/remendeko/ChangeLog
+++ b/sys-apps/remendeko/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Jun 2011; Piotr Szymaniak <szarpaj@grubelek.pl> remendeko-0.3.0.ebuild:
+ EAPI bump, sorted depends and fixed build without gtk.
+
30 Apr 2011; Justin Lecher <jlec@gentoo.org> remendeko-0.3.0.ebuild:
Fix deps for gnome3, Do not strip, respect LDFLAGS
diff --git a/sys-apps/remendeko/Manifest b/sys-apps/remendeko/Manifest
index 0f0cc7705..e6e111faa 100644
--- a/sys-apps/remendeko/Manifest
+++ b/sys-apps/remendeko/Manifest
@@ -1,4 +1,4 @@
DIST RemenDeKO-0.3.0.tar.bz2 17009 RMD160 34ed341bad7224c606dc9cd6d2c776965ef2c866 SHA1 b7003353f420f2dfdb6626d9b5b2f59e7ab3620c SHA256 cb6b25a27f60fedbdc5e1806e4a342a3f4fd46139baf6e93719f1fba6cb097a8
-EBUILD remendeko-0.3.0.ebuild 1100 RMD160 31dbad1d9626a469c3174c9bf0221a0185879e9c SHA1 46c39f1c083741918a9cb0458549215bf8d4a77f SHA256 e452d9f36d36ed738f7b05261d748e54316ce2a968457c704a2a5372ba0f7d83
-MISC ChangeLog 835 RMD160 05ac7f5f841274f319f7d591df85bd9a430d853e SHA1 0f393c3d5ad54c23b4e42a8eb542a20c8f52a913 SHA256 109120a62137a4b58db0d28daf6ff8009312736e5cea27afeb57d2f834b01849
+EBUILD remendeko-0.3.0.ebuild 1229 RMD160 014b0ea0cc3b9e15665d506e7ffc675a412d12d7 SHA1 8a7324cbfaa5c2e599bb2c68a0db01b687038a75 SHA256 84a33d2fa259a790cc8e36abee69bd0c5517e5fb0ebc2e92668344485d4516e0
+MISC ChangeLog 970 RMD160 d6e0e55eb2bea937b41b904afd6849587f42c2b1 SHA1 1600a873daf6b5fd55000826292b660c1993e78f SHA256 9087cacbd6323e516887d0b3744e7a598db584fed70489cd177a20d289e2f041
MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/sys-apps/remendeko/remendeko-0.3.0.ebuild b/sys-apps/remendeko/remendeko-0.3.0.ebuild
index a85cbd711..3197233c0 100644
--- a/sys-apps/remendeko/remendeko-0.3.0.ebuild
+++ b/sys-apps/remendeko/remendeko-0.3.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=4
inherit toolchain-funcs
@@ -17,9 +17,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
IUSE="gtk"
RDEPEND="gtk? ( x11-libs/gtk+:2 )"
-
DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.15"
+ gtk? ( >=dev-util/pkgconfig-0.15 )"
S=${WORKDIR}/${MY_PN}
@@ -29,9 +28,18 @@ src_prepare() {
-e 's:$(CC) $(LINKOBJ:$(CC) $(LDFLAGS) $(LINKOBJ:g' \
-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
- -e "s:^\(CFLAGSGUI = \).*$:\1${CFLAGS} -DUSEGUI -Wall \
- `pkg-config gtk+-2.0 gthread-2.0 --cflags`:" \
Makefile || die "sed Makefile failed"
+
+ if use gtk; then
+ sed -i \
+ -e "s:^\(CFLAGSGUI = \).*$:\1${CFLAGS} -DUSEGUI -Wall \
+ `pkg-config gtk+-2.0 gthread-2.0 --cflags`:" \
+ Makefile || die "sed Makefile failed"
+ else
+ sed -i \
+ -e "s:^\(CFLAGSGUI = \).*$:\1${CFLAGS} -Wall:" \
+ Makefile || die "sed Makefile failed"
+ fi
}
src_compile() {
@@ -43,7 +51,7 @@ src_compile() {
}
src_install() {
- dodoc CHANGELOG || die "dodoc failed"
- dobin rdko || die "dobin failed"
- use gtk && dobin gredeko || die "dobin failed"
+ dobin rdko
+ use gtk && dobin gredeko
+ dodoc CHANGELOG
}