yngwin 14/11/09 13:18:44 Modified: calibre-2.9.0.ebuild ChangeLog Log: Fix failure of xdg tools to recognize vendor prefix (see bug #521484) (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x0F9C590B7FF324F6!)
Revision Changes Path 1.2 app-text/calibre/calibre-2.9.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-2.9.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-2.9.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-2.9.0.ebuild?r1=1.1&r2=1.2 Index: calibre-2.9.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.9.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- calibre-2.9.0.ebuild 9 Nov 2014 12:28:05 -0000 1.1 +++ calibre-2.9.0.ebuild 9 Nov 2014 13:18:44 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.9.0.ebuild,v 1.1 2014/11/09 12:28:05 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.9.0.ebuild,v 1.2 2014/11/09 13:18:44 yngwin Exp $ EAPI=5 @@ -111,14 +111,20 @@ -i setup/extensions.py || die "sed failed to patch extensions.py" # use system beautifulsoup, instead of bundled - rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py || die "could not remove bundled beautifulsoup" + rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \ + || die "could not remove bundled beautifulsoup" find "${S}" -type f -name \*.py -exec \ sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \ || die "could not sed bundled beautifulsoup out of the source tree" + # avoid failure of xdg tools to recognize vendor prefix + sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \ + -e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \ + -e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \ + -i "${S}"/src/calibre/linux.py || die 'sed failed' + # 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 - # C locale: if LC_ALL=C do not raise an exception when locale cannot be canonicalized epatch \ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ "${FILESDIR}/${PN}-disable_plugins.patch" 1.335 app-text/calibre/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.335&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.335&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?r1=1.334&r2=1.335 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v retrieving revision 1.334 retrieving revision 1.335 diff -u -r1.334 -r1.335 --- ChangeLog 9 Nov 2014 12:28:05 -0000 1.334 +++ ChangeLog 9 Nov 2014 13:18:44 -0000 1.335 @@ -1,6 +1,9 @@ # ChangeLog for app-text/calibre # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.334 2014/11/09 12:28:05 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.335 2014/11/09 13:18:44 yngwin Exp $ + + 09 Nov 2014; Ben de Groot <[email protected]> calibre-2.9.0.ebuild: + Fix failure of xdg tools to recognize vendor prefix (see bug #521484) *calibre-2.9.0 (09 Nov 2014)
