summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-01-04 10:14:10 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-01-04 10:14:10 +0000
commit5f9ffaf0331416f85b70419c3ea09a152e897705 (patch)
treed06a33f96d0fd0244c50456f9fec1cb0677f6471 /x11-misc/icecc
parentKeyworded for amd64 wrt bug #299336 (diff)
downloadgentoo-2-5f9ffaf0331416f85b70419c3ea09a152e897705.tar.gz
gentoo-2-5f9ffaf0331416f85b70419c3ea09a152e897705.tar.bz2
gentoo-2-5f9ffaf0331416f85b70419c3ea09a152e897705.zip
Block sys-devel/icecream wrt #299564, thanks to Joost Ruis for reporting.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/icecc')
-rw-r--r--x11-misc/icecc/ChangeLog7
-rw-r--r--x11-misc/icecc/icecc-2.9.ebuild34
2 files changed, 21 insertions, 20 deletions
diff --git a/x11-misc/icecc/ChangeLog b/x11-misc/icecc/ChangeLog
index 7e3183877670..ded245b012c2 100644
--- a/x11-misc/icecc/ChangeLog
+++ b/x11-misc/icecc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/icecc
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/ChangeLog,v 1.28 2008/05/08 12:24:40 phosphan Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/ChangeLog,v 1.29 2010/01/04 10:14:10 ssuominen Exp $
+
+ 04 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> icecc-2.9.ebuild:
+ Block sys-devel/icecream wrt #299564, thanks to Joost Ruis for reporting.
08 May 2008; Patrick Kursawe <phosphan@gentoo.org> icecc-2.9.ebuild:
QA fixes for bug #220094
diff --git a/x11-misc/icecc/icecc-2.9.ebuild b/x11-misc/icecc/icecc-2.9.ebuild
index 0348a0ad840a..4eef1484dfcd 100644
--- a/x11-misc/icecc/icecc-2.9.ebuild
+++ b/x11-misc/icecc/icecc-2.9.ebuild
@@ -1,39 +1,37 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/icecc-2.9.ebuild,v 1.8 2008/05/08 12:24:40 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/icecc-2.9.ebuild,v 1.9 2010/01/04 10:14:10 ssuominen Exp $
-inherit eutils
+EAPI=2
DESCRIPTION="IceWM Control Center (only main program, see icewm-tools for the rest)"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
HOMEPAGE="http://icecc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~amd64"
-IUSE=""
SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
-DEPEND="=x11-libs/qt-3*"
+DEPEND="x11-libs/qt:3
+ !sys-devel/icecream"
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -e "s:/usr/local:/usr:" -i ${PN}.pro || die "sed failed"
+src_prepare() {
+ sed -e "s:/usr/local:/usr:" -i ${PN}.pro || die
echo >> ${PN}.pro -e "QMAKE_CXXFLAGS_RELEASE += ${CXXFLAGS}\nQMAKE_CFLAGS_RELEASE += ${CFLAGS}"
}
-src_compile() {
+src_configure() {
${QTDIR}/bin/qmake || die
+}
+
+src_compile() {
emake || die
}
src_install() {
- make INSTALL_ROOT="${D}" install_themes install_help || die
+ emake INSTALL_ROOT="${D}" install_themes install_help || die
# avoid pre-stripping, see bug #220094
- dobin icecc icecchelp
+ dobin icecc icecchelp || die
dodoc AUTHORS ChangeLog
}
-
-pkg_postinst() {
- einfo "emerge icewm-tools for the control center helper tools"
-}