summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-02-10 20:08:47 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-02-10 20:08:47 +0000
commitb342ca93076110a3b6c9172d9a309827e0febd41 (patch)
tree7f7461cb367bbd799d03fddb41ffd49eaaac6373
parentversion bump (diff)
downloadgentoo-2-b342ca93076110a3b6c9172d9a309827e0febd41.tar.gz
gentoo-2-b342ca93076110a3b6c9172d9a309827e0febd41.tar.bz2
gentoo-2-b342ca93076110a3b6c9172d9a309827e0febd41.zip
Augh I had those patches on one line, trimmed by vim, add backslash.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
-rw-r--r--app-text/calibre/ChangeLog5
-rw-r--r--app-text/calibre/calibre-0.9.18.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index d5cc4d2c6110..e6b8ef4fc20e 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-text/calibre
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.258 2013/02/10 20:03:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.259 2013/02/10 20:08:47 scarabeus Exp $
+
+ 10 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org> calibre-0.9.18.ebuild:
+ Augh I had those patches on one line, trimmed by vim, add backslash.
10 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+files/calibre-disable_plugins.patch, +files/calibre-no_updates_dialog.patch,
diff --git a/app-text/calibre/calibre-0.9.18.ebuild b/app-text/calibre/calibre-0.9.18.ebuild
index 44b20140463c..48d34174471d 100644
--- a/app-text/calibre/calibre-0.9.18.ebuild
+++ b/app-text/calibre/calibre-0.9.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.18.ebuild,v 1.2 2013/02/10 20:03:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.18.ebuild,v 1.3 2013/02/10 20:08:47 scarabeus Exp $
EAPI=5
PYTHON_DEPEND=2:2.7
@@ -92,7 +92,7 @@ src_prepare() {
# no_updates: do not annoy user with "new version is availible all the time
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
epatch \
- "${FILESDIR}/${PN}-no_updates_dialog.patch"
+ "${FILESDIR}/${PN}-no_updates_dialog.patch" \
"${FILESDIR}/${PN}-disable_plugins.patch"
}
@@ -117,7 +117,7 @@ src_install() {
# 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
+ #export -n LANGUAGE
# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
# variables to point to our fake temporary $HOME.