From 49c62898ebdd980451fa5a0668f5f4b3d2afb6ff Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azahi@teknik.io>
Date: Tue, 24 Nov 2020 08:54:58 +0300
Subject: x11-misc/devour: Bump version, update build

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Azat Bahawi <azahi@teknik.io>
---
 x11-misc/devour/Manifest           |  2 +-
 x11-misc/devour/devour-10.ebuild   | 32 ------------------------
 x11-misc/devour/devour-12.ebuild   | 51 ++++++++++++++++++++++++++++++++++++++
 x11-misc/devour/devour-9999.ebuild | 27 +++++++++++++++++---
 x11-misc/devour/metadata.xml       |  3 +++
 5 files changed, 78 insertions(+), 37 deletions(-)
 delete mode 100644 x11-misc/devour/devour-10.ebuild
 create mode 100644 x11-misc/devour/devour-12.ebuild

(limited to 'x11-misc/devour')

diff --git a/x11-misc/devour/Manifest b/x11-misc/devour/Manifest
index 0e4a278..7958ae5 100644
--- a/x11-misc/devour/Manifest
+++ b/x11-misc/devour/Manifest
@@ -1 +1 @@
-DIST v10.tar.gz 4400921 BLAKE2B b1e3f9fc606ff8e8d4838d9d608a19e5476e93ef8ba5fec1ff1dc3bac43b96ba3d88387e5a7abcd0ac8865f866c4e7e7a52016775e1e5998854bd1c06d8a1ecb SHA512 21b77d77bbb641ea8f3e7ae77f9368bb4dd411ec9896c28df4415aa2ae753a50f91543dd33990ff3b185e0326b2c96e1edba72c37e253a5aba7ec85a86162679
+DIST 12.tar.gz 4387928 BLAKE2B 90838fadb6767cb7ac13a124fa4aebda1a5f67bc51c45cbf4353407b1579cab65d81be54e2c3aa485c4b32398014aa5cb01b57ef1481513ea6c145d2115fff7f SHA512 d2c7ded95d3d22612be54a318c553a79bf8f57cf97990859774c8ee85b5fa3210a9e3263098ba344fd7e021f2db44815523a2874bfd0bb3ed7bfaab8827fcb84
diff --git a/x11-misc/devour/devour-10.ebuild b/x11-misc/devour/devour-10.ebuild
deleted file mode 100644
index 1b871fb..0000000
--- a/x11-misc/devour/devour-10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020 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/salman-abedin/devour.git"
-fi
-
-DESCRIPTION="Window Manager agnostic swallowing feature for terminal emulators"
-HOMEPAGE="https://github.com/salman-abedin/devour"
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/salman-abedin/devour/archive/v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/x11-misc/devour/devour-12.ebuild b/x11-misc/devour/devour-12.ebuild
new file mode 100644
index 0000000..2b88b39
--- /dev/null
+++ b/x11-misc/devour/devour-12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 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/salman-abedin/devour.git"
+fi
+
+inherit toolchain-funcs "${SCM}"
+
+DESCRIPTION="Window manager agnostic swallowing feature for terminal emulators"
+HOMEPAGE="https://github.com/salman-abedin/devour"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/salman-abedin/devour/archive/${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	sed -e 's/^CFLAGS =/CFLAGS +=/' \
+		-e 's/ -s //g' \
+		-e 's/ -O2//g' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	einstalldocs
+}
diff --git a/x11-misc/devour/devour-9999.ebuild b/x11-misc/devour/devour-9999.ebuild
index a79c528..2b88b39 100644
--- a/x11-misc/devour/devour-9999.ebuild
+++ b/x11-misc/devour/devour-9999.ebuild
@@ -4,18 +4,20 @@
 EAPI=7
 
 if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
+	SCM="git-r3"
 	EGIT_REPO_URI="https://github.com/salman-abedin/devour.git"
 fi
 
-DESCRIPTION="Window Manager agnostic swallowing feature for terminal emulators"
+inherit toolchain-funcs "${SCM}"
+
+DESCRIPTION="Window manager agnostic swallowing feature for terminal emulators"
 HOMEPAGE="https://github.com/salman-abedin/devour"
 
 if [[ ${PV} == *9999 ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/salman-abedin/devour/archive/v${PV}.tar.gz"
+	SRC_URI="https://github.com/salman-abedin/devour/archive/${PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -27,6 +29,23 @@ DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	sed -e 's/^CFLAGS =/CFLAGS +=/' \
+		-e 's/ -s //g' \
+		-e 's/ -O2//g' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)"
+}
+
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" BINPREFIX="/usr/bin" install
+	dobin ${PN}
+	einstalldocs
 }
diff --git a/x11-misc/devour/metadata.xml b/x11-misc/devour/metadata.xml
index 90ac276..5b0a8f5 100644
--- a/x11-misc/devour/metadata.xml
+++ b/x11-misc/devour/metadata.xml
@@ -5,4 +5,7 @@
 		<email>casey@theavilas.org</email>
 		<name>casey</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">salman-abedin/devour</remote-id>
+	</upstream>
 </pkgmetadata>
-- 
cgit 1.4.1