Revbump to add missing podofo dep for bug #287492. Also, remove old ebuilds.

Package-Manager: portage-2.2_rc42_p14476/cvs/Linux i686

4 files changed, 15 insertions, 118 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 32a56b6b0c45..f80f04ef4e5d 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,13 @@
 # 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.50 2009/10/02 18:56:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.51 2009/10/03 21:08:37 zmedico Exp $
+
+*calibre-0.6.16-r1 (03 Oct 2009)
+
+  03 Oct 2009; Zac Medico <zmedico@gentoo.org> -calibre-0.6.14-r1.ebuild,
+  -calibre-0.6.16.ebuild, +calibre-0.6.16-r1.ebuild:
+  Revbump to add missing podofo dep for bug #287492. Also, remove old
+  ebuilds.
 
 *calibre-0.6.16 (02 Oct 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 6659bb101422..a84a234e71e5 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,20 +5,18 @@ DIST calibre-0.4.77.tar.bz2 4054837 RMD160 24c64276b2413ac8e0974f8f0caa535e8635d
 DIST calibre-0.5.14.tar.gz 7693491 RMD160 175e473e74e036ad245db35a08e700e92d8c718d SHA1 f3241ce95fb590873427d9a9c0881f336b995aef SHA256 71caa8e0540879b851afc5b10a588279b559ee24f2f7375c10737eafd0b2f24e
 DIST calibre-0.6.10.tar.gz 8732208 RMD160 fba70f63e0adb8a9b54be15a1a9426aebd16113a SHA1 2ca0bfbec0c6af204b1771606a4ff2e8734d4e18 SHA256 737c60a5ef3fe0a7d99d8925621863c9fe50ea562d949537031b720fbf4c3627
 DIST calibre-0.6.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cdb9 SHA1 1068e8935318201fc0de7e52a72317c825e7817f SHA256 de71128ea76f468e56201d9940e550b61fe2691d96f1943f1905870d32907b8a
-DIST calibre-0.6.14.tar.gz 10399380 RMD160 aabc8728a360821f35eace0dc8528df3dc6570fd SHA1 6d1e45defc00feefd244b1fe32eb3a1124b5c929 SHA256 fab51417472a5ad5a603d3339e3c3b7b6106d5b18028ed8c070cf526991498f2
 DIST calibre-0.6.16.tar.gz 10407623 RMD160 de9f0505c67c857eb46ee3d1cd2b22de59118dee SHA1 cf547413f396e938dc608a9044d674a3566c614b SHA256 e7980051237c49c059d392e3858247762d2a655ba579204c4cd38f76aee54644
 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.6.10.ebuild 4074 RMD160 847f0f754cc948d1ee333d9a32cb308a75dd5e6a SHA1 5e3583fef0460be34784cd9e058dd8dbfaba6c85 SHA256 6ed00ab6f8bd026c88f36c25d417dbca9b8b247e560f1cc955c277861cc4a6af
 EBUILD calibre-0.6.11.ebuild 4074 RMD160 c9951c75216bddc46887edddab6c93b444c8b06c SHA1 0fa086e34ec29fe3847838ff41d1674153af96ae SHA256 f65bb03f0a5ffa3d6b896083e69f9805c3d290c0a04b8c5ff46a38b17c1ecc6b
-EBUILD calibre-0.6.14-r1.ebuild 3265 RMD160 0fe56c4c46a1a81eede80a8442519562ac6fb3c8 SHA1 0512322cd0d1a0963d1fd28465c0ba8f6d6958b0 SHA256 27d6ba12047f0487916b4bfcffdaeedbb6143fde9b0b4f3525d462042475831f
-EBUILD calibre-0.6.16.ebuild 3404 RMD160 75a864cd2a23c858967d6faaf953e6ec07c88db9 SHA1 570aa0a247e418af0904e086e5b7611b86a75a9c SHA256 6f01e3287d87d8d05e4f050045238e1f63ede1280e6df0500e4a7a09cecac187
-MISC ChangeLog 8354 RMD160 fff16a4e30a453a2064c0ff19231c8d9080d10aa SHA1 b0821f4cd1b525a752b3bf0bec8377f0539d2d30 SHA256 71dda0269d57fa2062990480f61b60ba86458185ecddec1a3f4367778506d296
+EBUILD calibre-0.6.16-r1.ebuild 3378 RMD160 f5eecce0cfd02a7015bca51d98007bfea2b987e2 SHA1 e0a367146d5e5ede77d56ada90ebd20f64c75cd6 SHA256 275feb1c3c3c21f77a5601d5d0e5af076a9519dc5824239ce95c4245af140558
+MISC ChangeLog 8597 RMD160 dd2df76e81a04ee3dbb0a775ba25836dddb3fa1f SHA1 3cd97420929cda224b7173469cb94349685d1a43 SHA256 c38e6f76b5f2668e0f3f0372d02c8506307dfe2e4c24816f432c2e27b02380e5
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrGTOsACgkQ/ejvha5XGaOuBACgzHbdJwjrJTB6NpeAxFj3lITk
-vfUAn1mrC9uaxTha70/QvLBXql8w5ev+
-=zVGX
+iEYEARECAAYFAkrHvW0ACgkQ/ejvha5XGaOvSgCfQkuAMV9R3wnoHmNyJaYVAEX5
+GVYAoL6V6uMfIQ0bztuLuDK11bSzQA82
+=yiAW
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.14-r1.ebuild b/app-text/calibre/calibre-0.6.14-r1.ebuild
deleted file mode 100644
index 0e87e0c2f17e..000000000000
--- a/app-text/calibre/calibre-0.6.14-r1.ebuild
+++ /dev/null
@@ -1,108 +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.14-r1.ebuild,v 1.1 2009/10/01 03:14:01 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"
-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.5[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
-	|| ( app-text/podofo >=app-text/pdftk-1.12 )"
-
-RDEPEND="$SHARED_DEPEND
-	>=dev-python/reportlab-2.1"
-
-DEPEND="$SHARED_DEPEND
-	dev-python/setuptools
-	>=gnome-base/librsvg-2.0.0
-	>=x11-misc/xdg-utils-1.0.2-r2
-	sys-apps/help2man"
-
-S=$WORKDIR/$PN
-
-src_prepare() {
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s:'xdg-desktop-menu', 'install':'xdg-desktop-menu', 'install', '--mode', 'user':" \
-		-e "s:xdg-icon-resource install:xdg-icon-resource install --mode user:" \
-		-e "s:xdg-mime install:xdg-mime install --mode user:" \
-		-e "s:old_udev = '/etc:old_udev = '${D}etc:" \
-		-i src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
-	distutils_src_prepare
-}
-
-src_install() {
-	# --bindir and --sharedir don't seem to work.
-	# Pass them in anyway so we'll know when they are fixed.
-	PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-		distutils_src_install --bindir="${D}usr/bin" --sharedir="${D}usr/share"
-
-	grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# This code may fail if behavior of --root, --bindir or
-	# --sharedir changes in the future.
-	dodir /usr/lib
-	mv "${D}lib/calibre" "${D}usr/lib/" ||
-		die "failed to move lib dir"
-	find "${D}"lib -type d -empty -delete
-
-	dodir /usr/bin
-	mv "${D}bin/"* "${D}usr/bin/" ||
-		die "failed to move bin dir"
-	find "${D}"bin -type d -empty -delete
-
-	dodir /usr/share
-	mv "${D}share/"* "${D}usr/share/" ||
-		die "failed to move share dir"
-	find "${D}"share -type d -empty -delete
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	mv "$HOME"/.local/share/mime/packages/* "$D"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "$HOME"/.local/share/icons/* "$D"usr/share/icons/ ||
-		die "failed to install icon files"
-	domenu "$HOME"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	dobashcompletion "$D"etc/bash_completion.d/calibre
-	rm -r "${D}"etc/bash_completion.d
-	find "${D}"etc -type d -empty -delete
-}
-
-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.16.ebuild b/app-text/calibre/calibre-0.6.16-r1.ebuild
index a84e8ad98750..23a56678e371 100644
--- a/app-text/calibre/calibre-0.6.16.ebuild
+++ b/app-text/calibre/calibre-0.6.16-r1.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.16.ebuild,v 1.1 2009/10/02 18:56:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.16-r1.ebuild,v 1.1 2009/10/03 21:08:37 zmedico Exp $
 
 EAPI=2
 NEED_PYTHON=2.6
@@ -34,7 +34,7 @@ SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
 	>=dev-python/beautifulsoup-3.0.5
 	>=dev-python/dnspython-1.6.0
 	>=sys-apps/help2man-1.36.4
-	|| ( app-text/podofo >=app-text/pdftk-1.12 )"
+	app-text/podofo"
 
 RDEPEND="$SHARED_DEPEND
 	>=dev-python/reportlab-2.1"