Stable amd64 and x86 to get fresher again on stable.

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

4 files changed, 22 insertions, 183 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index e07816512ee0..69dcbd7ef9d1 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.232 2012/10/11 11:32:06 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.233 2012/10/12 09:52:05 scarabeus Exp $
+
+  12 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> -calibre-0.8.62.ebuild,
+  calibre-0.9.1.ebuild:
+  Stable amd64 and x86 to get fresher again on stable.
 
 *calibre-0.9.2 (11 Oct 2012)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 80af87454699..23ed7df38815 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,18 +3,26 @@ Hash: SHA256
 
 AUX calibre-server.conf 523 SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058 WHIRLPOOL a4ba22fb5a9893c2db6254e2ee569514dd132284e0f4e8b62561ec3def773c917d17d6718975b1ecbd02197cb3330506e48b6dd656c20cfacfd610a680e34db1
 AUX calibre-server.init 1928 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a9f74c941a45d8b65707b SHA512 c51c7cae899bebe7fb339f9cfd4070caa778f86ce997dce26052e158dac12444d3a72db91fd83528ccad07d9bd9a9e72edca9ba91d1805e91c91a0a6ed32f579 WHIRLPOOL cf91dc9993b0329821a9a7b9b4a5245c8ef7a6a2a407cddae4b7b94aff1698e663e9ba08352b61b48fe34a1e3c83701ac71ac549142fd12795e1828d5d8f779d
-DIST calibre-0.8.62.tar.xz 25090932 SHA256 5da54282959e86f288dbb3e275ab403db5a66c74c7ab384adeeb24c459612159 SHA512 2d129b49b3b6daa2a5c85c02a57e70c8ac1ca8b102bca6f708c9094b9f04fb97abed62b4b00e2876473e887492cffbda3247be6021dfb6fe869f878b335c213d WHIRLPOOL c2b90f76b21dda70902dfcdda7fc698f1dcdb5397724f409745530be3f891e556806aab10a3d9328ad695455a6e0ad04084182f63af55fb4328ba60fab228cfc
 DIST calibre-0.9.1.tar.xz 27084512 SHA256 c4d32577133769dd8db7a75d1293c2762a8dd876f1203557d33be7a61fed89b3 SHA512 7d770a1e1793a7110c59995c12497092e214662bf47a2196feab296c147f538a0dc19617919cdb8606fb43fb10668f7c8d7009ff1a96f9221a36ab0b363877f5 WHIRLPOOL c51914f30995a0b740e2a67bf77893ac676310c37844175f1aaff717bbc4b24dedd70183bf84d0742a470a302ce8f6965cffd4d39b1ee71ce263a46552a90add
 DIST calibre-0.9.2.tar.xz 27118940 SHA256 a9347dbe08a331e46a8db88cce8bd72bb8d06c582922a01ffa6b0345bd441c75 SHA512 f06dc3bf54e48972c2cd3fc2c6f9d377783e68393eeca782100049a1813314f981b1a5ae685189039c49dd38ab20d4ca5c0dccc2314c40ec16af9f52f4585ec0 WHIRLPOOL f7e201ab871a16994dec58cc4f1cb1d8c4a4c555d1cee16ef7b977ec1b41b639d3d669b426f19c30b3a7f9a33437804c51f8ad8e41761beea7fa470a4f329073
-EBUILD calibre-0.8.62.ebuild 5731 SHA256 66d57a6c6fe9cfff4b55ef3c767d2066df68375e7ca903bd40d9be3035c9ea9c SHA512 0aaec34280d01063edcfb463e088be88dc1b0f06fc376b10c584fe521fa8d219738f04d95882923d2e9896f6479e2e8fbf3b03981cc3418ba96cbcb1a2e16d40 WHIRLPOOL 6308ee934bb61d1dd91c2b7ccb980c3d9c5f5a928d3da09b76872dd8da5abdc52803c96043705da67fd2405e5e16e922a02b6d51f21bbc07ad3b2d7e24b6b78b
-EBUILD calibre-0.9.1.ebuild 6013 SHA256 157811ae20aa203b047b5a7c142fe128e148b3db9a10b390c050b1dac4806dd2 SHA512 0b64887863897d9b214258d0fb097876786ba49947be3911f8e34c374dc4f8bf520ad064e41621a7499dd585a4a98767c9053b85369d282b9107f3d4fcce4f47 WHIRLPOOL 7c020717e979f3eb7e9bbfc1777f007a0f5c378b5b9b7cf990dfa9c2f8f921b02da78cf42ffc9e1bd641b0c714f357144cc2a082d12f48a54c6ca666c7054d2b
+EBUILD calibre-0.9.1.ebuild 6013 SHA256 8c08b054bf7fbb4f5c843e7013406492ff3e2fce7706d2fe491eb52e3b352eff SHA512 489ab4a1daaf1bb5a55a479c8038686dc4ed95e7c81bdb394837142b4fde63523e2113ef4f682393b6b2c1e5d515a92327ec7292e24f76d766537fe63af7310d WHIRLPOOL 47149f5672b3bfd4e1df297c30809569193c4412cbe65cdf2edfabc9711379f10c0fdae1ace1b1f6ad6417acf60fbceb9071852d54e6c1729b534fd7df06ec8f
 EBUILD calibre-0.9.2.ebuild 6013 SHA256 31fe3a37298ca29be66666ff67de4f3103413765f1bdaad8a57b88d79de8a116 SHA512 5053041dd10e0f183e37df0f53a9d6836e7040284fb412d259c85388c3ed6530e8ddf240f0e104435db1f35ea0a59934a89c3f2f175d4c640093f9aad45c93ba WHIRLPOOL ff3512553ab288ec0db3b495016cce5e7593bef983ae07bd723edd8afc58ca7151f450125c5228513d49d8dba00f1ad3b6f9ac81abdd442763f52114e6e9e9db
