b2uconverter to 10.02; calibre 0.8.41

5 files changed, 257 insertions, 3 deletions

diff --git a/app-office/b2uconverter/Manifest b/app-office/b2uconverter/Manifest
index 142a1f3..1ae7b71 100644
--- a/app-office/b2uconverter/Manifest
+++ b/app-office/b2uconverter/Manifest
@@ -1,4 +1,2 @@
-DIST b2uconverter-10.01.04.oxt 63105 RMD160 90ffe2282029e3c378cb965316cb61168a1035db SHA1 b36df46cc3a9cefbb1c94246ded2d7f6b16654b6 SHA256 f419e898a107342e0b52a9c4d0f96760ce0b856dc6ed85678eade4a8a4795f77
-DIST b2uconverter-10.02.oxt 65017 RMD160 641488db4fbd476f5adb3f99e9c345b1c6052667 SHA1 d5b017a54759d2836cbcd05f6d0674609f23cefb SHA256 4d56f8784965af5c222ec538c8d70091d65f7d41c3d6405c2441caac33201358
-EBUILD b2uconverter-10.01.04.ebuild 672 RMD160 1fab4300fee61d685a06537fadf33534e6e6ca77 SHA1 27b44c414b22ff5e6fa8c2b45dd2c5796941ffe4 SHA256 6d13957db146f915dd96a68c4bb4d7deb2af8f921254f7979588a53c652b2029
+DIST b2uconverter-10.02.oxt 64923 RMD160 b0c2efff0e5425a0be92d9cc60c543236c922ae9 SHA1 df7a0ec5b6f741a735fe412943d5ce8a0ba262b4 SHA256 88427a272346098ddd7f7f13af77707b99fd93a3d88afbd7430489d02c933b22
 EBUILD b2uconverter-10.02.ebuild 672 RMD160 1fab4300fee61d685a06537fadf33534e6e6ca77 SHA1 27b44c414b22ff5e6fa8c2b45dd2c5796941ffe4 SHA256 6d13957db146f915dd96a68c4bb4d7deb2af8f921254f7979588a53c652b2029
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
new file mode 100644
index 0000000..222428c
--- /dev/null
+++ b/app-text/calibre/Manifest
@@ -0,0 +1,4 @@
+AUX calibre-server.conf 523 RMD160 4cae757bc84775b66304d969f241b5e377b0e469 SHA1 4b88e517fb24c2b306e12d306bdcff4709f4820e SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213
+AUX calibre-server.init 1928 RMD160 673b3128df7c24151a74a5c87b54020cb63bee62 SHA1 8192780f7c70a027fa962619d519b136d3d8a7b8 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a9f74c941a45d8b65707b
+DIST calibre-0.8.41.tar.xz 24003452 RMD160 85c16b05de47eb54236691848c44aec813ae4d07 SHA1 532caa160726c58b52b164df60ee3c2c33ade024 SHA256 be986113f707c70255814d3dbc4b3d2f8319124c4215c9f5960293545ed7d91d
+EBUILD calibre-0.8.41.ebuild 5917 RMD160 ba56032c29c938dac4bcb7bdbb00e52683d8f968 SHA1 1e522610054d2cf19bb7479a846042832c3557a1 SHA256 fe82de447d9e0b0c56f7f4d34f057b7c1e107c43060fee568ba3d170cff3cb59
diff --git a/app-text/calibre/calibre-0.8.41.ebuild b/app-text/calibre/calibre-0.8.41.ebuild
new file mode 100644
index 0000000..590fd5b
--- /dev/null
+++ b/app-text/calibre/calibre-0.8.41.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.40.ebuild,v 1.1 2012/02/18 09:02:26 zmedico Exp $
+
+EAPI=4
+PYTHON_DEPEND=2:2.7
+PYTHON_USE_WITH="ssl sqlite"
+
+inherit python distutils eutils fdo-mime bash-completion-r1 multilib
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="amd64 x86"
+
+SLOT="0"
+
+IUSE="+udisks"
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2
+	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
+	>=dev-libs/chmlib-0.40
+	>=dev-libs/icu-4.4
+	>=dev-python/beautifulsoup-3.0.5:python-2
+	dev-python/python-dateutil:python-2
+	>=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.8.2[X,svg,webkit]
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	>=media-libs/libwmf-0.2.8
+	virtual/libusb:0
+	>=x11-misc/xdg-utils-1.0.2"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/reportlab-2.1
+	udisks? ( sys-fs/udisks )"
+
+DEPEND="${COMMON_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.7
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
+		-e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
+		-e "s:xdg-icon-resource install:\\0 --mode user:" \
+		-e "s:xdg-mime install:\\0 --mode user:" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# 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 failed to patch install.py"
+
+	sed -e "/^            self\\.check_call(qmc + \\[ext\\.name+'\\.pro'\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+	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}
+
+	# 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 #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# 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" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		distutils_src_install \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}"
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
+	# due to bug #389515 (instead, calibre now calls udisks via dbus).
+	rm "${ED}usr/bin/calibre-mount-helper" || die
+
+	find "${ED}"usr/share/calibre/man -type f -print0 | \
+		while read -r -d $'\0' ; do
+			if [[ ${REPLY} = *.[0-9]calibre.bz2 ]] ; then
+				newname=${REPLY%calibre.bz2}.bz2
+				mv "${REPLY}" "${newname}"
+				doman "${newname}"
+				rm -f "${newname}" || die "rm failed"
+			fi
+		done
+	rmdir "${ED}"usr/share/calibre/man/* || \
+		die "could not remove redundant man subdir(s)"
+	rmdir "${ED}"usr/share/calibre/man || \
+		die "could not remove redundant man dir"
+
+	# 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/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	python_convert_shebangs -r $(python_get_version) "${ED}"
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	python_mod_optimize /usr/$(get_libdir)/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+}
diff --git a/app-text/calibre/files/calibre-server.conf b/app-text/calibre/files/calibre-server.conf
new file mode 100644
index 0000000..c1bed84
--- /dev/null
+++ b/app-text/calibre/files/calibre-server.conf
@@ -0,0 +1,13 @@
+# /etc/conf.d/calibre-server
+# Change this to the user you want to run calibre-server as.
+# You may specify a group too, after a colon
+# NOTE:  This must be set and not to root!
+CALIBRE_USER=
+
+# Set the path of the library to serve.
+# Defaults to the default location for CALIBRE_USER.
+#CALIBRE_LIBRARY='<user home directory>/Calibre Library'
+
+# Extra options to pass to calibre-server.
+# See the calibre-server man page for more options.
+#CALIBRE_OPTS="--username calibre --password password --thread-pool 10 --port 8080"
diff --git a/app-text/calibre/files/calibre-server.init b/app-text/calibre/files/calibre-server.init
new file mode 100644
index 0000000..f172707
--- /dev/null
+++ b/app-text/calibre/files/calibre-server.init
@@ -0,0 +1,59 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/files/calibre-server.init,v 1.1 2012/01/14 18:27:01 zmedico Exp $
+
+depend() {
+	need net
+	need localmount
+	after bootmisc
+}
+
+checkconfig() {
+	if [ "${CALIBRE_USER}" = "" -o "${CALIBRE_USER}" = "root" ] ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "You have to specify a user to run calibre-server as, as we will not run it as root!"
+		eerror "Modify CALIBRE_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${CALIBRE_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${CALIBRE_USER%:*}" != "${CALIBRE_USER}" ] ; then
+		if ! getent group "${CALIBRE_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/calibre-server"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi
+	if [ "${CALIBRE_LIBRARY}" = "" ] ; then
+		CALIBRE_USER_HOME=$(getent passwd "${CALIBRE_USER%:*}" | cut -d ':' -f 6)
+		CALIBRE_LIBRARY="${CALIBRE_USER_HOME}/Calibre Library"
+	fi
+	if [ ! -d "${CALIBRE_LIBRARY}" ] ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "The Calibre library, '${CALIBRE_LIBRARY},' does not exist."
+		eerror "Please modify CALIBRE_LIBRARY to point to a valid library."
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	local pidfile=/var/run/calibre-server.pid
+	ebegin "Starting calibre-server"
+	start-stop-daemon --user "${CALIBRE_USER}" \
+		--pidfile "${pidfile}" --make-pidfile --background --exec /usr/bin/calibre-server \
+		-- --with-library "${CALIBRE_LIBRARY}" ${CALIBRE_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping calibre-server"
+	start-stop-daemon --stop --user "${CALIBRE_USER}" \
+		--pidfile /var/run/calibre-server.pid
+	eend $?
+}