0.5.14 bump and remove older versions.

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

5 files changed, 16 insertions, 266 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 6a1dcaf10d0e..71ff61f4a2a8 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2009/05/25 23:23:36 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.26 2009/06/02 00:52:23 zmedico Exp $
+
+*calibre-0.5.14 (02 Jun 2009)
+
+  02 Jun 2009; Zac Medico <zmedico@gentoo.org> -calibre-0.5.11.ebuild,
+  -calibre-0.5.12.ebuild, -calibre-0.5.13.ebuild, +calibre-0.5.14.ebuild:
+  0.5.14 bump and remove older versions.
 
 *calibre-0.5.13-r2 (25 May 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 9f5f4412f6c8..8c3d346d91a8 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,21 +4,18 @@ Hash: SHA1
 AUX bug_270746_UnicodeEncodeError.patch 395 RMD160 b934fd07fd65ed07bb7f424233eeb3dd7c6636ac SHA1 65deee2c64cd2271c009ddfdb4de9594413d8189 SHA256 4c737df429fb0631834fdf8bee08d1e3feb7dae8484b4ba05ae9dcc727fdbe2b
 DIST calibre-0.4.76.tar.bz2 4046425 RMD160 94a4d7dbed1669c4884b8f604fbb061cffa25521 SHA1 26a6d3754355955bdeff02921c2267cb2d7a4a60 SHA256 7f646409ecca0a7796fef318fa4c7950bb67020c24b5f4b33fe4497aa6013435
 DIST calibre-0.4.77.tar.bz2 4054837 RMD160 24c64276b2413ac8e0974f8f0caa535e8635df3c SHA1 30e39484987a606fb875c6b4afa8785fed0aa4b3 SHA256 4075d8d20713d2e5e299bc3ff51fd541474dff8576c9a6d12f4159c094d73dab
-DIST calibre-0.5.11.tar.gz 7631372 RMD160 8d5bec18e2bf8a54026d27d771ad8914e15fee95 SHA1 2c594d7e111c114e395b9326bb80062263e2a87a SHA256 70584072d2f4767f667ab652a73b6122269e4f457f39ed2a2353710360c9cd54
-DIST calibre-0.5.12.tar.gz 7673154 RMD160 19512092ceff17ba20e6628099aed8d3fe4c9cda SHA1 6969a7b745eb882634e1650eaa4a6c0efe3a5a3a SHA256 2baade2542a889ec6a34151d89c67d534949d984774ce3691f44cae35c838cc2
 DIST calibre-0.5.13.tar.gz 7682632 RMD160 1d3450ac37ca32328374026fce6170c13c98cb5c SHA1 bf7be811123e56daa9bec8f7482814c528ba4134 SHA256 8fdc4629b283dace8fc94b2e15343a2c8e06616123f21bf99ae395fa56970573
+DIST calibre-0.5.14.tar.gz 7693491 RMD160 175e473e74e036ad245db35a08e700e92d8c718d SHA1 f3241ce95fb590873427d9a9c0881f336b995aef SHA256 71caa8e0540879b851afc5b10a588279b559ee24f2f7375c10737eafd0b2f24e
 EBUILD calibre-0.4.76.ebuild 2282 RMD160 da17bf58be32efeb80d3a2fd192417f2ef8faed6 SHA1 7aeff0d37d6817d1bd59ceb348b2ada0bf271da8 SHA256 15fd43d85381597f75eaf38c3feaae3b62ff47b883889739ccf95ea5321c6d26
 EBUILD calibre-0.4.77.ebuild 2282 RMD160 3d0daa0c5740299d302be542de93b42aba01a7b5 SHA1 609941ba89bf2274b2ad776c316140563d0c7366 SHA256 76479992561158d6d7eaa7ebe117b430b8836bbe774f84ab58a7ce037b4604e3
-EBUILD calibre-0.5.11.ebuild 3952 RMD160 6fe36eb1dcf657569b83940e89aa0836da9152c9 SHA1 b0b06ce1aab0e3f22e08ae60439eb9c7e8c61452 SHA256 065b77210180a3f4bbaa40bb26da665fd80d3a3e82119a14ef179b4e16c3694b
-EBUILD calibre-0.5.12.ebuild 3952 RMD160 0fce936801c92d2a9b25e9e9a11058873875738a SHA1 e4220bca6f8adee18529f89344f565b3a7bf28ac SHA256 c3abf34de59334bb3c5757bc00c39f4c9fd5c64fd6f3a20a7e64cb1e5ada040d
 EBUILD calibre-0.5.13-r2.ebuild 4032 RMD160 088fab925b822b74c40c3a264703aabb20e54b46 SHA1 5ba353e587a658a59cf81e0632f118eef430bad2 SHA256 3773b1a568188b0341fbdeb494471eabc297bfa43c3b23f39fd2ae093c0db4ff
-EBUILD calibre-0.5.13.ebuild 3952 RMD160 0d9c5cc3624f008bba8093726f30b778f0f8bea9 SHA1 6b4f3d44a5845679721cfedf2f730f650cf27fb3 SHA256 e8c66e76db523ca1c1bb2d5c4a4dfd829ca0fd79d10994c9fd9ab2ead2ba50fd
-MISC ChangeLog 4521 RMD160 a8a8a6a436ca8606199380716363f7f6bd0179e7 SHA1 af47394dbf5fa124838319a085614fafd0006203 SHA256 fa8df7bd207898a65aac52a29f76cd30fde817031de614f6193a37411bc978ae
+EBUILD calibre-0.5.14.ebuild 3973 RMD160 caa1fbf390ce3afaf9f949dc112af5b00c6e6422 SHA1 b7e62a36d3adcbe6ddb246633ff8c213fc6e5044 SHA256 c25ef417dff4b9579fbbd483f735a9b897cfb893299ea69c68e424c9f1ce35d1
+MISC ChangeLog 4739 RMD160 1133e7d96d31f9d8a3800f09b61c50e2a99227ff SHA1 daacc30d56521115ecd28c1899b77b8980278134 SHA256 c548f79cc9d980135e22f6217c82ca088e57cb54731386e57e55ff2c079d5470
 MISC metadata.xml 233 RMD160 da5a1d3b7836dcebb5fec29696b5bfb583fe346c SHA1 1c7142c677598358888a6cfc6f6f65df2e8b6901 SHA256 4d1294dc1b2a6f96aa637a0b8d340bc67191103af0f15197d07fc62446b4a709
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkobKJcACgkQ/ejvha5XGaMJKgCfYNPBYxNnddazrMWUk8QJ7YTw
-sSgAn0JiPxjoEMvuIHrip2pOosyiPYwC
-=pqwQ
+iEYEARECAAYFAkokd+oACgkQ/ejvha5XGaOONQCbBO99HFO0E7qCunbVzSMyb0ni
+f4sAmwRGMOVSZEfu0hm/ZSUGLgDKcJmC
+=2tKU
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.5.12.ebuild b/app-text/calibre/calibre-0.5.12.ebuild
deleted file mode 100644
index 614e1e36c8eb..000000000000
--- a/app-text/calibre/calibre-0.5.12.ebuild
+++ /dev/null
@@ -1,127 +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.5.12.ebuild,v 1.1 2009/05/18 05:56:32 zmedico Exp $
-
-EAPI=2
-NEED_PYTHON=2.6
-
-inherit python distutils eutils fdo-mime bash-completion
-
-MY_P="${P/_p/-p}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre.kovidgoyal.net"
-SRC_URI="http://calibre.kovidgoyal.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE=""
-
-SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
-	>=dev-python/setuptools-0.6_rc5
-	>=dev-python/imaging-1.1.6
-	>=dev-libs/libusb-0.1.12
-	>=dev-python/PyQt4-4.4.2[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"
-
-RDEPEND="$SHARED_DEPEND
-	>=dev-python/reportlab-2.1
-	!dev-python/cherrypy
-	!dev-python/cssutils
-	!dev-python/django-tagging
-	!dev-python/odfpy"
-
-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.
-	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)"/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.5.13.ebuild b/app-text/calibre/calibre-0.5.13.ebuild
deleted file mode 100644
index 1134e4a7fa1c..000000000000
--- a/app-text/calibre/calibre-0.5.13.ebuild
+++ /dev/null
@@ -1,127 +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.5.13.ebuild,v 1.1 2009/05/21 19:43:44 zmedico Exp $
-
-EAPI=2
-NEED_PYTHON=2.6
-
-inherit python distutils eutils fdo-mime bash-completion
-
-MY_P="${P/_p/-p}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre.kovidgoyal.net"
-SRC_URI="http://calibre.kovidgoyal.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE=""
-
-SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
-	>=dev-python/setuptools-0.6_rc5
-	>=dev-python/imaging-1.1.6
-	>=dev-libs/libusb-0.1.12
-	>=dev-python/PyQt4-4.4.2[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"
-
-RDEPEND="$SHARED_DEPEND
-	>=dev-python/reportlab-2.1
-	!dev-python/cherrypy
-	!dev-python/cssutils
-	!dev-python/django-tagging
-	!dev-python/odfpy"
-
-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.
-	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)"/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.5.11.ebuild b/app-text/calibre/calibre-0.5.14.ebuild
index e6604712f6f2..33f349a75d0a 100644
--- a/app-text/calibre/calibre-0.5.11.ebuild
+++ b/app-text/calibre/calibre-0.5.14.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.5.11.ebuild,v 1.1 2009/05/09 08:51:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.14.ebuild,v 1.1 2009/06/02 00:52:23 zmedico Exp $
 
 EAPI=2
 NEED_PYTHON=2.6
@@ -22,10 +22,11 @@ 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.1.12
+	dev-libs/libusb:0
 	>=dev-python/PyQt4-4.4.2[webkit]
 	>=dev-python/mechanize-0.1.11
 	>=media-gfx/imagemagick-6.3.5