0.6.11 version bump, and remove old.

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

4 files changed, 14 insertions, 135 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 435976bda82f..64906738c00a 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.46 2009/09/03 08:07:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.47 2009/09/08 21:08:05 zmedico Exp $
+
+*calibre-0.6.11 (08 Sep 2009)
+
+  08 Sep 2009; Zac Medico <zmedico@gentoo.org> -calibre-0.6.7.ebuild,
+  -calibre-0.6.8.ebuild, +calibre-0.6.11.ebuild:
+  0.6.11 version bump, and remove old.
 
 *calibre-0.6.10 (03 Sep 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 34693cc5866a..103cdc0965c0 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,19 +4,17 @@ 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.10.tar.gz 8732208 RMD160 fba70f63e0adb8a9b54be15a1a9426aebd16113a SHA1 2ca0bfbec0c6af204b1771606a4ff2e8734d4e18 SHA256 737c60a5ef3fe0a7d99d8925621863c9fe50ea562d949537031b720fbf4c3627
-DIST calibre-0.6.7.tar.gz 8619563 RMD160 0efb7c51e6bfbdd10d81c63b13c3da1931a1a676 SHA1 d0aac53c3dfd429cd5f22ced272d248dfc90e363 SHA256 ee42565349c5eb65ae96a7afbe9b10ca1b609b7d919d9ca68219ae7c8d054e04
-DIST calibre-0.6.8.tar.gz 8673419 RMD160 17100062364ce0872b1528692ecf09aec70b67d9 SHA1 2fc5ab6d5707b72462fd6483cf7196bf0c2e7200 SHA256 58051670baf068d62dae3937177352e7b188a19c962d21c43d0f2eafd1957bdf
+DIST calibre-0.6.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cdb9 SHA1 1068e8935318201fc0de7e52a72317c825e7817f SHA256 de71128ea76f468e56201d9940e550b61fe2691d96f1943f1905870d32907b8a
 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.7.ebuild 4073 RMD160 1e2396d9bf918c258cc8c12bc4bd1a4dd3507f04 SHA1 7ca1722a59bb0187ffb47ce1aba4e9767519bfa1 SHA256 1ad69a4a01fb7105e98262013d791667f7e987d5ea8d7984ba551b29a5536d80
-EBUILD calibre-0.6.8.ebuild 4073 RMD160 9241efd54cde0534f4a0b2f390b10b774ae52439 SHA1 2495dc72dc7969abd5943e21b128f89d798040ed SHA256 a40d1be62ebd002b529e9a828eb059623762c97e027db484ca7beb3b6151ce1e
-MISC ChangeLog 7514 RMD160 eda89c341e08e619cf76663f030952ed0223bf18 SHA1 8de59a2afb4e9549853839fda2e2c5130f07db7d SHA256 3792e2644831c9597534ffe6142cd372cf40db4f10b13dff1b889adb92c94a67
+EBUILD calibre-0.6.11.ebuild 4074 RMD160 c9951c75216bddc46887edddab6c93b444c8b06c SHA1 0fa086e34ec29fe3847838ff41d1674153af96ae SHA256 f65bb03f0a5ffa3d6b896083e69f9805c3d290c0a04b8c5ff46a38b17c1ecc6b
+MISC ChangeLog 7704 RMD160 99fe148e33a87d95ee41e4d678f14ac890882493 SHA1 90ba616c5b8256c620bff9b89ea497be45f768c2 SHA256 7a8538b93e10e78edfff70f452bb9e15ef05fac8f892f8dc7e5c99910771c4cb
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqfeY8ACgkQ/ejvha5XGaPgCgCgsvS+m7z1pEIyxlKGOnVq9WVM
-OJoAoNQVN5k/xpKWbEeXohaug9JMTu7D
-=d/jh
+iEYEARECAAYFAkqmx7oACgkQ/ejvha5XGaOKHwCg553g8RD43DGSslkoyq1+ScC8
+/swAn1GX3dIXNBStV+G63l+zKSOi2jpA
+=udOA
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.7.ebuild b/app-text/calibre/calibre-0.6.11.ebuild
index e3e97550bdb3..6d7c30fb69ad 100644
--- a/app-text/calibre/calibre-0.6.7.ebuild
+++ b/app-text/calibre/calibre-0.6.11.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.7.ebuild,v 1.1 2009/08/18 00:01:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.11.ebuild,v 1.1 2009/09/08 21:08:05 zmedico Exp $
 
 EAPI=2
 NEED_PYTHON=2.6
diff --git a/app-text/calibre/calibre-0.6.8.ebuild b/app-text/calibre/calibre-0.6.8.ebuild
deleted file mode 100644
index eba560759564..000000000000
--- a/app-text/calibre/calibre-0.6.8.ebuild
+++ /dev/null
@@ -1,125 +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.8.ebuild,v 1.1 2009/08/22 03:42:08 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
-	>=dev-python/pyPdf-1.12
-	|| ( app-text/podofo >=app-text/pdftk-1.12 )
-	>=dev-python/cherrypy-3.0.2-r1
-	>=dev-python/cssutils-0.9.6_alpha4
-	>=dev-python/odfpy-0.7"
-
-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"
-
-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"
-
-	dobashcompletion "$D"usr/share/bash-completion/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
-}