Adding metadata

5 files changed, 19 insertions, 68 deletions

diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index e907ae2afc09..30dd003a8d33 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,2 +1 @@
-DIST glfw-3.3.3.tar.gz 763713 BLAKE2B bd6202877a3462d717a6d77b6381de704da854df011f7ab5172e626dc46df90793190284241b470a4b78e020302e5dca4051476e092e73e34731f6245a43ea14 SHA512 6d743d89d159bff6c4f7fa3fc5bc407fd728bdc432d76acc4897fd392580be272f8a9d1d7c375c4323e82bf2fd28310e5daab097fef33e8f43b69ce104f9bd31
 DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
diff --git a/media-libs/glfw/glfw-3.3.3.ebuild b/media-libs/glfw/glfw-3.3.4-r2.ebuild
index 126bde0fc027..a8d714e18bad 100644
--- a/media-libs/glfw/glfw-3.3.3.ebuild
+++ b/media-libs/glfw/glfw-3.3.4-r2.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	)
 	wayland? (
 		dev-libs/wayland
-		media-libs/mesa[egl,wayland]
+		media-libs/mesa[egl(+),wayland]
 	)
 "
 DEPEND="
diff --git a/media-libs/glfw/glfw-3.3.4-r1.ebuild b/media-libs/glfw/glfw-3.3.4-r3.ebuild
index 43f33ee0dd73..499e6061c4fe 100644
--- a/media-libs/glfw/glfw-3.3.4-r1.ebuild
+++ b/media-libs/glfw/glfw-3.3.4-r3.ebuild
@@ -6,50 +6,47 @@ EAPI=7
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-DESCRIPTION="The Portable OpenGL FrameWork"
+DESCRIPTION="Portable OpenGL FrameWork"
 HOMEPAGE="https://www.glfw.org/"
 SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-IUSE="wayland"
+IUSE="wayland-only"
 
+# note: libglfw uses dlopen() for most of these at runtime
 RDEPEND="
 	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	!wayland? (
+	wayland-only? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		media-libs/mesa[egl(+),wayland,${MULTILIB_USEDEP}]
+	)
+	!wayland-only? (
 		virtual/opengl[${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXinerama[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		media-libs/mesa[egl,wayland,${MULTILIB_USEDEP}]
-	)
-"
+	)"
 DEPEND="
 	${RDEPEND}
-	!wayland? (
+	wayland-only? ( dev-libs/wayland-protocols )
+	!wayland-only? (
 		x11-base/xorg-proto
 		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-	wayland? ( dev-libs/wayland-protocols )
-"
+	)"
 BDEPEND="
-	wayland? (
+	wayland-only? (
 		dev-util/wayland-scanner
 		kde-frameworks/extra-cmake-modules
-	)
-"
+	)"
 
 src_configure() {
 	local mycmakeargs=(
 		-DGLFW_BUILD_EXAMPLES=no
-		-DGLFW_USE_WAYLAND="$(usex wayland)"
-		-DBUILD_SHARED_LIBS=1
+		-DGLFW_USE_WAYLAND=$(usex wayland-only)
 	)
 	cmake-multilib_src_configure
 }
diff --git a/media-libs/glfw/glfw-3.3.4.ebuild b/media-libs/glfw/glfw-3.3.4.ebuild
deleted file mode 100644
index 126bde0fc027..000000000000
--- a/media-libs/glfw/glfw-3.3.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="https://www.glfw.org/"
-SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
-IUSE="wayland"
-
-RDEPEND="
-	x11-libs/libxkbcommon
-	!wayland? (
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-	)
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[egl,wayland]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	!wayland? ( x11-libs/libXi )
-	wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
-	wayland? ( kde-frameworks/extra-cmake-modules )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLFW_BUILD_EXAMPLES=no
-		-DGLFW_USE_WAYLAND="$(usex wayland)"
-		-DBUILD_SHARED_LIBS=1
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/glfw/metadata.xml b/media-libs/glfw/metadata.xml
index 5375ac1710b5..d3c3b26a7335 100644
--- a/media-libs/glfw/metadata.xml
+++ b/media-libs/glfw/metadata.xml
@@ -8,5 +8,8 @@
  <upstream>
   <changelog>https://www.glfw.org/changelog.html</changelog>
  </upstream>
+ <use>
+  <flag name="wayland-only">Enable wayland support and disable X11 support</flag>
+ </use>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file