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

beta versions.
Package-Manager: portage-2.2_rc33_p13774/cvs/Linux i686

5 files changed, 14 insertions, 275 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/Manifest b/app-text/calibre/Manifest
index 48e4977384eb..d43658f89e57 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,20 +4,16 @@ Hash: SHA1
 DIST calibre-0.4.77.tar.bz2 4054837 RMD160 24c64276b2413ac8e0974f8f0caa535e8635df3c SHA1 30e39484987a606fb875c6b4afa8785fed0aa4b3 SHA256 4075d8d20713d2e5e299bc3ff51fd541474dff8576c9a6d12f4159c094d73dab
 DIST calibre-0.5.14.tar.gz 7693491 RMD160 175e473e74e036ad245db35a08e700e92d8c718d SHA1 f3241ce95fb590873427d9a9c0881f336b995aef SHA256 71caa8e0540879b851afc5b10a588279b559ee24f2f7375c10737eafd0b2f24e
 DIST calibre-0.6_beta10.tar.gz 8201445 RMD160 6415d155b8c851d3cb835eb3dc904a6db0563a64 SHA1 7940fc1c509922a157bd679d905f80c39b74a54a SHA256 cc06d63cac61d4bfa0673d1720a32d50fffff40e8530728ea44c5e3e0a9c64ae
-DIST calibre-0.6_beta6.tar.gz 8156715 RMD160 5fee96977cb3aafdab072432ba66910636aa9da3 SHA1 08427a89597e305529c0edb77a85067df367997e SHA256 04477656426dcd60c0de08d7d7950cb476fbe0a52deaa018c32c9aa311509cee
-DIST calibre-0.6_beta8.tar.gz 8168913 RMD160 56acb2215e9e2b534cd0d0e3f2170815c4c5e7a2 SHA1 c50ad9ea1a195bce603a6f82341d0c45293939db SHA256 7c3a088ba51c9d6ee53c9e6418a19411e8776dde492061440745f5a9d3394d94
 EBUILD calibre-0.4.77.ebuild 2282 RMD160 3d0daa0c5740299d302be542de93b42aba01a7b5 SHA1 609941ba89bf2274b2ad776c316140563d0c7366 SHA256 76479992561158d6d7eaa7ebe117b430b8836bbe774f84ab58a7ce037b4604e3
 EBUILD calibre-0.5.14-r1.ebuild 4260 RMD160 dc4d9465d99914e4336ba4b35cd8257435769f18 SHA1 438b4b4cc28a06a7f5bdbccc70862d6810c95904 SHA256 fcc6677b0a7047ce5f377d0cef1c8927e6c70dc87205542ab942f310f6bf8b4b
 EBUILD calibre-0.5.14.ebuild 3979 RMD160 cc2bd464833dc9fbcbe68bcb99c6025c17c87731 SHA1 08c19b728e1b415a3c1d6637f311be6c11d54120 SHA256 bcea5077da8335b00e075832fd60e11302b92ab627d4e8e010deb90f714dc1c0
-EBUILD calibre-0.6_beta10.ebuild 4322 RMD160 488439a0d924f0d41f80ba47401234752ba4e8d2 SHA1 7a6daf30deb37ee25b07d4e6b1c52b6581bae896 SHA256 140cc5e36749fc4ecb7bc19f58e046bf7722a2bcd2fedecaee0a1323d042767b
-EBUILD calibre-0.6_beta6.ebuild 4321 RMD160 b800d94487ac78a6d7e3141faeceba5fd40f5853 SHA1 c10e79fd623f604e93a16c7bdacd4c22b3a69bea SHA256 fa9a515894d381e10bbd314b8222fd81a77cbd8b90766c61292ea4071897373b
-EBUILD calibre-0.6_beta8.ebuild 4321 RMD160 599740ef5ba6110c5c621a73e841d02e3ddbc999 SHA1 252922f38d9cd979cc6d1d3f3fb0e0abd5da21d0 SHA256 6d38276808907c956dcbac92de6bd24a7d2b260d6a1c3a1bcba1acb28c60ab39
-MISC ChangeLog 5841 RMD160 34fd72a34bbc7808d873e8f1169eb2e20e581a42 SHA1 21627e268e4141d6e3cbe35e46ff3bad62bd8c91 SHA256 7a85852a92ce7997ba4971c56f979e967a25c270927bb61e80f963fd13b5bf5b
+EBUILD calibre-0.6_beta10.ebuild 4345 RMD160 dc4a89e9ce31310fd01d563a2d3f4c1afca79f01 SHA1 00347869818987fb88660020667fd6c1e9570ce7 SHA256 8f060ab32142362047afcdc25f1adba3c4b55e18fdd7ca8884b99a6f50e34b01
+MISC ChangeLog 6066 RMD160 c521040254ff767aced1ff2a5c1900831315f418 SHA1 396900accf3f3eb37c4a6f9c1fd857c51adea0c9 SHA256 4dc9d1d439ae50a123aa1b11bc43642831b1061fe517c991abdfaca74022fab5
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkpHyKQACgkQ/ejvha5XGaOi2QCgnTkFNWGCcJG45v4R79lVf179
-95sAoLJyi2s7XkDcCY7ZLYb3uCtNIX6I
-=zK1K
+iEYEARECAAYFAkpQYckACgkQ/ejvha5XGaNBygCgqNugXHtS3Ep3N54Pw1hA9e7y
+Or4An3oEuwNhQmC0O68IwPl6jDWhaNLd
+=DeIV
 -----END PGP SIGNATURE-----
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
-}