28 Sep 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.7.20.ebuild:

0.7.20 version bump.

28 Sep 2010; Zac Medico <zmedico@gentoo.org> -calibre-0.7.16.ebuild,
-calibre-0.7.17.ebuild:
Remove old versions.

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

4 files changed, 18 insertions, 160 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index b4ccd5e02f67..32d2a003d447 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.102 2010/09/15 01:24:47 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.103 2010/09/28 20:15:00 zmedico Exp $
+
+*calibre-0.7.20 (28 Sep 2010)
+
+  28 Sep 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.7.20.ebuild:
+  0.7.20 version bump.
+
+  28 Sep 2010; Zac Medico <zmedico@gentoo.org> -calibre-0.7.16.ebuild,
+  -calibre-0.7.17.ebuild:
+  Remove old versions.
 
 *calibre-0.7.18 (15 Sep 2010)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index ff141e01943c..640b4bd01b7a 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,19 +2,17 @@
 Hash: SHA1
 
 DIST calibre-0.6.55.tar.gz 13029109 RMD160 71747b0cbcf12c78168339fbbe0f77998d3c9c5f SHA1 9fa6000c6f6ce7df1a284200c5c1a8714ee1e8cf SHA256 6b004a1adda25283bedbc8e60215bcd92c4394c59a666ff5f05f0e5808433ebc
-DIST calibre-0.7.16.tar.gz 15515129 RMD160 3c8739dec84fc5c01adb52dbfb12c2ef9c5d7e08 SHA1 c63c55f1b2991991fc98a3e5f0d610a836768522 SHA256 54019a96733313f78bc8b31cce0db36256ff272d4862e1dac455d891ee9c8e11
-DIST calibre-0.7.17.tar.gz 15586988 RMD160 6648621cbed11afbf55760649cd8178bac70c412 SHA1 45c176c9a69c89d666c69826985ddd180ffaa778 SHA256 dec609ff55d95a57b99bbee9065d60fa202a0783e784dc8031b6228a5b60b237
 DIST calibre-0.7.18.tar.gz 16692023 RMD160 71aacf52a043b814c0160e116c1b55442f76c00c SHA1 6c1dd087f89ae85c0f440d072efcfb7a2c86e188 SHA256 02294dc8d4bb8c23fce63faf11816bc07e674d21eb9311b61ec1c2b499f963e0
+DIST calibre-0.7.20.tar.gz 17006309 RMD160 c68085bdca47e821e89757d3992822f5ec3a3850 SHA1 b236876f00de487676ff8e4c95acf0cfe3729e0d SHA256 a273f409b82ff962cd6e0638063934a4d0440e5d9d8f8f3e5ae12e9923467181
 EBUILD calibre-0.6.55.ebuild 4532 RMD160 7413eb37657f2d4b8e9a37a9f1349ada34b38b0b SHA1 2186cf63df6b0d80a47e31b33245c41b903fa71e SHA256 0f852e192347cd4b4cf3f16e303f48feeb07155631b993e72011c224ef62e1fd
-EBUILD calibre-0.7.16.ebuild 4587 RMD160 d0b02d3c85a81abbb245a2871520f7d4a97c9294 SHA1 4f08997dafa85a6dd3ab87d0c789793dba03a9e6 SHA256 e2d79256f7899e757fe42b8b680f4b393f3128129aefdcf739d4df5cb03f18cf
-EBUILD calibre-0.7.17.ebuild 4663 RMD160 67460f99211de5825323e2b7125347f0895e568e SHA1 f4157f0cfe8c592fdcfdce92b3dba9eb5c2cd1a4 SHA256 7e9a538773990978f7c72ab8edbeaf6b82b5a5055aceb6bd00aaf85a9b868390
 EBUILD calibre-0.7.18.ebuild 4663 RMD160 8258c8ee6c006c84f4efd044efd6bfd52db60058 SHA1 2a3180015f9f343be5ed1c10028cda6de686474c SHA256 3ef6f7960000b31ed4e27d8b13b378077d25141693e5a03892f66025d0edb7a1
