Remove imlib2 dependency and fix support for jpeg/png images. (bug #157749)

Package-Manager: portage-2.1.2_rc3-r4

3 files changed, 26 insertions, 29 deletions

diff --git a/x11-wm/pekwm/ChangeLog b/x11-wm/pekwm/ChangeLog
index 0866047c0dbf..5eb6c4c4685d 100644
--- a/x11-wm/pekwm/ChangeLog
+++ b/x11-wm/pekwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/pekwm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.27 2006/11/14 04:33:30 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.28 2006/12/14 04:07:16 omp Exp $
+
+  14 Dec 2006; David Shakaryan <omp@gentoo.org> pekwm-0.1.5.ebuild:
+  Remove imlib2 dependency and fix support for jpeg/png images. (bug #157749)
 
   14 Nov 2006; David Shakaryan <omp@gentoo.org> pekwm-0.1.3-r2.ebuild:
   Fix HOMEPAGE in older ebuild.
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index eb0b93f1059b..354a7918ca42 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -12,14 +12,14 @@ EBUILD pekwm-0.1.3-r2.ebuild 1114 RMD160 c2347f9d6dbfdb0809fdfcc525ecdbd0676848c
 MD5 764d18917872d25f4cf8f7efece4a290 pekwm-0.1.3-r2.ebuild 1114
 RMD160 c2347f9d6dbfdb0809fdfcc525ecdbd0676848c4 pekwm-0.1.3-r2.ebuild 1114
 SHA256 e52ff1de4f16162d89a0876494fef79ae359c82d9d6ddc3cf3fee96fbd70ea0a pekwm-0.1.3-r2.ebuild 1114
-EBUILD pekwm-0.1.5.ebuild 1319 RMD160 2b640f92e4dfe9304d6292a18261edec3dcb8fd7 SHA1 4c33f03c421e2ed150119d596821b4bed67e75b0 SHA256 e6e5f08fac5cabbe662a912e63da9e8b26227e5e6ed9c2511e9aa1d7b7863ab1
-MD5 1385dbb6a16430788390d5e9e8621c1a pekwm-0.1.5.ebuild 1319
-RMD160 2b640f92e4dfe9304d6292a18261edec3dcb8fd7 pekwm-0.1.5.ebuild 1319
-SHA256 e6e5f08fac5cabbe662a912e63da9e8b26227e5e6ed9c2511e9aa1d7b7863ab1 pekwm-0.1.5.ebuild 1319
-MISC ChangeLog 3571 RMD160 5b9227f6e0cc2c2e4502fb310880c70fbb11167a SHA1 340a8717ebb72ed970e5c967c3315a29749a4e5c SHA256 d291bd40b153dd0c692ac8c12b0caa86587a83649f9521515283e89ec187fb9c
-MD5 47b84b435ea352379cf17e75ee39a28f ChangeLog 3571
-RMD160 5b9227f6e0cc2c2e4502fb310880c70fbb11167a ChangeLog 3571
-SHA256 d291bd40b153dd0c692ac8c12b0caa86587a83649f9521515283e89ec187fb9c ChangeLog 3571
+EBUILD pekwm-0.1.5.ebuild 1193 RMD160 ed2ec427891a7842f1f3ba97ee8bb126364500e6 SHA1 fbdd435306d29ef78c6127432df63b1454c46a60 SHA256 64021e8c9d9091613dc73c19412d46966b6770816bdef176e7ed801803840f7a
+MD5 41c093c226e7428f7db5d36461e36dd1 pekwm-0.1.5.ebuild 1193
+RMD160 ed2ec427891a7842f1f3ba97ee8bb126364500e6 pekwm-0.1.5.ebuild 1193
+SHA256 64021e8c9d9091613dc73c19412d46966b6770816bdef176e7ed801803840f7a pekwm-0.1.5.ebuild 1193
+MISC ChangeLog 3718 RMD160 0db6e288631edf0f5d845705e6e4ec66e6831249 SHA1 aef7c816ed350a001821365e00e53d32e76893a1 SHA256 a1916b05f39a73c10f8826ce18729775884da31e4dfcf03034db9cc6e36930e2
+MD5 e604c95bb73bce3692c39fd043e4a349 ChangeLog 3718
+RMD160 0db6e288631edf0f5d845705e6e4ec66e6831249 ChangeLog 3718
+SHA256 a1916b05f39a73c10f8826ce18729775884da31e4dfcf03034db9cc6e36930e2 ChangeLog 3718
 MISC metadata.xml 608 RMD160 131a9e8838999d01c01b54959931caba52dbec79 SHA1 976e6be95426c28630627143b3b5f8377156c622 SHA256 caf6a62591511df76c6e29ada6f8fca262c32aacdb60a359f699c23f1e2f11b8
 MD5 b50d5011f1d3084357bc9ff3d2bb31b4 metadata.xml 608
 RMD160 131a9e8838999d01c01b54959931caba52dbec79 metadata.xml 608
@@ -31,9 +31,9 @@ MD5 7316ef7fad6c83e35cce06303d396a0a files/digest-pekwm-0.1.5 479
 RMD160 e8f0e9d5b3ef75cdd54cc49e0cd7e448db6b3ab4 files/digest-pekwm-0.1.5 479
 SHA256 45d31f6069ea2e1a32bf9473786493283c2c47a3ad1db583d07662a457fdebe7 files/digest-pekwm-0.1.5 479
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFWUcjvSApE0uP4UsRAizsAJ9Okqi7gdOLdzKHHRoA75/ceR6T4QCdGUq4
-SazXTG6KTZmabvXFt6+k6fg=
-=YqCH
+iD8DBQFFgM3/vSApE0uP4UsRAjm5AJ9pjx84YcZv4w8TCUp8CpVKS/aJxwCaAkHA
++p1E+i55GHuc8ZI9W3a8r0Q=
+=WzW8
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/pekwm/pekwm-0.1.5.ebuild b/x11-wm/pekwm/pekwm-0.1.5.ebuild
index bcaec384a1d5..37acb98e79ee 100644
--- a/x11-wm/pekwm/pekwm-0.1.5.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.5.ebuild
@@ -1,8 +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/pekwm/pekwm-0.1.5.ebuild,v 1.2 2006/10/28 22:15:59 omp Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.5.ebuild,v 1.3 2006/12/14 04:07:16 omp Exp $
 
 DESCRIPTION="A small window mananger based on aewm++"
 HOMEPAGE="http://www.pekwm.org/"
@@ -14,7 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="debug perl truetype xinerama"
 
-DEPEND="media-libs/imlib2
+DEPEND="media-libs/jpeg
+	media-libs/libpng
 	x11-libs/libXpm
 	x11-libs/libXrandr
 	x11-libs/libXrender
@@ -23,24 +22,19 @@ DEPEND="media-libs/imlib2
 	xinerama? ( x11-libs/libXinerama )"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	if ! built_with_use media-libs/imlib2 X ; then
-		eerror "media-libs/imlib2 must be built with X support."
-		die "missing X USE flag for media-libs/imlib2"
-	fi
-}
-
 src_compile() {
 	econf \
-		$(use_enable truetype xft) \
+		$(use_enable debug) \
 		$(use_enable perl pcre) \
+		$(use_enable truetype xft) \
 		$(use_enable xinerama) \
-		$(use_enable debug) \
-		--enable-menus \
 		--enable-harbour \
+		--enable-image-jpeg \
+		--enable-image-png \
+		--enable-image-xpm \
+		--enable-menus \
 		--enable-shape \
-		--enable-xrandr \
-		--enable-imlib2 || die "econf failed"
+		--enable-xrandr || die "econf failed"
 
 	emake || die "emake failed"
 }