public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-misc/grabcartoons/, app-misc/grabcartoons/files/
@ 2023-07-08 18:08 Conrad Kostecki
  0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2023-07-08 18:08 UTC (permalink / raw
  To: gentoo-commits

commit:     e22462b1b41c1cf4cf9248344b2358efa9608321
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul  4 13:04:52 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 18:06:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e22462b1

app-misc/grabcartoons: remove old

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31739
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-misc/grabcartoons/Manifest                     |  1 -
 .../files/2.8.4-fix-install-paths.patch            | 32 ---------------------
 .../grabcartoons-2.8.4_p20141112.ebuild            | 33 ----------------------
 3 files changed, 66 deletions(-)

diff --git a/app-misc/grabcartoons/Manifest b/app-misc/grabcartoons/Manifest
index d88db82a478f..0afe0709b130 100644
--- a/app-misc/grabcartoons/Manifest
+++ b/app-misc/grabcartoons/Manifest
@@ -1,2 +1 @@
-DIST grabcartoons-2.8.4_p20141112.tar.gz 40998 BLAKE2B 616dde080c8e35548a527ede7c844fb23b733408bb21ce621065d698220111637b9cf8b044d56dabc6b0987123c656743a8c111b8e9c01cbeb589ed3bf35eb94 SHA512 6de81d151414ccbb7b00c2f472f0d811a7024c67a3c4bdc929babf2ff8990280ba1fde0851e4405dbc487c58e99f13a1dd07a0cd202099f6289dd0ed61296ee5
 DIST grabcartoons-2.8.5.tar.gz 48140 BLAKE2B 436c50f35f482b96d19cd5a61017fd0912674b7904ebaecc698806dbbf7faa7030424198568d0001c5be5ffe6567f34e877f11720dcf90c3a71332bd0ca9a470 SHA512 dc20e5ee04585c2a8279991025973ffe0805887a41195e8e5cb38dcd3652174a4f45174f7ecbbb7130a753f5ee63b87ad002ef1062406f95efb76c74186ef5ad

diff --git a/app-misc/grabcartoons/files/2.8.4-fix-install-paths.patch b/app-misc/grabcartoons/files/2.8.4-fix-install-paths.patch
deleted file mode 100644
index 420640b3de6c..000000000000
--- a/app-misc/grabcartoons/files/2.8.4-fix-install-paths.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a1f53e6..0a9bec4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -23,9 +23,9 @@ all:
- 
- install:
- 	mkdir -p -m 755 $(PREFIX)/bin
--	mkdir -p -m 755 $(PREFIX)/lib/grabcartoons/modules
--	install -m 755 grabcartoons.pl $(PREFIX)/bin
--	install -m 644 modules/*.pl $(PREFIX)/lib/grabcartoons/modules
-+	mkdir -p -m 755 $(PREFIX)/share/grabcartoons/modules
-+	install -m 755 grabcartoons.pl $(PREFIX)/bin/grabcartoons
-+	install -m 644 modules/*.pl $(PREFIX)/share/grabcartoons/modules
- 
- test:
- 	./grabcartoons.pl $(V) "$(C)" > "$(OUT)"
-diff --git a/grabcartoons.pl b/grabcartoons.pl
-index cdc4152..d732301 100755
---- a/grabcartoons.pl
-+++ b/grabcartoons.pl
-@@ -38,8 +38,8 @@ $XTRN_CMD="$XTRN_PROG -q -O- $USER_AGENT_CMD";
- # Where to load cartoon modules from
- @MODULE_DIRS=("$FindBin::Bin/modules",
-               "$FindBin::RealBin/modules",
--	      "$FindBin::Bin/../lib/grabcartoons/modules",
--	      "$FindBin::RealBin/../lib/grabcartoons/modules",
-+	      "$FindBin::Bin/../share/grabcartoons/modules",
-+	      "$FindBin::RealBin/../share/grabcartoons/modules",
- 	      "$HOME/.grabcartoons/modules",
- 	      "$HOME/.grabcartoons",
- 	      @GRABCARTOONS_DIRS,

diff --git a/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
deleted file mode 100644
index 6a318e06fa51..000000000000
--- a/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/zzamboni/grabcartoons/archive/cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Comic-summarizing utility"
-HOMEPAGE="https://zzamboni.org/code/grabcartoons/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-# Opens a web page, which is unacceptable during an emerge.
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-PATCHES=( "${FILESDIR}"/2.8.4-fix-install-paths.patch )
-
-src_install() {
-	emake PREFIX="${ED%/}"/usr install
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/grabcartoons/, app-misc/grabcartoons/files/
@ 2023-07-08 18:08 Conrad Kostecki
  0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2023-07-08 18:08 UTC (permalink / raw
  To: gentoo-commits

commit:     272bfb060021a8f22d329bd8b6520ae06c6d5840
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul  4 13:04:18 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 18:06:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=272bfb06

app-misc/grabcartoons: version bump (v2.8.5)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-misc/grabcartoons/Manifest                     |  1 +
 .../files/2.8.5-fix-install-paths.patch            | 28 +++++++++++++++++++
 app-misc/grabcartoons/grabcartoons-2.8.5.ebuild    | 31 ++++++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/app-misc/grabcartoons/Manifest b/app-misc/grabcartoons/Manifest
index 0e03ab816d43..d88db82a478f 100644
--- a/app-misc/grabcartoons/Manifest
+++ b/app-misc/grabcartoons/Manifest
@@ -1 +1,2 @@
 DIST grabcartoons-2.8.4_p20141112.tar.gz 40998 BLAKE2B 616dde080c8e35548a527ede7c844fb23b733408bb21ce621065d698220111637b9cf8b044d56dabc6b0987123c656743a8c111b8e9c01cbeb589ed3bf35eb94 SHA512 6de81d151414ccbb7b00c2f472f0d811a7024c67a3c4bdc929babf2ff8990280ba1fde0851e4405dbc487c58e99f13a1dd07a0cd202099f6289dd0ed61296ee5
+DIST grabcartoons-2.8.5.tar.gz 48140 BLAKE2B 436c50f35f482b96d19cd5a61017fd0912674b7904ebaecc698806dbbf7faa7030424198568d0001c5be5ffe6567f34e877f11720dcf90c3a71332bd0ca9a470 SHA512 dc20e5ee04585c2a8279991025973ffe0805887a41195e8e5cb38dcd3652174a4f45174f7ecbbb7130a753f5ee63b87ad002ef1062406f95efb76c74186ef5ad

diff --git a/app-misc/grabcartoons/files/2.8.5-fix-install-paths.patch b/app-misc/grabcartoons/files/2.8.5-fix-install-paths.patch
new file mode 100644
index 000000000000..f3cb0c9fe3d9
--- /dev/null
+++ b/app-misc/grabcartoons/files/2.8.5-fix-install-paths.patch
@@ -0,0 +1,28 @@
+--- a/Makefile
++++ b/Makefile
+@@ -23,9 +23,9 @@
+ 
+ install:
+ 	mkdir -p -m 755 $(PREFIX)/bin
+-	mkdir -p -m 755 $(PREFIX)/lib/grabcartoons/modules
+-	install -m 755 grabcartoons.pl $(PREFIX)/bin
+-	install -m 644 modules/*.pl $(PREFIX)/lib/grabcartoons/modules
++	mkdir -p -m 755 $(PREFIX)/share/grabcartoons/modules
++	install -m 755 grabcartoons.pl $(PREFIX)/bin/grabcartoons
++	install -m 644 modules/*.pl $(PREFIX)/share/grabcartoons/modules
+ 
+ test:
+ 	./grabcartoons.pl $(V) "$(C)" > "$(OUT)"
+--- a/grabcartoons.pl
++++ b/grabcartoons.pl
+@@ -39,8 +39,8 @@
+ # Where to load cartoon modules from
+ @MODULE_DIRS=("$FindBin::Bin/modules",
+               "$FindBin::RealBin/modules",
+-              "$FindBin::Bin/../lib/grabcartoons/modules",
+-              "$FindBin::RealBin/../lib/grabcartoons/modules",
++              "$FindBin::Bin/../share/grabcartoons/modules",
++              "$FindBin::RealBin/../share/grabcartoons/modules",
+               "$HOME/.grabcartoons/modules",
+               "$HOME/.grabcartoons",
+               @GRABCARTOONS_DIRS,

diff --git a/app-misc/grabcartoons/grabcartoons-2.8.5.ebuild b/app-misc/grabcartoons/grabcartoons-2.8.5.ebuild
new file mode 100644
index 000000000000..bbd0173a4e06
--- /dev/null
+++ b/app-misc/grabcartoons/grabcartoons-2.8.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"
+else
+	SRC_URI="https://github.com/zzamboni/grabcartoons/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Comic-summarizing utility"
+HOMEPAGE="https://zzamboni.org/code/grabcartoons/"
+
+LICENSE="BSD"
+SLOT="0"
+# Opens a web page, which is unacceptable during an emerge.
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/perl
+	virtual/perl-Getopt-Long"
+
+PATCHES=( "${FILESDIR}"/${PV}-fix-install-paths.patch )
+
+src_install() {
+	emake PREFIX="${ED}"/usr install
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-07-08 18:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-08 18:08 [gentoo-commits] repo/gentoo:master commit in: app-misc/grabcartoons/, app-misc/grabcartoons/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2023-07-08 18:08 Conrad Kostecki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox