fixed #336198; minor ebuild fixes; eapi=3

Package-Manager: portage-2.1.9.25/cvs/Linux i686

3 files changed, 30 insertions, 17 deletions

diff --git a/media-plugins/vdr-extb/ChangeLog b/media-plugins/vdr-extb/ChangeLog
index 4d7258884377..0556fe7c5e30 100644
--- a/media-plugins/vdr-extb/ChangeLog
+++ b/media-plugins/vdr-extb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-extb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extb/ChangeLog,v 1.5 2010/12/02 15:10:01 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extb/ChangeLog,v 1.6 2011/01/28 23:31:24 hd_brummy Exp $
+
+  28 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-extb-0.3.1.ebuild:
+  fixed #336198; minor ebuild fixes; eapi=3
 
 *vdr-extb-0.3.1 (02 Dec 2010)
 
diff --git a/media-plugins/vdr-extb/Manifest b/media-plugins/vdr-extb/Manifest
index e5d04df3e624..3621f60d4e4e 100644
--- a/media-plugins/vdr-extb/Manifest
+++ b/media-plugins/vdr-extb/Manifest
@@ -6,14 +6,14 @@ AUX vdr-extb-0.3.1_vdr-1.7.13.diff 873 RMD160 07490a970cb87dda3014732c5d2d8ed20e
 DIST extb.tar.gz 45417 RMD160 f3f29769ad5898488f28f9c3823691702195486d SHA1 5f57677ab855ccf4bdde34779c90f2506065d0be SHA256 9a9b873a3b04d32da164f5c8199ddaa1ce67a824d40ed3653c2d79e879739345
 DIST extb_firmware_1.08_lircd.conf.zip 8197 RMD160 24a1b8e59dcbf056749213078506d57640c876b4 SHA1 5236f845e8eebc42267a7755cd429a5c433d9b13 SHA256 149021182aadc3d1b62b81c4fe4a5d12f467a1762e3a5dd5e1619ce52db029b3
 DIST vdr-extb-0.3.1.tar.gz 53136 RMD160 63fdaa3e2091efbca87335c53f1157ed22fd146c SHA1 0ac013127e14d3558dd7ef8d6791e3f9679ba18d SHA256 4473fb52f4b284e23c47facbc240289340ee0109e89887d6cfb9b62b31a4b37e
-EBUILD vdr-extb-0.3.1.ebuild 1671 RMD160 dcb2c3b94adb9803785a9d5be19dd8f4055a01d8 SHA1 327111637c1a333a96666e4620a4f92363d892b5 SHA256 1822ae978bed7c26e15c548261b9fbdeb3820fcf5e0d1ed91ca037c7cf27fdb4
-MISC ChangeLog 1434 RMD160 b0b717eaafc10c3018a544d071cbd6f4e7eb1f25 SHA1 0bd5a8f8326b0dab5e6bbf1822226b59ad106254 SHA256 cc6ee98c37be06361cb72515dbcc8f62da879f4e051ac5959250c58d91e02943
+EBUILD vdr-extb-0.3.1.ebuild 1898 RMD160 0c7003acabd62263570bd9d1072f3383eb5a20eb SHA1 4d4a6710c21e320d080e22780e47d94e02b4ef5f SHA256 45e022ea38bb43f68715ed6d92eb8534980f21b58cbb0ca791caeb2997da8f8a
+MISC ChangeLog 1559 RMD160 41187022be0720669dbe794213cf7a867bf0febb SHA1 6e100ea4e0f4d1de46baf56f83d69f3653891444 SHA256 1e697b34b6ccb18e43cf880c4353697ccf50e36bc9660c527fb5abe82160d577
 MISC metadata.xml 337 RMD160 f0276e381deb2e62761aa580195b1c05be29f5d5 SHA1 401d1f6dd5361fa11c936bfa18aa86047a82c614 SHA256 ca40fe91ad4ff2629c376890772b86f0e306359568fd5dad9a5c9804d0791b7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFM97bndn07HTTCgIoRAhIvAKCgVOu3q4bKcyTtBvbUmHJSqmoz8QCfbdaA
-HLxlCaIP2t1dK2ipHCN3+io=
-=U1+i
+iD8DBQFNQ1Hsdn07HTTCgIoRAsByAJoDSWMvqYrLnaFNcQbuyvXCUK9EKQCgpc3h
+eFmm/5W5Je9PHNNelU76V6c=
+=A4ze
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild b/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild
index cc561143af14..b0690bdb5635 100644
--- a/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild
+++ b/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild,v 1.1 2010/12/02 15:10:01 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild,v 1.2 2011/01/28 23:31:24 hd_brummy Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit vdr-plugin
 
@@ -19,35 +19,44 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.6.0
 	app-misc/lirc"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	vdr-plugin_src_prepare
 
+	sed -i "${WORKDIR}"/extb/src/LinPIC/Makefile \
+		-e "s:\$(LDLIBS):\$(LDFLAGS) \$(LDLIBS):"
+
 	cd "${WORKDIR}"
 	epatch "${FILESDIR}/${P}-gentoo.diff"
 	epatch "${FILESDIR}/${P}_vdr-1.7.13.diff"
 }
 
+src_compile() {
+	vdr-plugin_src_compile
+
+	emake -C "${WORKDIR}/extb/src/LinPIC" all
+}
 src_install() {
 	vdr-plugin_src_install
 
 	dodoc README.de
-	dodoc "${S}/../lircd.conf.extb_FW1.08"
+	dodoc "${WORKDIR}/lircd.conf.extb_FW1.08"
 	docinto wakeup
 	dodoc "${S}/wakeup/README.de"
 
-	dobin "${S}/../extb/bin/extb.sh"
-	dobin "${S}/../extb/bin/picdl"
-	dobin "${S}/../extb/bin/status.sh"
-	dobin "${S}/../extb/bin/tx.sh"
+	dobin "${WORKDIR}/extb/src/LinPIC/picdl"
+	dobin "${WORKDIR}/extb/bin/extb.sh"
+	dobin "${WORKDIR}/extb/bin/status.sh"
+	dobin "${WORKDIR}/extb/bin/tx.sh"
 	dobin "${S}/wakeup/extb-poweroff.pl"
 	dobin "${S}/wakeup/examples/checkscript.sh"
 
 	insinto /usr/share/extb/
-	doins "${S}/../extb_1.08.hex"
+	doins "${WORKDIR}/extb_1.08.hex"
 
 	insinto /etc/extb
-	doins "${S}/../extb/bin/PICflags.conf"
+	doins "${WORKDIR}/extb/bin/PICflags.conf"
 	doins "${S}/wakeup/examples/extb-poweroff.conf"
 }