Bug #275845 - Use podofo instead of pdftk if available. Also, remove older

beta versions.
(Portage version: 2.2_rc33_p13774/cvs/Linux i686)

4 files changed, 8 insertions, 265 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 31d9071b7fd4..d566b1ad352a 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.35 2009/06/28 19:46:15 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.36 2009/07/05 08:17:08 zmedico Exp $
+
+  05 Jul 2009; Zac Medico <zmedico@gentoo.org> -calibre-0.6_beta6.ebuild,
+  -calibre-0.6_beta8.ebuild, calibre-0.6_beta10.ebuild:
+  Bug #275845 - Use podofo instead of pdftk if available. Also, remove older
+  beta versions.
 
 *calibre-0.6_beta10 (28 Jun 2009)
 
diff --git a/app-text/calibre/calibre-0.6_beta10.ebuild b/app-text/calibre/calibre-0.6_beta10.ebuild
index b572c87e1c06..e8cb7f1faf01 100644
--- a/app-text/calibre/calibre-0.6_beta10.ebuild
+++ b/app-text/calibre/calibre-0.6_beta10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6_beta10.ebuild,v 1.1 2009/06/28 19:46:15 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6_beta10.ebuild,v 1.2 2009/07/05 08:17:08 zmedico Exp $
 
 EAPI=2
 NEED_PYTHON=2.6
@@ -37,7 +37,7 @@ SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
 	>=dev-python/dnspython-1.6.0
 	>=sys-apps/help2man-1.36.4
 	>=dev-python/pyPdf-1.12
-	>=app-text/pdftk-1.12
+	|| ( app-text/podofo >=app-text/pdftk-1.12 )
 	>=dev-python/cherrypy-3.0.2-r1
 	>=dev-python/cssutils-0.9.5.1
 	>=dev-python/odfpy-0.7"
