[gentoo-commits] dev/xmw:master commit in: media-libs/raspberrypi-userland-bin/

["Michael Weber" <xmw@gentoo.org>]

commit:     ea127e4533a07dc8bc25c4c6b5223fda35c81613
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 21:43:21 2013 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 21:43:21 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=ea127e45

Update ebuilds

Package-Manager: portage-2.2.0_alpha188
Manifest-Sign-Key: 62EEF090

---
 media-libs/raspberrypi-userland-bin/ChangeLog      |  5 +++++
 .../raspberrypi-userland-bin-0_p20130711.ebuild    | 23 +++++++++++++++-------
 .../raspberrypi-userland-bin-1_pre20130715.ebuild  | 23 +++++++++++++++-------
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/media-libs/raspberrypi-userland-bin/ChangeLog b/media-libs/raspberrypi-userland-bin/ChangeLog
index 049de81..b0c10f8 100644
--- a/media-libs/raspberrypi-userland-bin/ChangeLog
+++ b/media-libs/raspberrypi-userland-bin/ChangeLog
@@ -1,3 +1,8 @@
+  17 Jul 2013; Michael Weber <xmw@gentoo.org>
+  raspberrypi-userland-bin-0_p20130711.ebuild,
+  raspberrypi-userland-bin-1_pre20130715.ebuild:
+  Update ebuilds
+
 *raspberrypi-userland-bin-0_p20130711 (17 Jul 2013)
 *raspberrypi-userland-bin-1_pre20130715 (17 Jul 2013)
 

diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-0_p20130711.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-0_p20130711.ebuild
index 9ad0da1..26a06bb 100644
--- a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-0_p20130711.ebuild
+++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-0_p20130711.ebuild
@@ -15,24 +15,33 @@ SRC_URI="https://github.com/raspberrypi/firmware/tarball/${MY_COMMIT} ->
 LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
 KEYWORDS="~arm -*"
-IUSE="+hardfp"
+IUSE="+hardfp examples"
 
 RDEPEND="!media-libs/raspberrypi-userland"
 DEPEND="${DEPEND}"
 
 S=${WORKDIR}/raspberrypi-firmware-${MY_COMMIT}
 
-#RESTRICT="binchecks"
+RESTRICT="binchecks"
 
 src_prepare() {
 	rm {,hardfp/}opt/vc/LICENCE || die
 }
 
 src_install() {
-	if use hardfp ; then
-		mv hardfp/opt "${D}" || die
-	else
-		mv opt "${D}" || die
-	fi
+	cd $(usex hardfp hardfp/ "")opt/vc || die
+
+	insinto /opt/vc
+	doins -r include
+	into /opt/vc/bin
+	dobin bin/*
+	into /opt/vc/sbin
+	dobin sbin/*
+	into /opt/vc/lib
+	dolib.so lib/*
+
+	insinto /usr/share/doc/${PF}/examples
+	use examples && doins -r src/hello_pi
+
 	doenvd "${FILESDIR}"/04${PN}
 }

diff --git a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1_pre20130715.ebuild b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1_pre20130715.ebuild
index bf80240..469df67 100644
--- a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1_pre20130715.ebuild
+++ b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1_pre20130715.ebuild
@@ -15,24 +15,33 @@ SRC_URI="https://github.com/raspberrypi/firmware/tarball/${MY_COMMIT} ->
 LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
 KEYWORDS="~arm -*"
-IUSE="+hardfp"
+IUSE="+hardfp examples"
 
 RDEPEND="!media-libs/raspberrypi-userland"
 DEPEND="${DEPEND}"
 
 S=${WORKDIR}/raspberrypi-firmware-${MY_COMMIT}
 
-#RESTRICT="binchecks"
+RESTRICT="binchecks"
 
 src_prepare() {
 	rm {,hardfp/}opt/vc/LICENCE || die
 }
 
 src_install() {
-	if use hardfp ; then
-		mv hardfp/opt "${D}" || die
-	else
-		mv opt "${D}" || die
-	fi
+	cd $(usex hardfp hardfp/ "")opt/vc || die
+
+	insinto /opt/vc
+	doins -r include
+	into /opt/vc/bin
+	dobin bin/*
+	into /opt/vc/sbin
+	dobin sbin/*
+	into /opt/vc/lib
+	dolib.so lib/*
+
+	insinto /usr/share/doc/${PF}/examples
+	use examples && doins -r src/hello_pi
+
 	doenvd "${FILESDIR}"/04${PN}
 }