30 Apr 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.6.50.ebuild:

0.6.50 version bump.

30 Apr 2010; Zac Medico <zmedico@gentoo.org> -calibre-0.6.44.ebuild,
-calibre-0.6.45.ebuild, -calibre-0.6.47.ebuild:
Remove old versions.
Package-Manager: portage-2.2_rc67_p98/cvs/Linux i686

5 files changed, 17 insertions, 308 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 39f5c759b4e5..54d8875ef14d 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.84 2010/04/26 06:06:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.85 2010/04/30 22:36:56 zmedico Exp $
+
+*calibre-0.6.50 (30 Apr 2010)
+
+  30 Apr 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.6.50.ebuild:
+  0.6.50 version bump.
+
+  30 Apr 2010; Zac Medico <zmedico@gentoo.org> -calibre-0.6.44.ebuild,
+  -calibre-0.6.45.ebuild, -calibre-0.6.47.ebuild:
+  Remove old versions.
 
 *calibre-0.6.49 (26 Apr 2010)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 00fbca87f0e7..8a2186e0be33 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,23 +4,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.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cdb9 SHA1 1068e8935318201fc0de7e52a72317c825e7817f SHA256 de71128ea76f468e56201d9940e550b61fe2691d96f1943f1905870d32907b8a
-DIST calibre-0.6.44.tar.gz 11873986 RMD160 547d49f7be8b059be995bd2366a83745ad681281 SHA1 03f1217ec12efc1f76fbc2a6d49cefd1291e3782 SHA256 00117e38062c76f675b0b978cd862c957482abe18e56f82de9557128405b125e
-DIST calibre-0.6.45.tar.gz 12085471 RMD160 1fb0fd8672c047a01673f1115c79c937e1bc2217 SHA1 63aee33b8e4cd611bf2ba9a4ccd04ec89a4cbb9a SHA256 10255cf23c6cf38ad8cb60f66af1080a62a9ba3a374e58a71ebf5c4624acf898
-DIST calibre-0.6.47.tar.gz 12403618 RMD160 87637a53fea0c72ec0b9549ed957f206170b2f88 SHA1 8b046f7336a81ad47d099301124c5accd16d1d40 SHA256 118b2954d313e011d745f5bf8451f30c7a6b14441917da115504fbc529ce459b
 DIST calibre-0.6.49.tar.gz 12649757 RMD160 6b655cf18d01596cca57ed6697f113fdf60258e5 SHA1 a9266d2e67144209276c9a7509f0fadcca5a09e9 SHA256 b6a2bcab23f5bf6ce3b9187c0565447ba028eb6a9b7d698f77febdb1be094391
+DIST calibre-0.6.50.tar.gz 12723139 RMD160 e90fd42de25e677631955c268e768f65cfd00da4 SHA1 8fb35aff1dee970e4b8322eeae57745176124d05 SHA256 ce36120b9c1994be8e1e3c12a80670c60313ac05b27d71d2be0313b4ffa6b1c6
 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.11.ebuild 4074 RMD160 c9951c75216bddc46887edddab6c93b444c8b06c SHA1 0fa086e34ec29fe3847838ff41d1674153af96ae SHA256 f65bb03f0a5ffa3d6b896083e69f9805c3d290c0a04b8c5ff46a38b17c1ecc6b
-EBUILD calibre-0.6.44.ebuild 4525 RMD160 bc77cbc495ca788432093043fb866e2c9e803481 SHA1 b73d734297b3a8a128d1f48fd2651ff39a8801b1 SHA256 e16691dde420f2a3489c75ad733a7cf987d3b8f88e53ae27b63e66322c9d2338
-EBUILD calibre-0.6.45.ebuild 4525 RMD160 2776962e1c24fefb5cf78324a21498a63715a845 SHA1 d983e131d255757cda42c22c4bd50ab587c19046 SHA256 30b751855485566756d099350c43274116f0ae603d3bbb9454a56fe69a81e213
-EBUILD calibre-0.6.47.ebuild 4532 RMD160 a868cbca3d42a9fc22a4ada4be25f4f13416ff48 SHA1 df4fb65b8e3a8202840d80f5c8524aae4d1e140f SHA256 9e7a24ced47353ab6e998c94ddf997a66cf2e75b066c6ae28229e13541896765
 EBUILD calibre-0.6.49.ebuild 4532 RMD160 2439bd56651a318ad714349e6be1900aa7bc5249 SHA1 26543e119e3dd5e0b087b8fe146467a0e5c8623f SHA256 b1de607b212185f3c93b9fe330db340ca8fd04f2a7fd006317e6f5f06296ad1f
