From bb9b17b3eb3da9c2f01de0ad891d9758e326179e Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azahi@teknik.io>
Date: Fri, 5 Feb 2021 17:11:00 +0300
Subject: x11-misc/pmenu: Bump version, update building

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Azat Bahawi <azahi@teknik.io>
---
 x11-misc/pmenu/Manifest           |  2 +-
 x11-misc/pmenu/metadata.xml       |  3 ++
 x11-misc/pmenu/pmenu-2.0.ebuild   | 40 --------------------------
 x11-misc/pmenu/pmenu-2.2.0.ebuild | 60 +++++++++++++++++++++++++++++++++++++++
 x11-misc/pmenu/pmenu-9999.ebuild  | 24 ++++++++++++++--
 5 files changed, 86 insertions(+), 43 deletions(-)
 delete mode 100644 x11-misc/pmenu/pmenu-2.0.ebuild
 create mode 100644 x11-misc/pmenu/pmenu-2.2.0.ebuild

diff --git a/x11-misc/pmenu/Manifest b/x11-misc/pmenu/Manifest
index 2891db1..b23c1e4 100644
--- a/x11-misc/pmenu/Manifest
+++ b/x11-misc/pmenu/Manifest
@@ -1 +1 @@
-DIST pmenu-2.0.tar.gz 13759 BLAKE2B e877ed244b0faf4a861ed73c9e2655132df3c33bdd4bc1467eb11fa673e1e84f90f2715b416b4c17fb5e087eae6bbe107649154fcbe1bee15018eacf10c151f7 SHA512 8b6503389eeabd2b017d9722351166e581c3917796aaf7aada69e2c4dfc938efd49bad9438c315a1ee465a98a0c6ca8b51a204d83f3dae68a085481c35981faa
+DIST pmenu-2.2.0.tar.gz 15264 BLAKE2B d39e38c872a99ed59458a0d7993ecebca97506eb1318aca9481b7e6340fe32ef74bb34f68c40e222dfd5c41ad848e67c6a4772e824b318a10ec164642fd3cdae SHA512 5daabe4686ade63cd6c460d9ec706abc0c1a598f8f885cbee45f21d94634a6ccc330793fb383c87f7cf7eef4ce82e7217389bef3702631758616a34cad83b560
diff --git a/x11-misc/pmenu/metadata.xml b/x11-misc/pmenu/metadata.xml
index 7869e07..05ff9ed 100644
--- a/x11-misc/pmenu/metadata.xml
+++ b/x11-misc/pmenu/metadata.xml
@@ -5,4 +5,7 @@
 		<email>azahi@teknik.io</email>
 		<name>azahi</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">phillbush/pmenu</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/pmenu/pmenu-2.0.ebuild b/x11-misc/pmenu/pmenu-2.0.ebuild
deleted file mode 100644
index 14416cf..0000000
--- a/x11-misc/pmenu/pmenu-2.0.ebuild
+++ /dev/null
@@ -1,40 +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/pmenu.git"
-fi
-
-inherit eutils ${SCM}
-
-DESCRIPTION="A pie-menu in xlib and imlib2"
-HOMEPAGE="https://github.com/phillbush/pmenu"
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/phillbush/pmenu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="media-libs/fontconfig
-	media-libs/imlib2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXinerama
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_install() {
-	emake PREFIX= DESTDIR="${D}" MANPREFIX="/usr/share/man" install
-}
diff --git a/x11-misc/pmenu/pmenu-2.2.0.ebuild b/x11-misc/pmenu/pmenu-2.2.0.ebuild
new file mode 100644
index 0000000..b1569c4
--- /dev/null
+++ b/x11-misc/pmenu/pmenu-2.2.0.ebuild
@@ -0,0 +1,60 @@
+# 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/pmenu.git"
+fi
+
+inherit toolchain-funcs ${SCM}
+
+DESCRIPTION="A pie-menu in xlib and imlib2"
+HOMEPAGE="https://github.com/phillbush/pmenu"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/phillbush/pmenu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="media-libs/fontconfig
+	media-libs/imlib2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrender
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	sed -e '/^CPPFLAGS/d' \
+		-e 's/^CFLAGS =/CFLAGS +=/g' \
+		-e 's/^LDFLAGS =/LDFLAGS +=/g' \
+		-i config.mk || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr"
+	einstalldocs
+}
diff --git a/x11-misc/pmenu/pmenu-9999.ebuild b/x11-misc/pmenu/pmenu-9999.ebuild
index 14416cf..b1569c4 100644
--- a/x11-misc/pmenu/pmenu-9999.ebuild
+++ b/x11-misc/pmenu/pmenu-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/phillbush/pmenu.git"
 fi
 
-inherit eutils ${SCM}
+inherit toolchain-funcs ${SCM}
 
 DESCRIPTION="A pie-menu in xlib and imlib2"
 HOMEPAGE="https://github.com/phillbush/pmenu"
@@ -31,10 +31,30 @@ DEPEND="media-libs/fontconfig
 	x11-libs/libXext
 	x11-libs/libXft
 	x11-libs/libXinerama
+	x11-libs/libXrender
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	sed -e '/^CPPFLAGS/d' \
+		-e 's/^CFLAGS =/CFLAGS +=/g' \
+		-e 's/^LDFLAGS =/LDFLAGS +=/g' \
+		-i config.mk || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)"
+}
+
 src_install() {
-	emake PREFIX= DESTDIR="${D}" MANPREFIX="/usr/share/man" install
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr"
+	einstalldocs
 }
-- 
cgit 1.4.1