From 110a6721364743b61e2c306fc5c0df738c0a6414 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azahi@teknik.io>
Date: Thu, 18 Feb 2021 18:21:05 +0300
Subject: x11-wm/shod: Bump version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Azat Bahawi <azahi@teknik.io>
---
 x11-wm/shod/Manifest          |  2 +-
 x11-wm/shod/metadata.xml      |  3 +++
 x11-wm/shod/shod-0.2.2.ebuild | 36 ----------------------------------
 x11-wm/shod/shod-0.3.1.ebuild | 45 +++++++++++++++++++++++++++++++++++++++++++
 x11-wm/shod/shod-9999.ebuild  | 21 ++++++++++++++------
 5 files changed, 64 insertions(+), 43 deletions(-)
 delete mode 100644 x11-wm/shod/shod-0.2.2.ebuild
 create mode 100644 x11-wm/shod/shod-0.3.1.ebuild

(limited to 'x11-wm/shod')

diff --git a/x11-wm/shod/Manifest b/x11-wm/shod/Manifest
index ed5b44b..a5c6c27 100644
--- a/x11-wm/shod/Manifest
+++ b/x11-wm/shod/Manifest
@@ -1 +1 @@
-DIST shod-0.2.2.tar.gz 30642 BLAKE2B 836897c9f07ce4358b97151a2f239b7ce773986ad56872b0f6b360c0e6e2b28124e9614a437799c77516fe3bd482418726719551149dc510af2cf7143483414f SHA512 4523bce9ec14186ce4566df3be9da06c488c373e76c8702ecf159098c8596ad5592ab859ece00a9faa0c03774c454fead0efd025d0d5c001e5529490175c2d6b
+DIST shod-0.3.1.tar.gz 23729 BLAKE2B bfb573004ba4ee068ca49f0f633104c63b70d9e466a33a14112b38cb58b953d0f5ccf45dd04d0a49bb74f888d6d0b7ef23b109a55b5d028325490cfefa780211 SHA512 9eae568f82b05ecbcd48cfc42566e056e823f389bb592f847d42b56312e979c1db2651608a2b7226093602e4e625c4c931e99939fbe84d43c38c716fe8011ab2
diff --git a/x11-wm/shod/metadata.xml b/x11-wm/shod/metadata.xml
index 7869e07..5e16e8f 100644
--- a/x11-wm/shod/metadata.xml
+++ b/x11-wm/shod/metadata.xml
@@ -5,4 +5,7 @@
 		<email>azahi@teknik.io</email>
 		<name>azahi</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">phillbush/shod</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/shod/shod-0.2.2.ebuild b/x11-wm/shod/shod-0.2.2.ebuild
deleted file mode 100644
index 106c12c..0000000
--- a/x11-wm/shod/shod-0.2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999 ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/phillbush/shod.git"
-fi
-
-inherit eutils ${SCM}
-
-DESCRIPTION="hybrid (floating and tiling) window manager"
-HOMEPAGE="https://github.com/phillbush/shod"
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/phillbush/shod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXinerama
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_install() {
-	emake PREFIX= DESTDIR="${D}" MANPREFIX="/usr/share/man" install
-}
diff --git a/x11-wm/shod/shod-0.3.1.ebuild b/x11-wm/shod/shod-0.3.1.ebuild
new file mode 100644
index 0000000..fd3f1ad
--- /dev/null
+++ b/x11-wm/shod/shod-0.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/phillbush/shod.git"
+fi
+
+DESCRIPTION="Hybrid (floating and tiling) window manager"
+HOMEPAGE="https://github.com/phillbush/shod"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/phillbush/shod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXinerama
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -e '/^CPPFLAGS/d' \
+		-e 's/FLAGS =/FLAGS +=/g' \
+		-i config.mk || die
+
+	default
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr"
+}
diff --git a/x11-wm/shod/shod-9999.ebuild b/x11-wm/shod/shod-9999.ebuild
index 106c12c..fd3f1ad 100644
--- a/x11-wm/shod/shod-9999.ebuild
+++ b/x11-wm/shod/shod-9999.ebuild
@@ -4,13 +4,11 @@
 EAPI=7
 
 if [[ ${PV} == *9999 ]]; then
-	SCM="git-r3"
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/phillbush/shod.git"
 fi
 
-inherit eutils ${SCM}
-
-DESCRIPTION="hybrid (floating and tiling) window manager"
+DESCRIPTION="Hybrid (floating and tiling) window manager"
 HOMEPAGE="https://github.com/phillbush/shod"
 
 if [[ ${PV} == *9999 ]]; then
@@ -25,12 +23,23 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-DEPEND="x11-libs/libX11
+DEPEND="
+	x11-libs/libX11
 	x11-libs/libXinerama
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
+src_prepare() {
+	sed -e '/^CPPFLAGS/d' \
+		-e 's/FLAGS =/FLAGS +=/g' \
+		-i config.mk || die
+
+	default
+}
+
 src_install() {
-	emake PREFIX= DESTDIR="${D}" MANPREFIX="/usr/share/man" install
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr"
 }
-- 
cgit 1.4.1