Use pkg-config to find libpng wrt #319065 by Rafael G. Martins.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index c8ab603a85f8ff9b5a3ee46316a038b960c45348..7fd9ab9f89a7d80336768156c780c6904db70ebc 100644 (file)
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.48 2010/05/10 12:43:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.49 2010/05/11 06:58:51 ssuominen Exp $
+
+  11 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  slim-1.3.1_p20091114.ebuild:
+  Use pkg-config to find libpng wrt #319065 by Rafael G. Martins.
 
   10 May 2010; Samuli Suominen <ssuominen@gentoo.org>
   slim-1.3.1_p20091114.ebuild:

diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 554421367c89c7045fba930cc9f076edf567ba26..467d65d13bba1802da0f8ef718224de3acf6b73e 100644 (file)
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -8,6 +8,6 @@ DIST slim-1.3.1.tar.gz 219446 RMD160 dc0c7c7257dfa8c2bee47ffa5ec8ddf17fd38f70 SH
 DIST slim-1.3.1_p20091114.tar.bz2 216441 RMD160 61ede89624ed6983c08d05512c9f6458cff6425e SHA1 127aa0eb599c5bcbd87ce1ee040f8bb59bd63491 SHA256 ba68da747db4ef87329064fd3990f0402ad840ad723b03cea5e7c6c15a2c1a7b
 EBUILD slim-1.3.1-r4.ebuild 2495 RMD160 bdfc04c2227af16eafec39f51b121a6f95c31723 SHA1 6c7529ec061aa000b5e6188b5b7e3fa03b5206a1 SHA256 c6c68f8957040bccdd881895122b7750d43378a38c1a46094f46d6383161ca32
 EBUILD slim-1.3.1-r5.ebuild 2631 RMD160 73e737080d45aff3810aad0263b08f708e0ef867 SHA1 bdcea32bad18c00701059a0d33b35864f2ca9d67 SHA256 b20457bb3e60aac07ef3eb4c54bcd2f0eab53bd25b6cbbab3368da42c3ff8048
-EBUILD slim-1.3.1_p20091114.ebuild 2902 RMD160 1e79f640d5e67aba6842e771b044fb996cc3af71 SHA1 93b65d805f472244cbe85e066340ab5cff2b5b91 SHA256 dabc1706eee0011c56b3a16a4f4d6e09e0d2a32aa03c7bdb8d155f43ff6ec946
-MISC ChangeLog 7292 RMD160 8c84af0242c744df6d4014fcd201353b94133c87 SHA1 0aec42aafd13b0e8c936071e0b7fa50cc0f7d9aa SHA256 c34af0a773e69e6b966fb62fb9fcb660638f56e3e32c794897d80df831083481
+EBUILD slim-1.3.1_p20091114.ebuild 3026 RMD160 608417298b12ce1ac5f804b462244d33369e8cef SHA1 3fc3c412b78a9ebf20828641917b3c613ceb6bf8 SHA256 396174b889de732c2a805c87035b5ed1438b3ea8b03017be49ac70b76d89d27e
+MISC ChangeLog 7444 RMD160 6e19e13c0345c1c34d5d133b0be0a26cf214a8e5 SHA1 15e59a6c81536c4a9937feef97d1950a70775c81 SHA256 6b0ba326a82cbcf615a5d572da2ac8ad9cc9ca5872c1360dc3f7c04981b2adaa
 MISC metadata.xml 348 RMD160 22b309bfa0ee5378b0476cc4c7fe8ea3eabe8fbc SHA1 4f8c2e941ce68487614dfab204737ff51f9f8531 SHA256 821a30989eb2cad5bd636c79abffbdb600b31d67cd1b6fb219204d8aedd987bb

diff --git a/x11-misc/slim/slim-1.3.1_p20091114.ebuild b/x11-misc/slim/slim-1.3.1_p20091114.ebuild
index 10471bd37904f373fb8ec8f538a52f480e54cd13..8c776d4c6ee5225026bf1183db1674bdc90f725c 100644 (file)
--- a/x11-misc/slim/slim-1.3.1_p20091114.ebuild
+++ b/x11-misc/slim/slim-1.3.1_p20091114.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild,v 1.7 2010/05/10 12:43:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild,v 1.8 2010/05/11 06:58:51 ssuominen Exp $
 
 EAPI=2
 
@@ -24,6 +24,7 @@ DEPEND="x11-proto/xproto
        media-libs/jpeg
        pam? ( virtual/pam )"
 RDEPEND="${DEPEND}
+       dev-util/pkgconfig
        x11-apps/sessreg
        screenshot? ( media-gfx/imagemagick )
        branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
@@ -35,7 +36,8 @@ src_prepare() {
                -e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \
                -e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \
                -e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
-               -e "s:lpng12:lpng:" \
+               -e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \
+               -e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \
                -r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
                Makefile || die "sed failed in Makefile"
        epatch "${FILESDIR}/${PN}-1.3.1-config.diff"