From 99b2c44c1425c7b2925846d4c44b2bf2f78dc786 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Jul 2023 22:23:22 +0100 Subject: gentoo auto-resync : 08:07:2023 - 22:23:22 --- app-misc/grabcartoons/Manifest | 8 +++--- .../files/2.8.4-fix-install-paths.patch | 32 --------------------- .../files/2.8.5-fix-install-paths.patch | 28 ++++++++++++++++++ .../grabcartoons-2.8.4_p20141112.ebuild | 33 ---------------------- app-misc/grabcartoons/grabcartoons-2.8.5.ebuild | 31 ++++++++++++++++++++ app-misc/grabcartoons/grabcartoons-9999.ebuild | 12 ++++---- 6 files changed, 68 insertions(+), 76 deletions(-) delete mode 100644 app-misc/grabcartoons/files/2.8.4-fix-install-paths.patch create mode 100644 app-misc/grabcartoons/files/2.8.5-fix-install-paths.patch delete mode 100644 app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild create mode 100644 app-misc/grabcartoons/grabcartoons-2.8.5.ebuild (limited to 'app-misc/grabcartoons') diff --git a/app-misc/grabcartoons/Manifest b/app-misc/grabcartoons/Manifest index a86ee39ae405..ecfdbca2318d 100644 --- a/app-misc/grabcartoons/Manifest +++ b/app-misc/grabcartoons/Manifest @@ -1,5 +1,5 @@ -AUX 2.8.4-fix-install-paths.patch 1189 BLAKE2B bb9e00721bcc4cbb766e6ddb432b49a0b0b2c9525a020a4a798ca8b80a4d2cbe3b8caa9383a6f8dba3804283df31f7eb17b8219d231dccb6c3ded1227cddf8c5 SHA512 3983cb0487cd1f770c985700297df01d5f33761d8dbacad413a3e50c315a999ae3a70a918b46149928124e6e4a299a8f4994bf60fec990aea6a87313bbc283ec -DIST grabcartoons-2.8.4_p20141112.tar.gz 40998 BLAKE2B 616dde080c8e35548a527ede7c844fb23b733408bb21ce621065d698220111637b9cf8b044d56dabc6b0987123c656743a8c111b8e9c01cbeb589ed3bf35eb94 SHA512 6de81d151414ccbb7b00c2f472f0d811a7024c67a3c4bdc929babf2ff8990280ba1fde0851e4405dbc487c58e99f13a1dd07a0cd202099f6289dd0ed61296ee5 -EBUILD grabcartoons-2.8.4_p20141112.ebuild 781 BLAKE2B 96d4dfeca13963d7dad314f760d3acea76c32b363ff9f9c53efa30fe2dd4a2892c92a461792c2ed7dd2559eefd20fa102234767362604ab760808abd43a22ac8 SHA512 a0731492596232cbd02fb803cc2ce03895a712ef77096e75e3d4d57aee16daf9dda88ff6aee0a1540ef0b9a466b31955ba613880d3f0591aa9ec2d1cb9c69455 -EBUILD grabcartoons-9999.ebuild 781 BLAKE2B 96d4dfeca13963d7dad314f760d3acea76c32b363ff9f9c53efa30fe2dd4a2892c92a461792c2ed7dd2559eefd20fa102234767362604ab760808abd43a22ac8 SHA512 a0731492596232cbd02fb803cc2ce03895a712ef77096e75e3d4d57aee16daf9dda88ff6aee0a1540ef0b9a466b31955ba613880d3f0591aa9ec2d1cb9c69455 +AUX 2.8.5-fix-install-paths.patch 1046 BLAKE2B e5557d713fdc7548ff07d94099159ced3b1a20eb8047aea44e378fc5e76e41fc8786da40ff891f9bdfe886fcf3cd0f94b255f5315f8db25f1812afa3b2553999 SHA512 7292abfd6afb3a40a9c0d2cd9baacfea343a10732b00b43269077663ea45d915808ecf51d5a0d118bffd48dd5c4df64e7f4ca3c392a7a4e2c11c9776de6835c0 +DIST grabcartoons-2.8.5.tar.gz 48140 BLAKE2B 436c50f35f482b96d19cd5a61017fd0912674b7904ebaecc698806dbbf7faa7030424198568d0001c5be5ffe6567f34e877f11720dcf90c3a71332bd0ca9a470 SHA512 dc20e5ee04585c2a8279991025973ffe0805887a41195e8e5cb38dcd3652174a4f45174f7ecbbb7130a753f5ee63b87ad002ef1062406f95efb76c74186ef5ad +EBUILD grabcartoons-2.8.5.ebuild 722 BLAKE2B dae4655a57c017ff0173a7135ffec659b5b453c2d16fba6635bba914de6ff44be2e636f8fd74bd9cf8205a9e5ab92f96b161ee30de71efbb7e8c39e14f14dce3 SHA512 c6fb34bc7eec5ce2bfa00bd106cdc22c801ac45ab94822e208907f40403cdc445c6be480cade965548ff8ec8fdbd5e9f5ba391db9b33e447b674da00b5377fb3 +EBUILD grabcartoons-9999.ebuild 722 BLAKE2B 97dd168e0ed534fb3b443747e247ef4be1ae479f9f9a303909fcce4ed99ab814cc92d6fb672b12491721ebb96811df042aa7f94786255265b5da76ca8848a1fa SHA512 5990081ab6195fa32237bf72fb36e4390853133d67c82ccbe4a06ece01f0e6dfc6765bc383984f5c0d1d6cf68b1afeb2efaad3491033665e19bb967c59cfcd5d MISC metadata.xml 254 BLAKE2B fa726ec630d2945db87176dfd9ace7ff0a570f48135182b2d3fef6804788414420c6779c34e0fececa88ce06262806e0063d6893c97c553530cf99fcffd5dec3 SHA512 91914bbd4590ecee4da6c703d45ce94edfb79dc23e83b0770480bc8035e6b77c82f6f6cd58980c466f662f556e1929969f6be0f21e4dcc39ac5bbc590e804d56 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/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.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 -} 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 +} diff --git a/app-misc/grabcartoons/grabcartoons-9999.ebuild b/app-misc/grabcartoons/grabcartoons-9999.ebuild index 6a318e06fa51..b3aab0326856 100644 --- a/app-misc/grabcartoons/grabcartoons-9999.ebuild +++ b/app-misc/grabcartoons/grabcartoons-9999.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 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" + SRC_URI="https://github.com/zzamboni/grabcartoons/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -17,7 +16,6 @@ HOMEPAGE="https://zzamboni.org/code/grabcartoons/" LICENSE="BSD" SLOT="0" -IUSE="" # Opens a web page, which is unacceptable during an emerge. RESTRICT="test" @@ -25,9 +23,9 @@ RDEPEND=" dev-lang/perl virtual/perl-Getopt-Long" -PATCHES=( "${FILESDIR}"/2.8.4-fix-install-paths.patch ) +PATCHES=( "${FILESDIR}"/2.8.5-fix-install-paths.patch ) src_install() { - emake PREFIX="${ED%/}"/usr install + emake PREFIX="${ED}"/usr install einstalldocs } -- cgit v1.2.3