0.6.6 version bump and remove old.

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

4 files changed, 14 insertions, 136 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 359905854ffb..99cd04e262a3 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.41 2009/08/07 20:56:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.42 2009/08/11 20:51:52 zmedico Exp $
+
+*calibre-0.6.6 (11 Aug 2009)
+
+  11 Aug 2009; Zac Medico <zmedico@gentoo.org> -calibre-0.6.3.ebuild,
+  -calibre-0.6.4.ebuild, +calibre-0.6.6.ebuild:
+  0.6.6 version bump and remove old.
 
 *calibre-0.6.5 (07 Aug 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 384c292df6d8..580252bb5734 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,21 +3,19 @@ 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.3.tar.gz 8689741 RMD160 3c0b4c63ff14e25b3fa2d9222ed7a426bc1a38a3 SHA1 e9bada6c3f4a6b0ccab4884e93c7629ae8853542 SHA256 8bb146216cd60dddd03d110f9197084290e715f3220ba230cc2b5d9a0a1e3201
-DIST calibre-0.6.4.tar.gz 8692484 RMD160 f9d1521296e1360a49b746c25ab56e718167545a SHA1 c3901849897c118f564375b30c4a25fb7070d524 SHA256 f185fbc3e09255297d7a64acb715116959ebaa38af803ceea5081c0827a2038c
 DIST calibre-0.6.5.tar.gz 8741649 RMD160 55086fdd73d85c2c658e0bad69c2d9462e378640 SHA1 3594da3608681e8972533a37aa830e3f2cd66971 SHA256 452cceee00df83a1d49033a5473e557973681166e8a517285a8be986d14c6989
+DIST calibre-0.6.6.tar.gz 8769099 RMD160 33cbfb9bb0a419154dca548ffcc80e725d699962 SHA1 2598eca87c82f2e93df4d27afeea83f513181873 SHA256 06e9034cb420f50ef7786a493ed44150a76c4bef367076f41a3bfc4bdedb1460
 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.3.ebuild 4096 RMD160 697109f4e85d33dfdfe86ea25e5d84f57d323788 SHA1 2918bac9b5ccd6090ddebca5c2d43bd29e83352c SHA256 fa2582ebec33bf6591384014ff29ceaa31ec0da9670bc4a04790579619c8e28f
-EBUILD calibre-0.6.4.ebuild 4096 RMD160 a3951d971f74f2363181361a5985a3d7be06327d SHA1 3eb92aec216145a08d111fc63ec25d7e3b6d90e7 SHA256 58781bf817fbb4b07fc59a3dcb9bf36399ad7ac09bf668232605c42d28130234
 EBUILD calibre-0.6.5.ebuild 4096 RMD160 f427684ded03ca6c84801e3343bba965b3db0383 SHA1 9baed956e4df7ba180f37d4f7e254774aed26897 SHA256 b086e16222b555e7ee90825aef6b64e9dcf4489ff465e6f647ced09466246190
-MISC ChangeLog 6755 RMD160 a7ee234d69af7acbfaef13df54c3fcc3122f54c5 SHA1 d2146ee6b4705ac53794293141541b37dd9802d9 SHA256 5d87a4ea79bc223e33bdb6420f5a59e57cbd741be1f139e73f8f5513507e7f61
+EBUILD calibre-0.6.6.ebuild 4096 RMD160 89d99947ab8b672508c77e12dc02c9521a1f8b59 SHA1 c8a552e9ff52b18e64a6802725509405aaac7de4 SHA256 61b0e44d59f67777a4137594e5dfb283f516a4ee792caf8500f69e86e2783ed2
+MISC ChangeLog 6941 RMD160 e39adfb23007e908228bd64245bf85cf8f7579a6 SHA1 e9135d46fa35c4fde0b82d4dcd1edd5e411463a6 SHA256 c16e8b7408ebb2aa48dec004fb2859ac4e90cf1c687895b0d8f28eedb5eb4584
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkp8lQoACgkQ/ejvha5XGaPkbwCfQe/RwR/FjdEleL6iWAZDuLR7
-fVoAoIkzGdhAe/Ib7h/lXzKZIy/9k/l7
-=ETZr
+iEYEARECAAYFAkqB2gMACgkQ/ejvha5XGaPlWwCeILSpjRnX8cDoE2knB+7ESaFh
+qVEAn0PhMj1pCRvGxmtv0t3fvmqgvxzl
+=n5OP
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.4.ebuild b/app-text/calibre/calibre-0.6.4.ebuild
deleted file mode 100644
index 9630b4e14578..000000000000
--- a/app-text/calibre/calibre-0.6.4.ebuild
+++ /dev/null
@@ -1,126 +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.4.ebuild,v 1.1 2009/08/01 18:38: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"
-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.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"
-
-	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
-}
diff --git a/app-text/calibre/calibre-0.6.3.ebuild b/app-text/calibre/calibre-0.6.6.ebuild
index 7e11154c35ca..44e3eff9277d 100644
--- a/app-text/calibre/calibre-0.6.3.ebuild
+++ b/app-text/calibre/calibre-0.6.6.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.3.ebuild,v 1.1 2009/07/31 15:37:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.6.ebuild,v 1.1 2009/08/11 20:51:52 zmedico Exp $
 
 EAPI=2
 NEED_PYTHON=2.6