0.6.8 version bump and remove old.

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

5 files changed, 15 insertions, 267 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 81a224b4f2c2..1b25028e1d12 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.44 2009/08/18 00:01:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.45 2009/08/22 03:42:08 zmedico Exp $
+
+*calibre-0.6.8 (22 Aug 2009)
+
+  22 Aug 2009; Zac Medico <zmedico@gentoo.org> -calibre-0.5.14.ebuild,
+  -calibre-0.6.5.ebuild, -calibre-0.6.6.ebuild, +calibre-0.6.8.ebuild:
+  0.6.8 version bump and remove old.
 
 *calibre-0.6.7 (17 Aug 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 92fe325a4489..91afaee32d3e 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,21 +3,18 @@ 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.5.tar.gz 8741649 RMD160 55086fdd73d85c2c658e0bad69c2d9462e378640 SHA1 3594da3608681e8972533a37aa830e3f2cd66971 SHA256 452cceee00df83a1d49033a5473e557973681166e8a517285a8be986d14c6989
-DIST calibre-0.6.6.tar.gz 8769099 RMD160 33cbfb9bb0a419154dca548ffcc80e725d699962 SHA1 2598eca87c82f2e93df4d27afeea83f513181873 SHA256 06e9034cb420f50ef7786a493ed44150a76c4bef367076f41a3bfc4bdedb1460
 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
 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.5.ebuild 4096 RMD160 f427684ded03ca6c84801e3343bba965b3db0383 SHA1 9baed956e4df7ba180f37d4f7e254774aed26897 SHA256 b086e16222b555e7ee90825aef6b64e9dcf4489ff465e6f647ced09466246190
-EBUILD calibre-0.6.6.ebuild 4101 RMD160 85764d01a669c1ebe523cbb40ce36d7e2640de10 SHA1 bb26a5045629feff83d39f6185bdbbc676fd6439 SHA256 3b4374714c51c00ae13a0df6ad3a86d6eb3908d00171a3ea536c58d111605b00
 EBUILD calibre-0.6.7.ebuild 4073 RMD160 1e2396d9bf918c258cc8c12bc4bd1a4dd3507f04 SHA1 7ca1722a59bb0187ffb47ce1aba4e9767519bfa1 SHA256 1ad69a4a01fb7105e98262013d791667f7e987d5ea8d7984ba551b29a5536d80
-MISC ChangeLog 7178 RMD160 68887286073158a263a7d0d43290618af031de43 SHA1 4474e5ed2f3e6c16d16a0f7391be903a5641da01 SHA256 f2082ca1b9009270ee0976a20a2abd0f68b311a5ec55467dccfc13634cd54161
+EBUILD calibre-0.6.8.ebuild 4073 RMD160 9241efd54cde0534f4a0b2f390b10b774ae52439 SHA1 2495dc72dc7969abd5943e21b128f89d798040ed SHA256 a40d1be62ebd002b529e9a828eb059623762c97e027db484ca7beb3b6151ce1e
+MISC ChangeLog 7388 RMD160 80588d6e34c7eb65a9734f96125da5d808ef03eb SHA1 42dfeec8c660e18bf016a40fc4747a2a416563d1 SHA256 cb76e9b4e0341dbaa24dcb931cccfd1cbf9b7ce703b840b60bd8ec94590fe6b7
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqJ75oACgkQ/ejvha5XGaNyLACgu1Tu3Gsz/87XSsIBguMBm0/K
-wsAAoORkbNdxJuG1M1ROq8Fcf6WulHpf
-=X3j8
+iEYEARECAAYFAkqPaVAACgkQ/ejvha5XGaNZ9QCgy89CohNNugmzf4qf6USkA1mh
+AOIAn1xNte8yelIrnrXodk1R7WY1aFG9
+=hQ3y
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.5.14.ebuild b/app-text/calibre/calibre-0.5.14.ebuild
deleted file mode 100644
index b88286b4ec60..000000000000
--- a/app-text/calibre/calibre-0.5.14.ebuild
+++ /dev/null
@@ -1,128 +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.14.ebuild,v 1.2 2009/06/03 02:49:21 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=""
-
-# 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"
-
-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.6.5.ebuild b/app-text/calibre/calibre-0.6.5.ebuild
deleted file mode 100644
index a20e8bfe5eb1..000000000000
--- a/app-text/calibre/calibre-0.6.5.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.5.ebuild,v 1.1 2009/08/07 20:56:20 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.6.ebuild b/app-text/calibre/calibre-0.6.8.ebuild
index 9b2ee8062e06..eba560759564 100644
--- a/app-text/calibre/calibre-0.6.6.ebuild
+++ b/app-text/calibre/calibre-0.6.8.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.6.ebuild,v 1.2 2009/08/17 23:49:43 zmedico Exp $
+# $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
@@ -41,8 +41,7 @@ SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
 	>=dev-python/odfpy-0.7"
 
 RDEPEND="$SHARED_DEPEND
-	>=dev-python/reportlab-2.1
-	!dev-python/django-tagging"
+	>=dev-python/reportlab-2.1"
 
 DEPEND="$SHARED_DEPEND
 	dev-python/setuptools