diff --git a/app-text/calibre/calibre-0.6_beta6.ebuild b/app-text/calibre/calibre-0.6_beta6.ebuild
deleted file mode 100644
index e575e58f9056..000000000000
--- a/app-text/calibre/calibre-0.6_beta6.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6_beta6.ebuild,v 1.1 2009/06/16 18:46:57 zmedico Exp $
-
-EAPI=2
-NEED_PYTHON=2.6
-
-inherit python distutils eutils fdo-mime bash-completion
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre.kovidgoyal.net"
-# Snapshots for beta releases are not distributed on upstream mirrors.
-SRC_URI="mirror://gentoo/$P.tar.gz"
-#SRC_URI="http://calibre.kovidgoyal.net/downloads/$P.tar.gz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE=""
-
-# libusb-compat is untested
-SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
-	>=dev-python/setuptools-0.6_rc5
-	>=dev-python/imaging-1.1.6
-	dev-libs/libusb:0
-	>=dev-python/PyQt4-4.4.2[X,svg,webkit]
-	>=dev-python/mechanize-0.1.11
-	>=media-gfx/imagemagick-6.3.5
-	>=x11-misc/xdg-utils-1.0.2
-	>=dev-python/dbus-python-0.82.2
-	>=dev-python/lxml-2.1.5
-	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/beautifulsoup-3.0.5
-	>=dev-python/dnspython-1.6.0
-	>=sys-apps/help2man-1.36.4
-	>=dev-python/pyPdf-1.12
-	>=app-text/pdftk-1.12
-	>=dev-python/cherrypy-3.0.2-r1
-	>=dev-python/cssutils-0.9.5.1
-	>=dev-python/odfpy-0.7"
-
-RDEPEND="$SHARED_DEPEND
-	>=dev-python/reportlab-2.1
-	!dev-python/django-tagging"
-
-DEPEND="$SHARED_DEPEND
-	dev-python/setuptools
-	>=gnome-base/librsvg-2.0.0
-	>=x11-misc/xdg-utils-1.0.2-r2
-	sys-apps/help2man"
-
-src_prepare() {
-	# Removing the post_install call. We'll do that stuff in src_install.
-	sed -i -e "/if 'install'/,/subprocess.check_call/d" \
-		setup.py || die "couldn't remove post_install call"
-	# For help2man to succeed, we need to tell it the path to the tools.
-	sed -i -e "s:\('help2man',\) \(prog\):\1 \'PYTHONPATH=\"${D}$(python_get_sitedir)\" \' + \'${D}usr/bin/\' + \2:" \
-		src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-desktop-menu (bug #258938). This also prevents
-	# "${D}"/usr/share/applications/{mimeinfo.cache,defaults.list}
-	# from being installed (we don't want them anyway).
-	sed -i -e "s:xdg-desktop-menu install:xdg-desktop-menu install --mode user:" \
-		src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
-	distutils_src_prepare
-}
-
-src_install() {
-	pushd "${S}"/build
-	ln -s lib\.* lib
-	popd
-	distutils_src_install
-
-	# Create directory before running the postinst script
-	# otherwise it will bail out.
-	dodir /usr/share/icons/hicolor
-	dodir /etc/xdg/menus
-	dodir /usr/share/applications
-	dodir /usr/share/desktop-directories
-	dodir /usr/share/applnk
-	dodir /usr/share/mime/packages
-
-	# Bypass the default kde-config output, and force it to
-	# tell xdg-mime to use a different path.
-	cat - > "${T}/kde-config" <<EOF
-#!/bin/bash
-
-case \$1:\$2 in
-	--version:) echo -e "Qt: 3.3.8\nKDE: 3.5.8\nkde-config: 1.0" ;;
-	--path:mime) echo "${D}/usr/share/mimelnk/" ;;
-esac
-EOF
-
-	chmod +x "${T}/kde-config"
-
-	PATH="${T}:${PATH}" KDEDIRS="${D}/usr" XDG_DATA_DIRS="${D}/usr/share" DESTDIR="${D}" PYTHONPATH="${S}/build/lib" \
-		python "${S}"/src/${PN}/linux.py \
-		--use-destdir --do-not-reload-udev-hal \
-		--group-file="${ROOT}"/etc/group --dont-check-root \
-		|| die "post-installation failed."
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-desktop-menu options in src_prepare.
-	domenu "$HOME"/.local/share/applications/*.desktop || \
-		die "failed to install .desktop menu files"
-
-	# Move the bash-completion file and properly install it.
-	mv "${D}"/etc/bash_completion.d/calibre "${S}/" \
-		|| die "cannot move the bash-completion file"
-	dobashcompletion "${S}"/calibre
-	find "${D}"/etc -type d -empty -delete
-
-	# Removing junk.
-	# Bundled python modules:     Module       | Package
-	#                             ----------------------------
-	#                             encutils     | cssutils
-	#                             odf          | odfpy
-	rm -r "${D}"/usr/share/mime/{subclasses,XMLnamespaces,globs{,2},mime.cache,magic,aliases,types,treemagic,{generic-,}icons} \
-		"${D}"/usr/share/{applnk,desktop-directories} \
-		"${D}$(python_get_sitedir)"/{cherrypy,cssutils,encutils,odf,pyPdf}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	distutils_pkg_postinst
-	bash-completion_pkg_postinst
-}
diff --git a/app-text/calibre/calibre-0.6_beta8.ebuild b/app-text/calibre/calibre-0.6_beta8.ebuild
deleted file mode 100644
index efa8fcdef319..000000000000
--- a/app-text/calibre/calibre-0.6_beta8.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6_beta8.ebuild,v 1.1 2009/06/23 22:23:49 zmedico Exp $
-
-EAPI=2
-NEED_PYTHON=2.6
-
-inherit python distutils eutils fdo-mime bash-completion
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre.kovidgoyal.net"
-# Snapshots for beta releases are not distributed on upstream mirrors.
-SRC_URI="mirror://gentoo/$P.tar.gz"
-#SRC_URI="http://calibre.kovidgoyal.net/downloads/$P.tar.gz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE=""
-
-# libusb-compat is untested
-SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
-	>=dev-python/setuptools-0.6_rc5
-	>=dev-python/imaging-1.1.6
-	dev-libs/libusb:0
-	>=dev-python/PyQt4-4.4.2[X,svg,webkit]
-	>=dev-python/mechanize-0.1.11
-	>=media-gfx/imagemagick-6.3.5
-	>=x11-misc/xdg-utils-1.0.2
-	>=dev-python/dbus-python-0.82.2
-	>=dev-python/lxml-2.1.5
-	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/beautifulsoup-3.0.5
-	>=dev-python/dnspython-1.6.0
-	>=sys-apps/help2man-1.36.4
-	>=dev-python/pyPdf-1.12
-	>=app-text/pdftk-1.12
-	>=dev-python/cherrypy-3.0.2-r1
-	>=dev-python/cssutils-0.9.5.1
-	>=dev-python/odfpy-0.7"
-
-RDEPEND="$SHARED_DEPEND
-	>=dev-python/reportlab-2.1
-	!dev-python/django-tagging"
-
-DEPEND="$SHARED_DEPEND
-	dev-python/setuptools
-	>=gnome-base/librsvg-2.0.0
-	>=x11-misc/xdg-utils-1.0.2-r2
-	sys-apps/help2man"
-
-src_prepare() {
-	# Removing the post_install call. We'll do that stuff in src_install.
-	sed -i -e "/if 'install'/,/subprocess.check_call/d" \
-		setup.py || die "couldn't remove post_install call"
-	# For help2man to succeed, we need to tell it the path to the tools.
-	sed -i -e "s:\('help2man',\) \(prog\):\1 \'PYTHONPATH=\"${D}$(python_get_sitedir)\" \' + \'${D}usr/bin/\' + \2:" \
-		src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-desktop-menu (bug #258938). This also prevents
-	# "${D}"/usr/share/applications/{mimeinfo.cache,defaults.list}
-	# from being installed (we don't want them anyway).
-	sed -i -e "s:xdg-desktop-menu install:xdg-desktop-menu install --mode user:" \
-		src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
-	distutils_src_prepare
-}
-
-src_install() {
-	pushd "${S}"/build
-	ln -s lib\.* lib
-	popd
-	distutils_src_install
-
-	# Create directory before running the postinst script
-	# otherwise it will bail out.
-	dodir /usr/share/icons/hicolor
-	dodir /etc/xdg/menus
-	dodir /usr/share/applications
-	dodir /usr/share/desktop-directories
-	dodir /usr/share/applnk
-	dodir /usr/share/mime/packages
-
-	# Bypass the default kde-config output, and force it to
-	# tell xdg-mime to use a different path.
-	cat - > "${T}/kde-config" <<EOF
-#!/bin/bash
-
-case \$1:\$2 in
-	--version:) echo -e "Qt: 3.3.8\nKDE: 3.5.8\nkde-config: 1.0" ;;
-	--path:mime) echo "${D}/usr/share/mimelnk/" ;;
-esac
-EOF
-
-	chmod +x "${T}/kde-config"
-
-	PATH="${T}:${PATH}" KDEDIRS="${D}/usr" XDG_DATA_DIRS="${D}/usr/share" DESTDIR="${D}" PYTHONPATH="${S}/build/lib" \
-		python "${S}"/src/${PN}/linux.py \
-		--use-destdir --do-not-reload-udev-hal \
-		--group-file="${ROOT}"/etc/group --dont-check-root \
-		|| die "post-installation failed."
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-desktop-menu options in src_prepare.
-	domenu "$HOME"/.local/share/applications/*.desktop || \
-		die "failed to install .desktop menu files"
-
-	# Move the bash-completion file and properly install it.
-	mv "${D}"/etc/bash_completion.d/calibre "${S}/" \
-		|| die "cannot move the bash-completion file"
-	dobashcompletion "${S}"/calibre
-	find "${D}"/etc -type d -empty -delete
-
-	# Removing junk.
-	# Bundled python modules:     Module       | Package
-	#                             ----------------------------
-	#                             encutils     | cssutils
-	#                             odf          | odfpy
-	rm -r "${D}"/usr/share/mime/{subclasses,XMLnamespaces,globs{,2},mime.cache,magic,aliases,types,treemagic,{generic-,}icons} \
-		"${D}"/usr/share/{applnk,desktop-directories} \
-		"${D}$(python_get_sitedir)"/{cherrypy,cssutils,encutils,odf,pyPdf}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	distutils_pkg_postinst
-	bash-completion_pkg_postinst
-}