-MISC ChangeLog 37175 SHA256 0f244d9e7ceeb71c98bff202683e9ffd25f79564b506e11194f9932415609670 SHA512 6b29a10fd2afa1be822ae535b51b2fc2e748c95a058537a77f2fe3db248a848bfd45c3ee40410c37966ec31fa39a883b03cb7cd8a12cc5c8c9a455a2fec6fbd6 WHIRLPOOL a363a8774603ed7b79985f220abb7c841f05665bb0780759bd1850769e7db468378694dc87a4e39668b81273dd2f72102d9b7769aa2b123c1ff8925b72ee35d7
+MISC ChangeLog 37336 SHA256 fb14d4f26de85c9fac0c21d20ebd9af71f98c4656e135e78cee66e45023a50ed SHA512 6a9ebfa0f8f8a31b7a7a68720e3843f1d7af39f414946a951f581ed1f2579c094515271862e792e9a3fb0ea6edb468752535fac12adce73c9b8b6f90232e6fde WHIRLPOOL 3cd98d131c8ce25b794d63293f2e983356165a1fdc60984ce51c5cf102c917a511deef92e027c1827c7dd61a5a618df9d3c8556d6bba16a6c3356947b668922e
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB2rjoACgkQ/ejvha5XGaMJnQCgjjGVU2zuZpX16bJagbViQsRL
-q4oAnjLuARYCUZCxSgh10Lmz1qMFVmV1
-=UJcC
+iQIcBAEBCAAGBQJQd+hCAAoJEOSiRoyO7jvoR+YP/A/pGRW21HxRF+CCTqumKtTz
+G6wHrTuJthRYbfd6bQaMBE8rB1DvWETb4K9wawo1hxjVdkmyDiZPtn91GTy3G6N/
+Tr3+WC2B39ZOLpJitmz1hqkP/lQeyHao6FUNPQd+b/lXGYJ/8i81s2f5v9NA37QG
+DxVzukmNGdz9lum0SJaMTyH77HJUFlwmcDDn5j92E7w9mmhKjWpTRNFwFgNlKx76
+e4tOUoJxPgWVVHj8TcvqF5xa51fSIwhAHmy9mY8UpUgiaeidgvaRPttgC75QFmVl
+bPBNKb0FrQnUAb3lGry+oN/lJD/7r53chqnQzU129CgirkRd9Du+c6cR2R2OYAIn
+ISxjTbHFvXGj4HCQZwx+kciWQmnWBAvAxJ/3BgFjGYlTWwHfoTeMrj2U3aLvA28Z
+m9cS0a14NhoO0A6d7v6hzLGKYi6gnzdHQA5a8S8Vlv8IKPtbsesJopBYywV2grz0
+uBhoUkdZBlHF0YxvfZx68S/voALNz0yuH29xO8RmDD7BJXYzTsUXDBQLbsqRoiAm
+j9aDiy7yc+V9NDVzdatKUAS/gzKJOCYCqkQJGpARrgIu0Zx6/wopUEkODMutrURD
+iPAi/oHR3FRV4eLhU898wN+Xa/LhRXRas+Va4rtb0PXfgbagNSMxK3XluL+zZ29K
+r30qZp7iNHZpc07fa1fq
+=b2UT
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.62.ebuild b/app-text/calibre/calibre-0.8.62.ebuild
deleted file mode 100644
index 7f21b0699858..000000000000
--- a/app-text/calibre/calibre-0.8.62.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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.62.ebuild,v 1.4 2012/09/09 17:30:17 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
-	>=dev-python/dnspython-1.6.0
-	>=dev-python/cssutils-0.9.9
-	>=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.9.1[X,svg,webkit]
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	>=media-libs/libwmf-0.2.8
-	virtual/libusb:1
-	x11-libs/qt-dbus:4
-	x11-libs/qt-svg:4
-	>=x11-misc/xdg-utils-1.0.2-r2"
-
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:0 )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5"
-
-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|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-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 + \\[.*\\.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"
-
-	dodir "$(python_get_sitedir)" # for init_calibre.py
-	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
-
-	# 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"
-
-	dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
-	rm -r "${ED}"usr/etc/bash_completion.d
-	find "${ED}"usr/etc -type d -empty -delete
-
-	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/calibre-0.9.1.ebuild b/app-text/calibre/calibre-0.9.1.ebuild
index cbbb1e599c4b..029c614fd903 100644
--- a/app-text/calibre/calibre-0.9.1.ebuild
+++ b/app-text/calibre/calibre-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # 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.9.1.ebuild,v 1.1 2012/10/05 16:53:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.1.ebuild,v 1.2 2012/10/12 09:52:05 scarabeus Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -14,7 +14,7 @@ SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SLOT="0"