-MISC ChangeLog 13347 RMD160 6df5726132b883e35f5264e6a5c73ea9f80b28ef SHA1 0a7db50b478924a9e66ee35a1650a6e3af2e5443 SHA256 8862736fc83d7c2b0653304cc4b2700afcfd7bc9619f6d7e59e572514175583c
+EBUILD calibre-0.6.50.ebuild 4532 RMD160 f65c561479f11088464da476a811664c43ec282f SHA1 01110348d933900552ee036e38ae7cf30bc71a8c SHA256 192a6b4b011efb9a7377b1aacf255080277a6364508a98a83bde657dd7cfbfec
+MISC ChangeLog 13618 RMD160 0fc52f2ce39cdc29c0bf2e4e60f9b88652e9892d SHA1 1490c44a1284482980fc8f0ba52b4eac0e11d98b SHA256 1ddafc76b248fcfb66dd84871812f69f0e3def22b673f6af82d79473c67196d6
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvVLWYACgkQ/ejvha5XGaPwlgCfRaiC6PmS0FsCI4/gAdlPUiIA
-+AUAoLz2LNz9H6unlqww3z1rJZsDx3VQ
-=m+U3
+iEYEARECAAYFAkvbW5oACgkQ/ejvha5XGaNjEwCgoYpf4H/zhOgcSOeLDuJqeuSl
+5mEAn1BnChdH6NG0Mz2OgjZkyNx3kq68
+=Ke5s
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.44.ebuild b/app-text/calibre/calibre-0.6.44.ebuild
deleted file mode 100644
index b8c3ff2075d6..000000000000
--- a/app-text/calibre/calibre-0.6.44.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.44.ebuild,v 1.1 2010/03/06 11:12:20 zmedico Exp $
-
-EAPI=2
-PYTHON_DEPEND=2:2.6
-PYTHON_USE_WITH=sqlite
-
-inherit python distutils eutils fdo-mime bash-completion
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://calibre-ebook.com/downloads/$P.tar.gz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE=""
-
-# libusb-compat is untested
-SHARED_DEPEND=">=dev-python/cssutils-0.9.7_alpha2
-	>=dev-python/setuptools-0.6_rc5
-	>=dev-python/imaging-1.1.6
-	>=dev-libs/chmlib-0.40
-	>=dev-libs/libusb-0.1.12: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
-	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
-	>=sys-apps/help2man-1.36.4
-	app-text/podofo"
-
-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
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-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"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed'ing in the IMAGE path failed"
-
-	distutils_src_prepare
-}
-
-src_install() {
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!$BASH
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	# --bindir and --sharedir don't seem to work.
-	# Pass them in anyway so we'll know when they are fixed.
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #295672 - Aavoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export XDG_CONFIG_HOME="$HOME/.config"
-	export CALIBRE_CONFIG_DIRECTORY="$XDG_CONFIG_HOME/calibre"
-	mkdir -p "$XDG_CONFIG_HOME" "$CALIBRE_CONFIG_DIRECTORY"
-
-	PATH=${T}:${PATH} 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"
-
-	# Python modules are no longer installed in
-	# site-packages, so remove empty dirs.
-	find "${D}$(python_get_libdir)" -type d -empty -delete
-
-	# 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
-	chmod -fR a+rX,u+w,g-w,o-w "$HOME"/.local
-	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
-
-	python_convert_shebangs -r 2 "$D"
-}
-
-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.45.ebuild b/app-text/calibre/calibre-0.6.45.ebuild
deleted file mode 100644
index 1e3ee840fc1f..000000000000
--- a/app-text/calibre/calibre-0.6.45.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.45.ebuild,v 1.1 2010/03/28 10:34:00 zmedico Exp $
-
-EAPI=2
-PYTHON_DEPEND=2:2.6
-PYTHON_USE_WITH=sqlite
-
-inherit python distutils eutils fdo-mime bash-completion
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://calibre-ebook.com/downloads/$P.tar.gz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE=""
-
-# libusb-compat is untested
-SHARED_DEPEND=">=dev-python/cssutils-0.9.7_alpha2
-	>=dev-python/setuptools-0.6_rc5
-	>=dev-python/imaging-1.1.6
-	>=dev-libs/chmlib-0.40
-	>=dev-libs/libusb-0.1.12: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
-	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
-	>=sys-apps/help2man-1.36.4
-	app-text/podofo"
-
-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
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-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"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed'ing in the IMAGE path failed"
-
-	distutils_src_prepare
-}
-
-src_install() {
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!$BASH
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	# --bindir and --sharedir don't seem to work.
-	# Pass them in anyway so we'll know when they are fixed.
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #295672 - Aavoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export XDG_CONFIG_HOME="$HOME/.config"
-	export CALIBRE_CONFIG_DIRECTORY="$XDG_CONFIG_HOME/calibre"
-	mkdir -p "$XDG_CONFIG_HOME" "$CALIBRE_CONFIG_DIRECTORY"
-
-	PATH=${T}:${PATH} 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"
-
-	# Python modules are no longer installed in
-	# site-packages, so remove empty dirs.
-	find "${D}$(python_get_libdir)" -type d -empty -delete
-
-	# 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
-	chmod -fR a+rX,u+w,g-w,o-w "$HOME"/.local
-	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
-
-	python_convert_shebangs -r 2 "$D"
-}
-
-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.47.ebuild b/app-text/calibre/calibre-0.6.50.ebuild
index 176212449607..a674128de486 100644
--- a/app-text/calibre/calibre-0.6.47.ebuild
+++ b/app-text/calibre/calibre-0.6.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.47.ebuild,v 1.2 2010/04/12 00:26:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.50.ebuild,v 1.1 2010/04/30 22:36:56 zmedico Exp $
 
 EAPI=2
 PYTHON_DEPEND=2:2.6