Forced imlib2 and themes

(Portage version: 2.0.51-r15)

3 files changed, 17 insertions, 46 deletions

diff --git a/x11-wm/pekwm/ChangeLog b/x11-wm/pekwm/ChangeLog
index 46e6043cbed4..11b245918730 100644
--- a/x11-wm/pekwm/ChangeLog
+++ b/x11-wm/pekwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/pekwm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.15 2005/02/01 23:28:38 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.16 2005/02/02 05:37:47 fserb Exp $
+
+  02 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
+  pekwm-20050129.2.ebuild:
+  Forced imlib2 and themes
 
 *pekwm-20050129.2 (01 Feb 2005)
 
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index e119a8e09a74..031a50e1a5f1 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c95238679c52e471b723c9462030cf6a ChangeLog 1701
 MD5 b50d5011f1d3084357bc9ff3d2bb31b4 metadata.xml 608
 MD5 a2e45e5f38ce959b3e309193b7abc4b6 pekwm-0.1.3-r2.ebuild 1006
-MD5 6badd90611fa54674c139bbc5b62e0cc pekwm-20050129.2.ebuild 1858
+MD5 22938cacc05a274b4aaf28aecd75fac0 pekwm-20050129.2.ebuild 1368
 MD5 feb34a062104c0c28685fa05192dc7be files/digest-pekwm-0.1.3-r2 64
 MD5 4eb560893fc98dbaba9b461b71a9df98 files/pekwm-manpath-gentoo.diff 455
 MD5 2da0ad07eea8bd84cc170bb25bddc089 files/digest-pekwm-20050129.2 149
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCABC2xtZcznfol0URArKIAKDCx+6GPOTLFp1Vnbcwwj4PZmln/gCgtulT
-aQ/i7Jx13xM183WLJlLek58=
-=U2Pn
------END PGP SIGNATURE-----
diff --git a/x11-wm/pekwm/pekwm-20050129.2.ebuild b/x11-wm/pekwm/pekwm-20050129.2.ebuild
index b6cbbc988c26..5bc1046812c2 100644
--- a/x11-wm/pekwm/pekwm-20050129.2.ebuild
+++ b/x11-wm/pekwm/pekwm-20050129.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-20050129.2.ebuild,v 1.1 2005/02/01 23:28:38 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-20050129.2.ebuild,v 1.2 2005/02/02 05:37:47 fserb Exp $
 
 inherit eutils
 
@@ -8,12 +8,12 @@ MYPV=${PV/./-}
 MYP=${PN}-dev-${PV%.*}
 S=${WORKDIR}/${MYP}
 
-IUSE="truetype perl xinerama imlib2 debug themes"
+IUSE="truetype perl xinerama debug"
 
 DESCRIPTION="A small window mananger based on aewm++"
 HOMEPAGE="http://pekwm.org"
 SRC_URI="http://pekwm.org/files/${PN}-dev-${MYPV}.tar.bz2
-	themes? ( mirror://gentoo/${P}-themes.tar.bz2 )"
+		mirror://gentoo/${P}-themes.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,57 +22,34 @@ KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 DEPEND="virtual/x11
 	truetype? ( virtual/xft )
 	perl? ( dev-libs/libpcre )
-	imlib2? ( media-libs/imlib2 )
-	themes? ( media-libs/imlib2 )"
+	media-libs/imlib2"
 
 src_unpack() {
 	unpack ${A}
-	if use themes; then
-		unpack ${P}-themes.tar.bz2
-	fi
+	unpack ${P}-themes.tar.bz2
 }
 
 src_compile() {
-	if use imlib2 || use themes; then
-		if ! built_with_use media-libs/imlib2 X ; then
-			ewarn "you must emerge media-libs/imlib2 with X support to use pekwm with imlib2 or themes support"
-			ewarn "please USE=\"X\" emerge media-libs/imlib2 before emerging pekwm"
-			die "Cannot emerge with imlib2 without X USE flag"
-		fi
-	fi
-
-	if use imlib2 || use themes; then
-		UEIM="--enable-imlib2"
-	else
-		UEIM=""
+	if ! built_with_use media-libs/imlib2 X ; then
+		ewarn "you must emerge media-libs/imlib2 with X support to use pekwm"
+		ewarn "please USE=\"X\" emerge media-libs/imlib2 before emerging pekwm"
+		die "Cannot emerge without X USE flag on imlib2"
 	fi
 
 	econf \
 		`use_enable truetype xft` \
 		`use_enable perl pcre` \
 		`use_enable xinerama` \
-		$UEIM \
 		`use_enable debug` \
-		--enable-menus --enable-harbour --enable-shape --enable-xrandr\
+		--enable-menus --enable-harbour --enable-shape --enable-xrandr --enable-imlib2\
 		${myconf} || die
 	emake || die
 }
 
-
 src_install() {
 	make DESTDIR=${D} install || die
 	cd ${S}
 	dodoc AUTHORS ChangeLog
 
-	if use themes; then
-		mv ${WORKDIR}/themes/* ${D}/usr/share/${PN}/themes/
-	fi
-}
-
-pkg_postinst()
-{
-	if ! ( use imlib2 || use themes ); then
-		ewarn "Altough USE=\"imlib2\" support is optional, it's highly recommended to use it"
-		ewarn "since most of the themes for pekwm require imlib2 support"
-	fi
+	mv ${WORKDIR}/themes/* ${D}/usr/share/${PN}/themes/
 }