From 4e5734072decc2efbba40da8249858d9590cac8a Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Tue, 25 Nov 2014 15:13:59 +0200
Subject: raspberrypi-userland: Update to 20140830 snapshot as found p.masked
 in portage

Continues to carry the wayland patches, which still apply cleanly.
Requires package.unmasking until main tree unmasks it.
---
 media-libs/raspberrypi-userland/Manifest           |  2 +-
 .../raspberrypi-userland-0_pre20140117.ebuild      | 71 ----------------------
 .../raspberrypi-userland-0_pre20140830.ebuild      | 71 ++++++++++++++++++++++
 3 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644 media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild
 create mode 100644 media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140830.ebuild

diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index b34b0ff..fce3d60 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1 +1 @@
-DIST raspberrypi-userland-0_pre20140117.tar.xz 31998784 SHA256 2999d711465ddbc6b70d429a0253b8a9c1f838351a96f2b25cc86109a879005f SHA512 5c3dfebdcb36a2a17da94cafcc92067b24b454d5694b0bd216dd0d6752c4f505840880094c22125ab5da60f7b53b9114e8d04359a223e9e00be967cb8585e42e WHIRLPOOL 5179758c2be4b45f640eb8759554e19ea4fc8c83e63b0d4396ae84e67ae82e97824bf12f0766df5a70e2ca5b80e90be80e5c9b2eaa968752829765463d3f6d0d
+DIST raspberrypi-userland-0_pre20140830.tar.xz 32066536 SHA256 f9a06d2ca7d41cdc700b83eeb7c3e06d3ea6bd3fd187880a563144a6bf6ee901 SHA512 775005177e760fff611d7ce7e4beb466ea111dfc4652b97593d1061b97b1ded32979f8666a0aada6338791abab988883bbfd902f267eba5734e8aa932ebcf487 WHIRLPOOL 3066272a88b868ef20f27614f6f680aa6eb8a43cd2e281a7a930b99be341b037fa843a1c36bfdc6be619544e5b4b8751e5ab58c853b1baff44894b39284bfa55
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild
deleted file mode 100644
index 448d6ee..0000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-DESCRIPTION="Raspberry Pi userspace tools and libraries"
-HOMEPAGE="https://github.com/raspberrypi/userland"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN/-//}.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="wayland"
-
-# TODO:
-# * port vcfiled init script
-# * stuff is still installed to hardcoded /opt/vc location, investigate whether
-#   anything else depends on it being there
-# * live ebuild
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-		mv userland-*/ ${P}/ || die
-	fi
-}
-
-src_prepare() {
-	# init script for Debian, not useful on Gentoo
-	sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die
-	# wayland egl support
-	epatch "${FILESDIR}"/next-resource-handle.patch
-	epatch "${FILESDIR}"/wayland-wsys.patch
-}
-
-src_configure() {
-	# toolchain file not needed, but build fails if it is not specified
-	local mycmakeargs=(-DCMAKE_TOOLCHAIN_FILE=/dev/null
-			$(cmake-utils_use_build wayland WAYLAND))
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doenvd "${FILESDIR}"/04${PN}
-
-	# enable dynamic switching of the GL implementation
-	dodir /usr/lib/opengl
-	dosym ../../../opt/vc /usr/lib/opengl/${PN}
-
-	# tell eselect opengl that we do not have libGL
-	touch "${ED}"/opt/vc/.gles-only
-
-	insinto /usr/lib/pkgconfig
-	doins "${FILESDIR}"/bcm_host.pc
-	doins "${FILESDIR}"/egl.pc
-	doins "${FILESDIR}"/glesv2.pc
-}
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140830.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140830.ebuild
new file mode 100644
index 0000000..448d6ee
--- /dev/null
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140830.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Raspberry Pi userspace tools and libraries"
+HOMEPAGE="https://github.com/raspberrypi/userland"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/${PN/-//}.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	KEYWORDS="~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="wayland"
+
+# TODO:
+# * port vcfiled init script
+# * stuff is still installed to hardcoded /opt/vc location, investigate whether
+#   anything else depends on it being there
+# * live ebuild
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-2_src_unpack
+	else
+		default
+		mv userland-*/ ${P}/ || die
+	fi
+}
+
+src_prepare() {
+	# init script for Debian, not useful on Gentoo
+	sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die
+	# wayland egl support
+	epatch "${FILESDIR}"/next-resource-handle.patch
+	epatch "${FILESDIR}"/wayland-wsys.patch
+}
+
+src_configure() {
+	# toolchain file not needed, but build fails if it is not specified
+	local mycmakeargs=(-DCMAKE_TOOLCHAIN_FILE=/dev/null
+			$(cmake-utils_use_build wayland WAYLAND))
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doenvd "${FILESDIR}"/04${PN}
+
+	# enable dynamic switching of the GL implementation
+	dodir /usr/lib/opengl
+	dosym ../../../opt/vc /usr/lib/opengl/${PN}
+
+	# tell eselect opengl that we do not have libGL
+	touch "${ED}"/opt/vc/.gles-only
+
+	insinto /usr/lib/pkgconfig
+	doins "${FILESDIR}"/bcm_host.pc
+	doins "${FILESDIR}"/egl.pc
+	doins "${FILESDIR}"/glesv2.pc
+}
-- 
cgit v1.2.3-65-gdbad