take over maintainership; version bump; remove old

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)

6 files changed, 113 insertions, 27 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/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>