Update to use new upstream, bug #388927 by Steve Arnold.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 124 insertions, 1 deletions

diff --git a/app-doc/ebookmerge/ChangeLog b/app-doc/ebookmerge/ChangeLog
index 614327188d32..8edcdc45d261 100644
--- a/app-doc/ebookmerge/ChangeLog
+++ b/app-doc/ebookmerge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/ebookmerge
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/ebookmerge/ChangeLog,v 1.13 2012/03/18 19:16:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/ebookmerge/ChangeLog,v 1.14 2012/03/20 10:35:02 pacho Exp $
+
+*ebookmerge-0.9.3-r1 (20 Mar 2012)
+
+  20 Mar 2012; Pacho Ramos <pacho@gentoo.org> +ebookmerge-0.9.3-r1.ebuild,
+  +files/ebookmerge-0.9.3-updates.patch:
+  Update to use new upstream, bug #388927 by Steve Arnold.
 
   18 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #391429.
diff --git a/app-doc/ebookmerge/ebookmerge-0.9.3-r1.ebuild b/app-doc/ebookmerge/ebookmerge-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..7b7a3ebdee09
--- /dev/null
+++ b/app-doc/ebookmerge/ebookmerge-0.9.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/ebookmerge/ebookmerge-0.9.3-r1.ebuild,v 1.1 2012/03/20 10:35:01 pacho Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Script to manage eBooks in Gentoo"
+HOMEPAGE="http://www.josealberto.org/blog/2005/11/28/ebookmerge/"
+SRC_URI="mirror://gentoo/${P}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE=""
+
+DEPEND="app-shells/bash"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-updates.patch"
+}
+
+src_install() {
+	newbin ${P} ebookmerge.sh
+}
+
+pkg_postinst() {
+	elog
+	elog "Need help?  Just run:"
+	elog "ebookmerge.sh -h"
+	elog
+	elog "You first must run:"
+	elog "ebookmerge.sh -r"
+	elog
+	elog "Use -m for an alternative mirror."
+	elog
+}
diff --git a/app-doc/ebookmerge/files/ebookmerge-0.9.3-updates.patch b/app-doc/ebookmerge/files/ebookmerge-0.9.3-updates.patch
new file mode 100644
index 000000000000..6895c8ad584a
--- /dev/null
+++ b/app-doc/ebookmerge/files/ebookmerge-0.9.3-updates.patch
@@ -0,0 +1,77 @@
+--- /usr/portage/distfiles/ebookmerge-0.9.3	2006-10-13 05:08:02.000000000 -0700
++++ ebookmerge-0.9.3	2011-10-29 18:56:39.000000000 -0700
+@@ -8,9 +8,10 @@
+ #-----------------------------------------------------------------------
+ 
+ NO_ARGS=0 
+-EBDIR="$HOME/.devhelp/books"
++EBDIR="$HOME/.local/share/devhelp/books"
+ DOWNDIR="$PWD"
+ TMPDIR=$(mktemp -d)
++BASE_URL="http://htmlhelp.googlecode.com/files/"
+ 
+ # mktemp -d > /tmp/ebookmergetmpdir
+ # chmod 666 /tmp/ebookmergetmpdir
+@@ -126,12 +127,12 @@
+ if [ -n "$optl" ] ; then
+     [ ! -f ${EBDIR}/.urls.ebook ] && eerror "First you must use -r option" && exit 1
+ 
+-    cat ${EBDIR}/.urls.ebook | awk 'BEGIN { FS="/" } { print $6}' > ${EBDIR}/.list.ebook
++    cat ${EBDIR}/.urls.ebook | awk 'BEGIN { FS="/" } { print $5}' > ${EBDIR}/.list.ebook
+     
+     ls ${EBDIR} > ${EBDIR}/.installed.ebook
+     NUMBER=$(cat ${EBDIR}/.list.ebook | wc -l)
+     
+-    einfo "List of know eBooks :"
++    einfo "List of known eBooks :"
+     cat ${EBDIR}/.list.ebook
+     
+     einfo "Total eBooks : ${BOLD}$NUMBER${NORMAL}"
+@@ -141,17 +142,17 @@
+ fi
+ 
+ if [ -n "$optr" ] ; then
+-    einfo "Dowloading list from http://htmlhelp.berlios.de..."
++    einfo "Dowloading list from ${BASE_URL} ..."
+     cd ${EBDIR}
+     
+     if [ -n "$optn" ] ; then
+-        wget --no-cache -q ftp://ftp.berlios.de/pub/htmlhelp/
++        wget --no-cache -q -k ${BASE_URL}
+     else
+-        wget -q ftp://ftp.berlios.de/pub/htmlhelp/
++        wget -q -k ${BASE_URL}
+     fi
+-  
+-    cat index.html | gawk -F\" '{print $2}' | sed -e '1 d' -e '/^[ ]*$/d' -e '/[hc][thl][bmp]$/d' > ${EBDIR}/.urls.ebook
+-    rm index.html
++    ## below print field is still 2 for google code, with extra grep
++    grep tgz list | grep Download | gawk -F\" '{print $2}' | sed -e '/^[ ]*$/d' -e '/[hc][thl][bmp]$/d' > ${EBDIR}/.urls.ebook
++    rm list
+    
+     einfo "Dowloaded. Use ${BOLD}-l${NORMAL} for a list."
+ fi
+@@ -176,9 +177,9 @@
+     einfo "Dowloading eBook $optd in $DOWNDIR..."
+     
+     if [ -n "$optn" ] ; then
+-        wget --no-cache -q -c ftp://ftp.berlios.de/pub/htmlhelp/$optd -P$DOWNDIR
++        wget --no-cache -q -c $BASE_URL/$optd -P$DOWNDIR
+     else
+-        wget -q -c ftp://ftp.berlios.de/pub/htmlhelp/$optd -P$DOWNDIR
++        wget -q -c $BASE_URL/$optd -P$DOWNDIR
+     fi
+ 
+     einfo "Dowloaded."
+@@ -207,9 +208,9 @@
+     einfo "Dowloading eBook $optd in $TMPDIR..."
+ 
+     if [ -n "$optn" ] ; then
+-        wget --no-cache -q -c ftp://ftp.berlios.de/pub/htmlhelp/$opte -P$TMPDIR
++        wget --no-cache -q -c $BASE_URL/$opte -P$TMPDIR
+     else
+-        wget -q -c ftp://ftp.berlios.de/pub/htmlhelp/$opte -P$TMPDIR
++        wget -q -c $BASE_URL/$opte -P$TMPDIR
+     fi
+         einfo "Dowloaded."
+     $0 -i ${TMPDIR}/$opte