[gentoo-commits] repo/proj/guru:master commit in: app-text/stdman/, app-text/stdman/files/

[gentoo-commits] repo/proj/guru:master commit in: app-text/stdman/, app-text/stdman/files/

[Andrew Ammerlaan]

commit:     5fefbc6eeb8ee694b0f9e943788ad48acd694adb
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Mon Dec 21 09:32:39 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Dec 21 09:46:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5fefbc6e

app-text/stdman: use sed instead of a patch

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 .../stdman/files/stdman-dont-compress-files.patch  | 11 ----------
 app-text/stdman/stdman-2019.08.27.ebuild           | 23 ++++++++++-----------
 app-text/stdman/stdman-9999.ebuild                 | 24 +++++++++++-----------
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/app-text/stdman/files/stdman-dont-compress-files.patch b/app-text/stdman/files/stdman-dont-compress-files.patch
deleted file mode 100644
index fdc609ed..00000000
--- a/app-text/stdman/files/stdman-dont-compress-files.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/do_install b/do_install
-index acce4650..121c1b82 100755
---- a/do_install
-+++ b/do_install
-@@ -16,6 +16,5 @@ mkdir -p $mandir/man3
- for file in "$tmp_man"/*.3 ; do
-   out=$mandir/man3/$(basename "$file");
-   install -m 0644 "$file" "$out";
--  gzip -f "$out";
- done
- echo "Done; it's advised to run 'sudo mandb' (GNU) or 'sudo makewhatis' (BSD) now."

diff --git a/app-text/stdman/stdman-2019.08.27.ebuild b/app-text/stdman/stdman-2019.08.27.ebuild
index 17a511f9..0813d588 100644
--- a/app-text/stdman/stdman-2019.08.27.ebuild
+++ b/app-text/stdman/stdman-2019.08.27.ebuild
@@ -3,27 +3,26 @@
 
 EAPI=7
 
-inherit eutils
-
 DESCRIPTION="Formatted C++ stdlib man pages (cppreference)"
 HOMEPAGE="https://github.com/jeaye/stdman"
-LICENSE="MIT"
-
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${PN}-dont-compress-files.patch" )
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jeaye/stdman"
+	EGIT_REPO_URI="https://github.com/jeaye/stdman.git"
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/jeaye/stdman/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+	# Avoid compressing files
+	sed -i '/gzip/d' do_install || die
+}
+
 src_compile() {
 	# don't need to compile anything
 	true

diff --git a/app-text/stdman/stdman-9999.ebuild b/app-text/stdman/stdman-9999.ebuild
index 16dde78c..0813d588 100644
--- a/app-text/stdman/stdman-9999.ebuild
+++ b/app-text/stdman/stdman-9999.ebuild
@@ -3,26 +3,26 @@
 
 EAPI=7
 
-inherit eutils
-
 DESCRIPTION="Formatted C++ stdlib man pages (cppreference)"
 HOMEPAGE="https://github.com/jeaye/stdman"
-LICENSE="MIT"
-
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${PN}-dont-compress-files.patch" )
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jeaye/stdman"
+	EGIT_REPO_URI="https://github.com/jeaye/stdman.git"
 else
+	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/jeaye/stdman/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+	# Avoid compressing files
+	sed -i '/gzip/d' do_install || die
+}
+
 src_compile() {
 	# don't need to compile anything
 	true