Fix emerging with USE="kde". Bug #146475

Package-Manager: portage-2.1.1

5 files changed, 34 insertions, 24 deletions

diff --git a/media-libs/yiff/ChangeLog b/media-libs/yiff/ChangeLog
index 64a423e60a8c..56adce678495 100644
--- a/media-libs/yiff/ChangeLog
+++ b/media-libs/yiff/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/yiff
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/ChangeLog,v 1.10 2006/10/02 06:50:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/ChangeLog,v 1.11 2006/10/25 19:08:09 tupone Exp $
+
+  25 Oct 2006; <tupone@gentoo.org> yiff-2.14.5.ebuild:
+  Fix emerging with USE="kde". Bug #146475 by Pacho Ramos
 
   02 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> yiff-2.14.5.ebuild:
   Allow kdemultimedia being a dependency as well as kmid. Thanks to Dave for
diff --git a/media-libs/yiff/Manifest b/media-libs/yiff/Manifest
index 3a9e339022dc..4f1b7593647e 100644
--- a/media-libs/yiff/Manifest
+++ b/media-libs/yiff/Manifest
@@ -17,34 +17,34 @@ AUX yiff-2.14.5-build.patch 1542 RMD160 1180d4d48a438e766bf4b0863bba9efd67305497
 MD5 49883a9994da1db61dcd100c66cbbacc files/yiff-2.14.5-build.patch 1542
 RMD160 1180d4d48a438e766bf4b0863bba9efd67305497 files/yiff-2.14.5-build.patch 1542
 SHA256 2e43924a6ac123e79ffc893c6c205aec204b2e47113c5f03939d2fab4e2dbd2d files/yiff-2.14.5-build.patch 1542
-DIST yiff-2.14.2.tar.bz2 509273
-DIST yiff-2.14.5.tar.bz2 554909
+DIST yiff-2.14.2.tar.bz2 509273 RMD160 66b44f4a23f679dccb18340d023c849421b43e0d SHA1 1fdf5aa9a382bc41ef22a8d3abb505b312b4c4f3 SHA256 fb95c4afc02aee64598f13561e0b5f5fa7bb7cf2d982b58770e0f2cd785d549d
+DIST yiff-2.14.5.tar.bz2 554909 RMD160 13e00937e18e9a746793acdeea88b1d65cd95a8d SHA1 085b4e2a52964eb1c5746e78d2996ddda914fe3b SHA256 229f35e32b76ac398387123a955aa789d614896d9e354e084db872a20a3ad764
 EBUILD yiff-2.14.2.ebuild 1247 RMD160 e3d6af5ff6170da73e9601ad50e874dc18aee03c SHA1 b3a34f2b8a862316f5305fdca81733f770d77a2f SHA256 c5749997b5387a80b6811088ff56881304b0ea17b7c178d1d653241a50a46ae2
 MD5 2a9f92590a5e32d504c2da5357e6778d yiff-2.14.2.ebuild 1247
 RMD160 e3d6af5ff6170da73e9601ad50e874dc18aee03c yiff-2.14.2.ebuild 1247
 SHA256 c5749997b5387a80b6811088ff56881304b0ea17b7c178d1d653241a50a46ae2 yiff-2.14.2.ebuild 1247
