*calibre-0.7.18 (15 Sep 2010)

  15 Sep 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.7.18.ebuild:
  0.7.18 version bump.

  15 Sep 2010; Zac Medico <zmedico@gentoo.org> -calibre-0.7.12.ebuild,
  -calibre-0.7.13.ebuild:
  Remove old versions.

(Portage version: 2.2_rc82_p5/cvs/Linux i686)

3 files changed, 20 insertions, 164 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 755c4dc986ee..b4ccd5e02f67 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.101 2010/09/10 06:39:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.102 2010/09/15 01:24:47 zmedico Exp $
+
+*calibre-0.7.18 (15 Sep 2010)
+
+  15 Sep 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.7.18.ebuild:
+  0.7.18 version bump.
+
+  15 Sep 2010; Zac Medico <zmedico@gentoo.org> -calibre-0.7.12.ebuild,
+  -calibre-0.7.13.ebuild:
+  Remove old versions.
 
   10 Sep 2010; Zac Medico <zmedico@gentoo.org> calibre-0.7.17.ebuild:
   Bug #336469 - Bump podofo dependency to 0.8.2.
diff --git a/app-text/calibre/calibre-0.7.13.ebuild b/app-text/calibre/calibre-0.7.13.ebuild
deleted file mode 100644
index ab517cffa5cb..000000000000
--- a/app-text/calibre/calibre-0.7.13.ebuild
+++ /dev/null
@@ -1,152 +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.13.ebuild,v 1.1 2010/08/08 03:07:52 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.1.5
-	>=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.3.8 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"
-
-	# Avoid segfault in uuid.uuid4() for bug #315345.
-	local installation_uuid=$(python -c 'import sys, uuid; sys.stdout.write(str(uuid.uuid4()))')
-	[[ -n $installation_uuid ]] || die "failed to generate installation_uuid"
-	sed -e "s:str(uuid.uuid4()):'$installation_uuid':" \
-		-i src/calibre/utils/config.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.7.12.ebuild b/app-text/calibre/calibre-0.7.18.ebuild
index d699efbf831e..dfcfcf72e9b8 100644
--- a/app-text/calibre/calibre-0.7.12.ebuild
+++ b/app-text/calibre/calibre-0.7.18.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.12.ebuild,v 1.1 2010/08/03 04:06:36 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.18.ebuild,v 1.1 2010/09/15 01:24:47 zmedico Exp $
 
 EAPI=3
 PYTHON_DEPEND=2:2.6
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE=""
 
 SHARED_DEPEND="
-	>=app-text/podofo-0.7
+	>=app-text/podofo-0.8.2
 	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
 	>=dev-libs/chmlib-0.40
 	>=dev-python/beautifulsoup-3.0.5
@@ -29,11 +29,11 @@ SHARED_DEPEND="
 	>=dev-python/cssutils-0.9.7_alpha3
 	>=dev-python/dbus-python-0.82.2
 	>=dev-python/imaging-1.1.6
-	>=dev-python/lxml-2.1.5
+	>=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.3.8 media-gfx/graphicsmagick[imagemagick] )
+	|| ( >=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
@@ -65,12 +65,6 @@ src_prepare() {
 	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"
 
-	# Avoid segfault in uuid.uuid4() for bug #315345.
-	local installation_uuid=$(python -c 'import sys, uuid; sys.stdout.write(str(uuid.uuid4()))')
-	[[ -n $installation_uuid ]] || die "failed to generate installation_uuid"
-	sed -e "s:str(uuid.uuid4()):'$installation_uuid':" \
-		-i src/calibre/utils/config.py || die "sed'ing in the IMAGE path failed"
-
 	distutils_src_prepare
 }
 
@@ -92,12 +86,17 @@ src_install() {
 	# violation with kbuildsycoca as in bug #287067, comment #13.
 	export -n DISPLAY
 
-	# Bug #295672 - Aavoid sandbox violation in ~/.config by forcing
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
 	# variables to point to our fake temporary $HOME.
+	export HOME="$T/fake_homedir"
 	export XDG_CONFIG_HOME="$HOME/.config"
+	export XDG_DATA_HOME="$HOME/.local/share"
 	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"