-MISC ChangeLog 16348 RMD160 5e90ee637813c171e6c0e2abe9703680be964518 SHA1 c553a64422e922d914e526f86202796723ec39a2 SHA256 1e80429a41a4a852734df4c4a634c22ce3e6ccc8e095aa4a4e8f4b0c2aaa95e3
+EBUILD calibre-0.7.20.ebuild 4663 RMD160 75c7f726086d42ba892924f49230a8434ba42946 SHA1 5395bee3f95169c41c56ddccf815dc7e434897cb SHA256 3cc275ef34d243f506c72d41fec20e2e560f1374f43c3648b22d66b2ec1edc45
+MISC ChangeLog 16595 RMD160 ccd9d81ab338986712db648e37ea1b1caaaeb6ac SHA1 393ee44cdc9eee36203cc0c82bfdb75986b2acb2 SHA256 5e905a00f34fb8a1b6fd21e7d92d2f8e7c04de04cabe462ba2cc3c6fad25c27c
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyQIH8ACgkQ/ejvha5XGaOOvwCg6TH0ShwDRqyVfA/BoL/a2A9Z
-Y7UAoLSC5O7NQwx6KoRrEvtIPWtorDCK
-=K9hR
+iEYEARECAAYFAkyiTLQACgkQ/ejvha5XGaORcwCgmVmqdx2ennsRpVbhanlNWnDU
+BfwAoNW+H/7jA2qLKHtx/2zw+l7ibHmG
+=iEYq
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.7.16.ebuild b/app-text/calibre/calibre-0.7.16.ebuild
deleted file mode 100644
index 497601a1722a..000000000000
--- a/app-text/calibre/calibre-0.7.16.ebuild
+++ /dev/null
@@ -1,149 +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.7.16.ebuild,v 1.1 2010/08/30 01:35:22 zmedico Exp $
-
-EAPI=3
-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=""
-
-SHARED_DEPEND="
-	>=app-text/podofo-0.7
-	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
-	>=dev-libs/chmlib-0.40
-	>=dev-python/beautifulsoup-3.0.5
-	>=dev-python/dnspython-1.6.0
-	>=dev-python/cssutils-0.9.7_alpha3
-	>=dev-python/dbus-python-0.82.2
-	>=dev-python/imaging-1.1.6
-	>=dev-python/lxml-2.2.1
-	>=dev-python/mechanize-0.1.11
-	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/PyQt4-4.7[X,svg,webkit]
-	|| ( >=media-gfx/imagemagick-6.5.9 media-gfx/graphicsmagick[imagemagick] )
-	>=media-libs/libwmf-0.2.8
-	>=sys-apps/help2man-1.36.4
-	virtual/libusb:0
-	>=x11-misc/xdg-utils-1.0.2"
-
-RDEPEND="$SHARED_DEPEND
-	>=dev-python/reportlab-2.1"
-
-DEPEND="$SHARED_DEPEND
-	>=dev-python/setuptools-0.6_rc5
-	>=gnome-base/librsvg-2.0.0
-	>=x11-misc/xdg-utils-1.0.2-r2"
-
-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:" \
-		-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 - Avoid 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"
-
-	# Bug #334243 - respect LDFLAGS when building calibre-mount-helper
-	export OVERRIDE_CFLAGS="$CFLAGS $LDFLAGS"
-
-	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.7.17.ebuild b/app-text/calibre/calibre-0.7.20.ebuild
index eb4566ce5c11..d5dc35ba8520 100644
--- a/app-text/calibre/calibre-0.7.17.ebuild
+++ b/app-text/calibre/calibre-0.7.20.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.7.17.ebuild,v 1.2 2010/09/10 06:39:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.20.ebuild,v 1.1 2010/09/28 20:15:00 zmedico Exp $
 
 EAPI=3
 PYTHON_DEPEND=2:2.6