Properly detect libpng if USE="-truetype" wrt bug 326803. Thanks to Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe> for report and patch.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 48 insertions, 8 deletions

diff --git a/x11-wm/pekwm/ChangeLog b/x11-wm/pekwm/ChangeLog
index 9c9140632032..15e4ba0e19c1 100644
--- a/x11-wm/pekwm/ChangeLog
+++ b/x11-wm/pekwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/pekwm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.54 2010/06/02 07:57:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.55 2010/07/04 08:46:54 xarthisius Exp $
+
+  04 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org> pekwm-0.1.12.ebuild,
+  +files/pekwm-0.1.12-configure.patch:
+  Properly detect libpng if USE="-truetype" wrt bug 326803. Thanks to Carlo
+  Marcelo Arenas Belon <carenas@sajinet.com.pe> for report and patch.
 
 *pekwm-0.1.12 (02 Jun 2010)
 
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index 083e9955882e..1b94da0b1804 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pekwm-0.1.11-libpng14.patch 719 RMD160 45c23bf768e2de58320dd76d715e89aefb2059cd SHA1 8bbdf92e00e1b0858e2d786da041358bbf49694d SHA256 5e12f89f88cc2ddd584228b36810944f43bc5b7348f44dbe512191615b5566e6
+AUX pekwm-0.1.12-configure.patch 309 RMD160 0fa443c1491eb5e45c3905cbb25fd52da642b808 SHA1 80651197c4f566380d307299a0915c1b7495a1a2 SHA256 be036db0d7e608bd8000090e7c67a8425bdacc10346d1534210e1dbb716d9e5d
 DIST pekwm-0.1.11.tar.bz2 385262 RMD160 69ba2badf75514410e67dd48b0df1fc354f9a896 SHA1 28cfa30cfc046440f6e5924214959f8647bc0a9d SHA256 a646e5f09a61ac4e7195ff8acf100dbadca035e84dd677fbedca00a6108a741f
 DIST pekwm-0.1.12.tar.gz 488625 RMD160 aa3ef16e8bc3c22e038fab4715b0c6e5f1afab64 SHA1 a39b04f2e1424d9c5ad0be0866ba735f31786ad7 SHA256 97b1c017c46b143b6c5fe9eee8987167ada5415828e5e0f054af27b1f2d55834
 DIST pekwm-0.1.7.tar.bz2 363788 RMD160 77c618ddefeaad16a9b757304ca233ece9b18e3c SHA1 dcd91dc8d08000bd8df402b08b7cfb2d71b038bc SHA256 2216eb0c722f4aad15761a7f4eced67ea1284a00e32e03d66de4b55f8c1c9524
 DIST pekwm-themes.tar.bz2 138599 RMD160 b35a21e6d6123a6fde835cd8889e44d9e5b338b9 SHA1 3228024488dd7547b748e2448e4633ceae97ae4d SHA256 5a14f0c98381e0d5b36dcc2e56b30b0dd279e14b6dd61b199fedf807eccb4a13
 EBUILD pekwm-0.1.11.ebuild 1242 RMD160 a562c9224bb29ba2efd48b6d8dbc7ff637486849 SHA1 7a208a65a3feb5618e81ae733ed35bcdab7312d1 SHA256 f5574eef725b9a4cb062441f876e445432058e5af402ee2b378af164f5b58366
-EBUILD pekwm-0.1.12.ebuild 1188 RMD160 32abbb06be71c4b0c7bfd4a011459185339ea7df SHA1 ec8b44d3f19078191f01bb3b7aee484ea0eec006 SHA256 d7ceeba3e56c70ad9b57d5488729c7bfb1c6865c7862a23c2680378d53e47bb2
+EBUILD pekwm-0.1.12.ebuild 1322 RMD160 62205c9752360cf605ff9adb8e1f31b274f54074 SHA1 ea1c44853dceae606530c41275637608639ef7f2 SHA256 de429a091bb6c4646cc5d451b6d2c4e764b07be5204656875bcce8f74d01a91f
 EBUILD pekwm-0.1.7.ebuild 1291 RMD160 ebe5049733bbd596c978e6338c227dbbec7b5601 SHA1 5c6b5da8e80eb41897d7195ef4c6b270a84f0e48 SHA256 f75290051db25e99ec208ee83ad45ae4a8ffc6fef3491c4eb33d1c295fb873c5
-MISC ChangeLog 7252 RMD160 9d063d5013efb6915b5540907f3313e32e1899d2 SHA1 57aeee0013e9f212a4e91e24d4b33214aebc4bf3 SHA256 a0afb52a2fe63caac6dcb35f4e6c754d86c5d46d0d30ad461fe7c5c0b2281772
+MISC ChangeLog 7513 RMD160 89beb33fa05a84f2e5e656d8dc9b243144a747fc SHA1 46763d17318423b16108043405624c89409e15cd SHA256 8fcb90572958e1b4df8cb27674391bf52d4c24cfe8f54b80264789501f3586da
 MISC metadata.xml 608 RMD160 131a9e8838999d01c01b54959931caba52dbec79 SHA1 976e6be95426c28630627143b3b5f8377156c622 SHA256 caf6a62591511df76c6e29ada6f8fca262c32aacdb60a359f699c23f1e2f11b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkwwSoYACgkQIiMqcbOVdxT3bQP+LnzpSJSsgNT1YK0VVY7fSWLO
+QQBZcxDr+xmn0RYEtk+EEysWocDTBxcqS5mC6KEPZRW8H4fUPgkyBhQBMxEIEFYL
+rYYRBU8HZQC2Cep51kY8q9xSCluSMvSkI5PC0wAjc/f3nh5rHmStmYMoo0RHnF/g
+mYl2HOQQeqBG49Gzask=
+=rOOG
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/pekwm/files/pekwm-0.1.12-configure.patch b/x11-wm/pekwm/files/pekwm-0.1.12-configure.patch
new file mode 100644
index 000000000000..a1ce351917d4
--- /dev/null
+++ b/x11-wm/pekwm/files/pekwm-0.1.12-configure.patch
@@ -0,0 +1,15 @@
+Allows to properly detect libpng if USE="-truetype"
+
+https://bugs.gentoo.org/show_bug.cgi?id=326803
+
+Patch written by Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
+--- configure.ac
++++ configure.ac
+@@ -10,6 +10,7 @@
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_SED
++PKG_PROG_PKG_CONFIG
+ 
+ AC_LANG_CPLUSPLUS
+ 
diff --git a/x11-wm/pekwm/pekwm-0.1.12.ebuild b/x11-wm/pekwm/pekwm-0.1.12.ebuild
index d11aba394607..83803ab79ccd 100644
--- a/x11-wm/pekwm/pekwm-0.1.12.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.12.ebuild,v 1.1 2010/06/02 07:57:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.12.ebuild,v 1.2 2010/07/04 08:46:54 xarthisius Exp $
 
 EAPI=2
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="A small window mananger based on aewm++"
 HOMEPAGE="http://pekwm.org/"
@@ -15,16 +15,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="debug truetype xinerama"
 
-DEPEND="media-libs/jpeg:0
+CDEPEND="media-libs/jpeg:0
 	media-libs/libpng
 	x11-libs/libXpm
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	truetype? ( x11-libs/libXft )
 	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
 	x11-apps/xprop"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable debug) \
@@ -41,7 +48,7 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README || die
 
 	rm "${WORKDIR}/themes/Ace/.theme.swp"
 	mv "${WORKDIR}/themes/"* "${D}/usr/share/${PN}/themes/"