From: Steve Dibb Date: Mon, 11 Dec 2006 18:53:13 +0000 (+0000) Subject: Add minimal, debug use flags X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6caa6b0537440ccc2138382f81e98dfe5273e9d6;p=gentoo.git Add minimal, debug use flags Package-Manager: portage-2.1.1-r2 --- diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog index 0b1d0d73175d..00a05139dd9a 100644 --- a/x11-wm/icewm/ChangeLog +++ b/x11-wm/icewm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-wm/icewm # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.114 2006/12/11 18:12:00 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.115 2006/12/11 18:53:13 beandog Exp $ + + 11 Dec 2006; Steve Dibb icewm-1.2.29.ebuild: + Add minimal, debug use flags 11 Dec 2006; Steve Dibb -files/icewm-1.2.25-gcc41.patch, -files/icewm-1.2.25.ybutton.cc.patch, diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest index 99ebb7665fab..5466bef8131b 100644 --- a/x11-wm/icewm/Manifest +++ b/x11-wm/icewm/Manifest @@ -25,14 +25,14 @@ EBUILD icewm-1.2.26.ebuild 2350 RMD160 04a142bc2f31d67e35746e94535b6ed261bcca30 MD5 b63669e020d2f775834a4dab8321d1a0 icewm-1.2.26.ebuild 2350 RMD160 04a142bc2f31d67e35746e94535b6ed261bcca30 icewm-1.2.26.ebuild 2350 SHA256 a222066379dc011c9cd33479eb9893ed761869488337c67fcb62de64c2a1f28d icewm-1.2.26.ebuild 2350 -EBUILD icewm-1.2.29.ebuild 2272 RMD160 4a91e5cf199850fa1d1fca17b09eb7be49cce250 SHA1 10405ef7fb8350f491be11fd70f486acbda54cd6 SHA256 2563fe90c52ae503b92765246b8d994b6aebc9f0496bd117537725b09546681f -MD5 58a9f975949926a2765e1255564984af icewm-1.2.29.ebuild 2272 -RMD160 4a91e5cf199850fa1d1fca17b09eb7be49cce250 icewm-1.2.29.ebuild 2272 -SHA256 2563fe90c52ae503b92765246b8d994b6aebc9f0496bd117537725b09546681f icewm-1.2.29.ebuild 2272 -MISC ChangeLog 18373 RMD160 ac781a1db9d1ce0a6c8cf8962688f1936c5c2fc7 SHA1 a086092b3379257ed04098130155601b93d57a63 SHA256 b9bf5456631ccea66399d730f79d50e10960e8240c2d64019f5971449b0f5a91 -MD5 20acc296419f39b9d8175591b806de63 ChangeLog 18373 -RMD160 ac781a1db9d1ce0a6c8cf8962688f1936c5c2fc7 ChangeLog 18373 -SHA256 b9bf5456631ccea66399d730f79d50e10960e8240c2d64019f5971449b0f5a91 ChangeLog 18373 +EBUILD icewm-1.2.29.ebuild 2581 RMD160 695569d897e361cbb35895bc65ba1c936126aa25 SHA1 2d3a1aa99301f0280c774fff13c02f1b88d02430 SHA256 25ae25cb4633312d784b0e6e52d6c5d8c07d4ddf7dfb19dccd3ec9e7de43db4e +MD5 3fc7cc8eb0cabe9bbe44e28e6ba29d8a icewm-1.2.29.ebuild 2581 +RMD160 695569d897e361cbb35895bc65ba1c936126aa25 icewm-1.2.29.ebuild 2581 +SHA256 25ae25cb4633312d784b0e6e52d6c5d8c07d4ddf7dfb19dccd3ec9e7de43db4e icewm-1.2.29.ebuild 2581 +MISC ChangeLog 18473 RMD160 8b01dcc18d7cf62bfaf25bb9684c88d61283910d SHA1 fa65a8bcf5a64eba029e341a97211210a327ffd3 SHA256 eb873f1438875c2cace84457d23b37270a4742cdbe190b52ec8212cf74801131 +MD5 293d2b931e6173d8744716f03242f4c5 ChangeLog 18473 +RMD160 8b01dcc18d7cf62bfaf25bb9684c88d61283910d ChangeLog 18473 +SHA256 eb873f1438875c2cace84457d23b37270a4742cdbe190b52ec8212cf74801131 ChangeLog 18473 MISC metadata.xml 568 RMD160 6af034687e9596288f7212e543ac221460451987 SHA1 ef2e580fcbd02a68f12b6b0e5852fa57960a2b2c SHA256 32e899e5a1c5b0150d12a9a23f007c04394c33752f951ad48968438257742b00 MD5 886e6581c64785183696413e8902c022 metadata.xml 568 RMD160 6af034687e9596288f7212e543ac221460451987 metadata.xml 568 diff --git a/x11-wm/icewm/icewm-1.2.29.ebuild b/x11-wm/icewm/icewm-1.2.29.ebuild index 5711d53951dc..57f27919bfa3 100644 --- a/x11-wm/icewm/icewm-1.2.29.ebuild +++ b/x11-wm/icewm/icewm-1.2.29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.29.ebuild,v 1.2 2006/12/11 18:12:00 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.29.ebuild,v 1.3 2006/12/11 18:53:13 beandog Exp $ inherit eutils @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="esd imlib nls spell truetype xinerama" +IUSE="esd imlib nls spell truetype xinerama minimal debug" RDEPEND="|| ( ( x11-libs/libXau @@ -47,37 +47,46 @@ DEPEND="${RDEPEND} virtual/x11 ) >=sys-apps/sed-4" +pkg_setup() { + if use truetype && use minimal; then + ewarn "You have both 'truetype' and 'minimal' use flags enabled." + ewarn "If you really want a minimal install, you will have to turn off" + ewarn "the truetype flag for this package." + fi +} + src_unpack() { unpack ${A} - cd ${S}/src echo "#!/bin/sh" > $T/icewm echo "/usr/bin/icewm-session" >> $T/icewm - } -src_compile(){ +src_compile() { if use truetype then myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations" else - myconf="${myconf} --disable-xfreetype --enable-corefonts" + myconf="${myconf} --disable-xfreetype --enable-corefonts + $(use_enable minimal lite)" fi - CXXFLAGS="${CXXFLAGS}" econf \ - --with-libdir=/usr/share/icewm \ - --with-cfgdir=/etc/icewm \ - --with-docdir=/usr/share/doc/${PF}/html \ - $(use_with esd esd-config /usr/bin/esd-config) \ - $(use_enable nls) \ - $(use_enable nls i18n) \ - $(use_with imlib) \ - $(use_enable spell GtkSpell) \ - $(use_enable x86 x86-asm) \ - $(use_enable xinerama) \ - ${myconf} || die "configure failed" + myconf="${myconf} + --with-libdir=/usr/share/icewm + --with-cfgdir=/etc/icewm + --with-docdir=/usr/share/doc/${PF}/html + $(use_with esd esd-config /usr/bin/esd-config) + $(use_enable nls) + $(use_enable nls i18n) + $(use_with imlib) + $(use_enable spell GtkSpell) + $(use_enable x86 x86-asm) + $(use_enable xinerama) + $(use_enable debug)" + + CXXFLAGS="${CXXFLAGS}" econf ${myconf} || die "configure failed" sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed" sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"