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
commit4e62e8187e06e906fe6c3e8d8cb3a547a9d1c27c (patch)
tree2d759fb5f5026f08889fb896fe6d3b45aa5538b2 /x11-misc
parentKeyworded for amd64 wrt bug #299336 (diff)
downloadhistorical-4e62e8187e06e906fe6c3e8d8cb3a547a9d1c27c.tar.gz
historical-4e62e8187e06e906fe6c3e8d8cb3a547a9d1c27c.tar.bz2
historical-4e62e8187e06e906fe6c3e8d8cb3a547a9d1c27c.zip
Block sys-devel/icecream wrt #299564, thanks to Joost Ruis for reporting.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/icecc/ChangeLog7
-rw-r--r--x11-misc/icecc/Manifest4
-rw-r--r--x11-misc/icecc/icecc-2.9.ebuild34
3 files changed, 23 insertions, 22 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/Manifest b/x11-misc/icecc/Manifest
index 6629afe5960d..399717823703 100644
--- a/x11-misc/icecc/Manifest
+++ b/x11-misc/icecc/Manifest
@@ -1,4 +1,4 @@
DIST icecc-2.9.tar.bz2 121550 RMD160 9cb70c8df6493eb7984f13821006734459ac0bcc SHA1 acfdf16a71833e80ad2f1267cadf31297050e41d SHA256 860c34d9fa432d0536f589501b996d66b91b52f2dbf703e881580b3a26556356
-EBUILD icecc-2.9.ebuild 1007 RMD160 1d6cdd69655d11db85fa38ec505fb4b7e7793b35 SHA1 2b201ff2c93db246a4563aa52afbd6e3dabdca46 SHA256 72274a04a19b1718f4ca5612b4bd74088712559043a4cc03065d8f4eaff7b285
-MISC ChangeLog 3535 RMD160 66f5a6f01d403f72c40f90084bdf71b224453d13 SHA1 a160c7725c7d2497fefb8b4b2912d14cacebbee1 SHA256 10633789c4b1379d93f32e1dd46f47f7f4cf1f2148a2dc6ee2528693a568893c
+EBUILD icecc-2.9.ebuild 928 RMD160 f1a45e4c8c3e8b6c096fc0aeeebae4327481b0c6 SHA1 25096e0a10cdcabda53f559200b9721988d397bf SHA256 cdecface9c7237253e2e217415783718fdb02df18b0a3dea0fc0b0c67c8bd2af
+MISC ChangeLog 3685 RMD160 b48c8ce1c0956fb4594276ee8c06cba2dc0622f5 SHA1 00f4cedce3c9479e74e7d29c4cad17e0778ac09e SHA256 74f6fde754379bf0ca5cc42cbd63204127e76e0098d3259975db5d2339fb2b00
MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
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"
-}