-EBUILD yiff-2.14.5.ebuild 1313 RMD160 60dedc925201525323f05c0ac9f2b7f090f94f73 SHA1 663f2f73caf4bfc2285c0955fc757c953b50091c SHA256 0b8ee54c5c1aaa3825914fed901af23b578bee513b2f4926c4f281cd3625344e
-MD5 ae95dd3b86a2e3865840e87507b056e4 yiff-2.14.5.ebuild 1313
-RMD160 60dedc925201525323f05c0ac9f2b7f090f94f73 yiff-2.14.5.ebuild 1313
-SHA256 0b8ee54c5c1aaa3825914fed901af23b578bee513b2f4926c4f281cd3625344e yiff-2.14.5.ebuild 1313
-MISC ChangeLog 1314 RMD160 2955589f636d45c10c799940dde7e36badab443e SHA1 e4388edbeb3bb787a461f75f4ab7445095d6d3c8 SHA256 b177f43861e6e670fc30fc053dc2e8aa61b7eb60a2193008064a282e06c41047
-MD5 4d09b14f327d0ee7f9370945d431191a ChangeLog 1314
-RMD160 2955589f636d45c10c799940dde7e36badab443e ChangeLog 1314
-SHA256 b177f43861e6e670fc30fc053dc2e8aa61b7eb60a2193008064a282e06c41047 ChangeLog 1314
+EBUILD yiff-2.14.5.ebuild 1385 RMD160 eb6a638e913442c6e73eece4fa68455611f08aaf SHA1 369625f48a4be17cbb322490e493c02c73e760cb SHA256 1fcb91645ea3598120f9669611b823b43e14976c93bf2bdb37165cad7a39ac83
+MD5 a2ce87e32c6cfe2bd17aac0293cec22b yiff-2.14.5.ebuild 1385
+RMD160 eb6a638e913442c6e73eece4fa68455611f08aaf yiff-2.14.5.ebuild 1385
+SHA256 1fcb91645ea3598120f9669611b823b43e14976c93bf2bdb37165cad7a39ac83 yiff-2.14.5.ebuild 1385
+MISC ChangeLog 1425 RMD160 0a8956d5156513132f2d8bd048a794dc9bf5a934 SHA1 0cf0eddd9afb408b10119c1cfa057519e9717d7d SHA256 b0b379e7ec11ef1915cfd665fb4880f0594ae2217ad28dd95a534e2150ee317c
+MD5 a0239b828395be255a5d1888db530294 ChangeLog 1425
+RMD160 0a8956d5156513132f2d8bd048a794dc9bf5a934 ChangeLog 1425
+SHA256 b0b379e7ec11ef1915cfd665fb4880f0594ae2217ad28dd95a534e2150ee317c ChangeLog 1425
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 731dde7e0d27725a199275a23aaec33e files/digest-yiff-2.14.2 64
-RMD160 757ffc8ecbad1d16219164b81855a6326c0cac1e files/digest-yiff-2.14.2 64
-SHA256 bba59b1b2382862d5fe843308013957b775947c623cee6a93cf529f6037bc0cc files/digest-yiff-2.14.2 64
-MD5 61cbb76cbf96e6d9072c9cd8b20cd953 files/digest-yiff-2.14.5 64
-RMD160 0ab5c5a15abeddfc196a178b16f1d81e91a15f9f files/digest-yiff-2.14.5 64
-SHA256 32d46c915d74c14444c61d6415b0770eaeb46eb36c1322531ace71cfe4f769fa files/digest-yiff-2.14.5 64
+MD5 d86c39e754dc1a0bc034542962bf8aae files/digest-yiff-2.14.2 238
+RMD160 606885621625786e528f6f10f375159f6369f692 files/digest-yiff-2.14.2 238
+SHA256 d5c2701520af1fae6c0503dd581e6d852a8f78ae3f3265c1d6fa5cf40286e311 files/digest-yiff-2.14.2 238
+MD5 ee3fb28c7484a62b678c4afeb3e2fc8e files/digest-yiff-2.14.5 238
+RMD160 9a31b57fd10bd5f563f586cb4e4867e485122466 files/digest-yiff-2.14.5 238
+SHA256 ad8644cf48269338a49f38ad9e6bf4cc8c7c37dc06e1f921da70186d42e1d47f files/digest-yiff-2.14.5 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFILbUAiZjviIA2XgRAvL0AJ9TG5UntbDo3qQTnFkGAvyMv7HgGQCdHV/B
-P2XpG1IXre/y97WJHrYB8N0=
-=i6e0
+iD8DBQFFP7YkbfN2jvlVAhwRAjXqAJsGQrgLjRo/dWZmrj2TflrYUw9A9QCeMxe1
+voRmfn4xVafgyvgCN4gGyb8=
+=+2Kw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/yiff/files/digest-yiff-2.14.2 b/media-libs/yiff/files/digest-yiff-2.14.2
index f36c7f0b3ab8..d387ca834657 100644
--- a/media-libs/yiff/files/digest-yiff-2.14.2
+++ b/media-libs/yiff/files/digest-yiff-2.14.2
@@ -1 +1,3 @@
 MD5 db5a17d43c6ead1dc9ad08995c06d05c yiff-2.14.2.tar.bz2 509273
+RMD160 66b44f4a23f679dccb18340d023c849421b43e0d yiff-2.14.2.tar.bz2 509273
+SHA256 fb95c4afc02aee64598f13561e0b5f5fa7bb7cf2d982b58770e0f2cd785d549d yiff-2.14.2.tar.bz2 509273
diff --git a/media-libs/yiff/files/digest-yiff-2.14.5 b/media-libs/yiff/files/digest-yiff-2.14.5
index 743cfc10405a..a1ada5157087 100644
--- a/media-libs/yiff/files/digest-yiff-2.14.5
+++ b/media-libs/yiff/files/digest-yiff-2.14.5
@@ -1 +1,3 @@
 MD5 c43724d006a419f99fdb797e3067c085 yiff-2.14.5.tar.bz2 554909
+RMD160 13e00937e18e9a746793acdeea88b1d65cd95a8d yiff-2.14.5.tar.bz2 554909
+SHA256 229f35e32b76ac398387123a955aa789d614896d9e354e084db872a20a3ad764 yiff-2.14.5.tar.bz2 554909
diff --git a/media-libs/yiff/yiff-2.14.5.ebuild b/media-libs/yiff/yiff-2.14.5.ebuild
index 3fde331dca35..97052fd2bcab 100644
--- a/media-libs/yiff/yiff-2.14.5.ebuild
+++ b/media-libs/yiff/yiff-2.14.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/yiff-2.14.5.ebuild,v 1.2 2006/10/02 06:50:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/yiff/yiff-2.14.5.ebuild,v 1.3 2006/10/25 19:08:09 tupone Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils kde-functions
 
 DESCRIPTION="high performance and stable sound server for UNIX games and apps"
 HOMEPAGE="http://wolfpack.twu.net/YIFF/"
@@ -21,7 +21,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-build.patch
-	use kde && sed -i '/^LIB =/s:$: -lkmid:' yiff/Makefile.Linux
+	if use kde; then
+		set-kdedir
+		sed -i "/^LIB =/s:$: -L${KDEDIR}/lib -lkmid:" yiff/Makefile.Linux
+	fi
 	sed -i \
 		-e "/^YLIB_DIR/s:/lib:/$(get_libdir):" \
 		-e '/LDCONFIG/s:=.*:=true:' \
@@ -32,7 +35,7 @@ src_unpack() {
 src_compile() {
 	local pkgs="libY2 yiff yiffutils"
 	use gtk && pkgs="${pkgs} yiffconfig"
-	use kde && append-flags -DHAVE_LIBKMID
+	use kde && append-flags -DHAVE_LIBKMID -I${KDEDIR}/include
 	use alsa && append-flags -DALSA_RUN_CONFORM
 	append-flags -DOSS -DOSS_BUFFRAG -DYSHM_SUPPORT -D__USE_BSD
 	emake linux \