From 44b0a2f7cb487d9f6649305fc245ef174508a675 Mon Sep 17 00:00:00 2001
From: Benoit Gschwind <gschwind@gnu-log.net>
Date: Fri, 8 Jul 2022 09:42:29 +0200
Subject: x11-wm/page: Fix #832976 and #832475
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: https://bugs.gentoo.org/832475
Bug: https://bugs.gentoo.org/832976
Signed-off-by: Benoît Gschwind <gschwind@gnu-log.net>
Closes: https://github.com/gentoo/gentoo/pull/26279
Signed-off-by: Florian Schmaus <flow@gentoo.org>
---
 x11-wm/page/Manifest             |  2 +-
 x11-wm/page/page-1.9.10.ebuild   | 43 ++++++++++++++++++++++++++++++++++
 x11-wm/page/page-1.9.9-r4.ebuild | 50 ----------------------------------------
 3 files changed, 44 insertions(+), 51 deletions(-)
 create mode 100644 x11-wm/page/page-1.9.10.ebuild
 delete mode 100644 x11-wm/page/page-1.9.9-r4.ebuild

(limited to 'x11-wm')

diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index d582910bde41..b7a8d7444191 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1 +1 @@
-DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
+DIST page-1.9.10.tar.gz 550021 BLAKE2B e42ce482b9f7da70f69fa08557e7327d51a8a02a6e4d76adb9a50787ae20fe0bfe22e25bc9413156c0812f6708fe7e0e1c2e59e6bd9d7a16be8f52caf6a3ab34 SHA512 243d59d66d4a57a2141ebc953a271b9dd0202fd495a5aabb4245cb7d9979b97438a16a5f19c1eecea3596252ee68dd96a1a6fd052e4b706ab2c62678a5d3a9f0
diff --git a/x11-wm/page/page-1.9.10.ebuild b/x11-wm/page/page-1.9.10.ebuild
new file mode 100644
index 000000000000..698301c6a483
--- /dev/null
+++ b/x11-wm/page/page-1.9.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="https://github.com/gschwind/page"
+SRC_URI="https://github.com/gschwind/page/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.11[xkb]
+	>=x11-libs/xcb-util-0.4.0
+	>=x11-libs/libXfixes-5.0.3
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXrandr-1.5.1
+	>=x11-libs/libXcomposite-0.4.4-r1
+	>=x11-libs/libXrender-0.9.10
+	>=x11-libs/libXext-1.3.3
+	>=x11-libs/cairo-1.14.6[X,xcb(+)]
+	>=x11-libs/pango-1.40.5
+	>=dev-libs/glib-2.50.3-r1:2"
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.12-r2
+	x11-base/xorg-proto"
+
+src_install() {
+	default
+
+	# Solves file collision with dev-tcltk/tcllib, bug #574074
+	ebegin "Changing references from 'page' to 'pagewm'"
+	mv "${ED}"/usr/bin/page "${ED}"/usr/bin/pagewm || die "Could not rename binary!"
+	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${ED}"/usr/share/applications/page.desktop || die "Could not change .desktop file!"
+	eend $?
+}
+
+pkg_postinst() {
+	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
+	elog "see the following bug report: https://bugs.gentoo.org/574074."
+}
diff --git a/x11-wm/page/page-1.9.9-r4.ebuild b/x11-wm/page/page-1.9.9-r4.ebuild
deleted file mode 100644
index 6f84a55fe81d..000000000000
--- a/x11-wm/page/page-1.9.9-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="https://github.com/gschwind/page"
-SRC_URI="http://www.hzog.net/pub/${PN}-1.9.9-r1.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=x11-libs/libxcb-1.11[xkb]
-	>=x11-libs/xcb-util-0.4.0
-	>=x11-libs/libXfixes-5.0.3
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXrandr-1.5.1
-	>=x11-libs/libXcomposite-0.4.4-r1
-	>=x11-libs/libXrender-0.9.10
-	>=x11-libs/libXext-1.3.3
-	>=x11-libs/cairo-1.14.6[X,xcb(+)]
-	>=x11-libs/pango-1.40.5
-	>=dev-libs/glib-2.50.3-r1:2"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.12-r2
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# Solves file collision with dev-tcltk/tcllib, bug #574074
-	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${ED}"/usr/bin/page "${ED}"/usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${ED}"/usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend $?
-}
-
-pkg_postinst() {
-	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
-	elog "see the following bug report: https://bugs.gentoo.org/574074."
-}
-- 
cgit v1.2.3-65-gdbad