take over maintainership; version bump; remove old

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

7 files changed, 132 insertions, 46 deletions

diff --git a/app-misc/grabcartoons/ChangeLog b/app-misc/grabcartoons/ChangeLog
index 3ebd0516059e..4cf46170b41f 100644
--- a/app-misc/grabcartoons/ChangeLog
+++ b/app-misc/grabcartoons/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/grabcartoons
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/grabcartoons/ChangeLog,v 1.10 2014/03/22 18:41:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grabcartoons/ChangeLog,v 1.11 2014/11/11 23:28:53 tamiko Exp $
+
+*grabcartoons-9999 (11 Nov 2014)
+*grabcartoons-2.8.4_p20141112 (11 Nov 2014)
+
+  11 Nov 2014; Matthias Maier <tamiko@gentoo.org>
+  +files/2.8.4-fix-install-paths.patch, +grabcartoons-2.8.4_p20141112.ebuild,
+  +grabcartoons-9999.ebuild, -grabcartoons-2.4.ebuild, metadata.xml:
+  take over maintainership; version bump; remove old
 
   22 Mar 2014; Michael Palimaka <kensington@gentoo.org>
   -grabcartoons-2.1.ebuild, grabcartoons-2.4.ebuild:
diff --git a/app-misc/grabcartoons/Manifest b/app-misc/grabcartoons/Manifest
index 173334239a83..3dff59043521 100644
--- a/app-misc/grabcartoons/Manifest
+++ b/app-misc/grabcartoons/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST grabcartoons-2.4.tar.gz 24779 SHA256 9dbd099d43bcf7b09cf6295318d1c85c42c24e47640babdfb24295c8fc18b4fd SHA512 015229a48a5b146a2a334749305bff6cbf69dd3097ae047650d7f814ab88e1d9f6c6c752434d385a8f3aa6f122585390a72e51e3d0374b3a8e37a709bf091e0c WHIRLPOOL fbb2e3a538c6e950880930c54f9d7d59625c104ac62b336442051c95e827264c32502e764b6cedfacc53665f38338765d5ea7a41a6e307406a74335476a77dcc
-EBUILD grabcartoons-2.4.ebuild 628 SHA256 b20052275e3cd62fa3f1de38c2749d42c85b0a542168a0f7c0779586e0d2ce92 SHA512 3c52d3b78b0b17e81beea049071bd84066a6859f0e8c1fa4654829fe8aeb433bd095491665ddf0c78c115d05c20bfdb63d2e52dd71593acc8cae1cb5d0a7d2bf WHIRLPOOL c1f0bc236dc0eec6415de62470e4ea029fd0262555da13cbb0b6d714402f4aa811717c69c202d2147c0b62bdfbf0ad0f6ba34c3ae1d0c274e11dd33ad9a3f06e
-MISC ChangeLog 1678 SHA256 64814c7a6ae703edb6000fe341b417f7faf45cde1359a4eb73a061f142ae88f6 SHA512 a6b097e65f7e630dbd8d7aebecd28fc7b9762f3bb67185de4e457a69ce501e99971ad6cb53926f374be58a5c578d842898dd087c3ca1e547285bb60f84ff5aae WHIRLPOOL 5419c7a3c66a9a595c5218e72f1a8ccd384a5b03448244e50da212ac9af4ff30bee6eaac0e7eec503024f0090079e26cea073ebbb77ddfa3dd2fadc01f124cfb
-MISC metadata.xml 268 SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb SHA512 8e365ead118785104bc7576a48a106346ef24f5b709349f8ca3d5fb9107a248d0f172e6898fb4ba4b2b7f84e6c8c7960578a2919e1a3692664cb808b16e6b2b2 WHIRLPOOL 255e754b42ff038b07a48321ced9fe6f8acdc99bb85873807b3e902517a1764dabc7152e5ca9ad4d83ab5dc9d3a611f79e6c066121be77aed3cad1b0f3587b73
+AUX 2.8.4-fix-install-paths.patch 1189 SHA256 f1d63facb7625b8692fa6d6642f44ecdaf7394eb4431f0dd556ead141bd734b1 SHA512 3983cb0487cd1f770c985700297df01d5f33761d8dbacad413a3e50c315a999ae3a70a918b46149928124e6e4a299a8f4994bf60fec990aea6a87313bbc283ec WHIRLPOOL bda43715b41771c06d74fc5b98ecf825cd18f418ddb84200188cfd68858a2a923823257ab1d33df2f6e09d87ce133a8408a89f22dae09a50a21c375bce82b8d5
+EBUILD grabcartoons-2.8.4_p20141112.ebuild 880 SHA256 8ba43e0304ae979ac6607d55d5d8a611a28d773e152ed638031d6057dffc8383 SHA512 eb5bac3cc3a9e724ed40c93020bbde3bb4519a62027b52ba7a39367d1e40c7687fb2675584831a721e54c9c5174d45fa4fce3662f9a19f48daa0b4067fadb9ea WHIRLPOOL 0711bccad902bb3be1f95a929d4e566a7c064d58fad5074babe6a548ebf64a83f1331e0e9f11589b81aff89ca9d937c3e48a088c4bd777e2f5e3014d4253514f
+EBUILD grabcartoons-9999.ebuild 869 SHA256 078cec4ae0a611c5c2f0e7917ff2dc4d6e2331f2e15a8d6a76f9b20aecbfe2d6 SHA512 3a8256bddc404404c3981bb67ad4fc6f20f56a762aa6a93741fbac1b987e597773860890ce956ef63c87373b38429317f6913c5f129815918205806d6c0f0e3f WHIRLPOOL 65d04eae2b4a04edce82160099c25c5a85fdc879df59b074c715304181170d134733249f3707c9fdaeb83474969462d82a99b542c364bf07c8cccf24c931eaf3
+MISC ChangeLog 2003 SHA256 8f859c24854c0627c0c6ee9124e7df510b76dcdd5270e1efca2a7c50c510f58c SHA512 b176eb3cfed3532560d3dc17e7a06ea7619322a84c9fab769b987e80a0881d80dd8e27d60f6ed9bdcd560a3154c7128d7527a2ccbfd2522e0242027bba5d3479 WHIRLPOOL e9c8bf099013f689acc70b2c3fa3769c17fc8c5db21e6dd223856befa0ef28b3ee659f13934ad32209afa3e7bd86ed76a8c26d5b54ac8c0c6d7b5aa907ea62ef
+MISC metadata.xml 233 SHA256 d64cebfa2fb894c77a0c67db5c7cbcc88258adac7794d011e229cb11f7d7f03f SHA512 7610bd96a337bf75ed3b59df584cd646ad93ff2c5f4829cf2775a5d09a6d19f573492de2308552f454846f02d35420242906a1357a4b19550ea7028d995fba52 WHIRLPOOL cd1155f0cc26bd5f117666c7920ddf31105f84aec93b0b6e8015e6c659b8ec91910199bb0fa9718f551c5bcf1f15f708011b8f9f7095a2d4e44389cce7cbb543
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQJiBAEBCABMBQJTLdlGRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7HTzEACMasOn7M0N9U4UQCPA0D+qAKACGq8DcrgZLF7PICWeMvPQr61t2dYVXqR8
-yN7bx4mEaoDPBt+u7biZ2a2tnH0hgyNQNzWZSeEItXld30dj7tJ82dXmNuYOdneh
-ATrxdbzm7ac9OOOpCNwg4if7BLeBq/THcQD/vFWMdEzwd2aID6aDswcPapqJGB2o
-e0C/k7pGYYa2LDS9MHPjPD/jnD/vlTirdXo9xSyXgVM3WgdfwtpeVDxVA5zydofc
-A3uszlvRnfK0RMMo9APFNkJ0W7/57JIbrQimeenk666bfO5Ftaxtr5EiNuwNE5aF
-QxNodB3Lg1kAsRdWT8g90ILGf36OSFDRpDvurxs2HSR2f2zUj/1SucibYT6ni237
-ExlZXiu6QZ43AfcoRWGP4VJZi5CGjzqqbN2CWJNjyBsYvrVHLCSj9M6l5ciz7Rg5
-WoU1bcvLwEsHjgR9TbN57P8QbRj8SmKIE5kdOYXRL0Vl5pnfBGXtTrgeDXKWoFf7
-j8pCs86JaBbpzvEwPO9Copss5fzuYJipVxgy0PP9o1myy/e5MwyCsmIEcjgKCjOq
-YQ/66rJOzajSA7aIu3AI9cm+nWY1a2fgJk0Hdn6lITmpOEXz841UFoCurxX6dK4s
-cIAqcGd6HFGzi6HGGf9YdQzh+s/Dj2iqBAv780+lf5csHuPShA==
-=R5TR
+iQIcBAEBCAAGBQJUYpu3AAoJELhOzYlK7nn/XxIP/1ufOEJz1TbLRPeinqI1Z4Wr
+z9e5ylJyVWlmkCeDXmvtrJPjVjSp3wr3dUOYbnYrKrW20WaJnKioprfnUiLjqbks
+0d6qmr43+Mvt7RX7pIqkrhQNi3u3krJPfxUTMpWMV+bNTmRlVMK7NBNe8hil/xlr
+gzkpWH397dRE8kODE0ldvsw8x7xZdMxj9YHxPGQvnB5chjc+XhdjTQfT833/crKB
+2wBwsD72WWSyVZGGa7cLzLrD87WIlelR3P4oCojR5XOuu4qINseIIaSKy9tVgmiT
+HMrCxUrYsK7kBqnZUi5DdyuARl2Hzuk6LrJyCozIZXMAxz9BNcRud2cevLUVOScX
+i3HXpryb7AGQWQnIMdaNGsR/2HAwL97dyOrIj0bPw0gOZCFLyQdrQEfriFFk8tYj
+TlpumfJFT+pJvS5LHJmh0bRC0Wn6rFhvzmVBwVMKSu8tYMUdqP7i3N/7HwQbHMlR
+aiOgCBDMVXqcEHUm7S2z9Mt6TPHhmDvQSvIO9hMf4fcsrlc3ZRoGMqMz9qRC/SOe
+RHW3hwfm4xluV6gShi68sd45oiXiVr0KLV4bfHGs4pguZRaixXhJ8huPMFqlmhsA
+S1XjyyiV57Pw+AYL4BReSjAIjk6DZWBrHVC6hnTaHeykpM0GoDLPpZpGaDNMEaWe
+NjZCXbLJI5b0s/oaSxio
+=E4Ji
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..420640b3de6c
--- /dev/null
+++ b/app-misc/grabcartoons/files/2.8.4-fix-install-paths.patch
@@ -0,0 +1,32 @@
+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.4.ebuild b/app-misc/grabcartoons/grabcartoons-2.4.ebuild
deleted file mode 100644
index 8759b3f0c66e..000000000000
--- a/app-misc/grabcartoons/grabcartoons-2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/grabcartoons/grabcartoons-2.4.ebuild,v 1.3 2014/03/22 18:41:10 kensington Exp $
-
-EAPI=5
-
-DESCRIPTION="Comic-summarizing utility"
-HOMEPAGE="http://grabcartoons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-# Opens a web page, which is unacceptable during an emerge.
-RESTRICT="test"
-
-src_install() {
-	emake PREFIX="${D}"/usr install
-	dodoc ChangeLog README
-}
diff --git a/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
new file mode 100644
index 000000000000..616ababffc9a
--- /dev/null
+++ b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild,v 1.1 2014/11/11 23:28:53 tamiko Exp $
+
+EAPI=5
+
+inherit eutils git-r3
+
+DESCRIPTION="Comic-summarizing utility"
+HOMEPAGE="http://grabcartoons.sourceforge.net/ https://github.com/zzamboni/grabcartoons"
+
+EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"
+
+if [[ "${PV}" != "9999" ]] ; then
+	KEYWORDS="~amd64 ~x86"
+	EGIT_COMMIT="cb230f01fb288a0b9f0fc437545b97d06c846bd3"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long"
+
+# Opens a web page, which is unacceptable during an emerge.
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/2.8.4-fix-install-paths.patch
+}
+
+src_install() {
+	emake PREFIX="${ED}"/usr install
+	dodoc ChangeLog README
+}
diff --git a/app-misc/grabcartoons/grabcartoons-9999.ebuild b/app-misc/grabcartoons/grabcartoons-9999.ebuild
new file mode 100644
index 000000000000..65e19f9b1751
--- /dev/null
+++ b/app-misc/grabcartoons/grabcartoons-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grabcartoons/grabcartoons-9999.ebuild,v 1.1 2014/11/11 23:28:53 tamiko Exp $
+
+EAPI=5
+
+inherit eutils git-r3
+
+DESCRIPTION="Comic-summarizing utility"
+HOMEPAGE="http://grabcartoons.sourceforge.net/ https://github.com/zzamboni/grabcartoons"
+
+EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"
+
+if [[ "${PV}" != "9999" ]] ; then
+	KEYWORDS="~amd64 ~x86"
+	EGIT_COMMIT="cb230f01fb288a0b9f0fc437545b97d06c846bd3"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long"
+
+# Opens a web page, which is unacceptable during an emerge.
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/2.8.4-fix-install-paths.patch
+}
+
+src_install() {
+	emake PREFIX="${ED}"/usr install
+	dodoc ChangeLog README
+}
diff --git a/app-misc/grabcartoons/metadata.xml b/app-misc/grabcartoons/metadata.xml
index 59e2b8f78cb5..2702f26660bf 100644
--- a/app-misc/grabcartoons/metadata.xml
+++ b/app-misc/grabcartoons/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
 	</maintainer>
 </pkgmetadata>