diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-01-20 23:26:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-01-20 23:26:51 +0000 |
| commit | 9bbf6654b694f31e7669df122a83d0048244a28b (patch) | |
| tree | 8cd85175336adc52569dfd9bf2988eccbf01b30e | |
| parent | Bump, fixes assorted bugs and crashes. Drop old. (diff) | |
| download | gentoo-2-9bbf6654b694f31e7669df122a83d0048244a28b.tar.gz gentoo-2-9bbf6654b694f31e7669df122a83d0048244a28b.tar.bz2 gentoo-2-9bbf6654b694f31e7669df122a83d0048244a28b.zip | |
0.8.36 version bump.
(Portage version: 2.2.0_alpha84/cvs/Linux i686)
| -rw-r--r-- | app-text/calibre/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/calibre/calibre-0.8.36.ebuild (renamed from app-text/calibre/calibre-0.8.34.ebuild) | 15 |
2 files changed, 20 insertions, 3 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index bed16f57bdf6..1042da1b54a6 100644 --- a/app-text/calibre/ChangeLog +++ b/app-text/calibre/ChangeLog @@ -1,6 +1,12 @@ # 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.180 2012/01/14 18:27:01 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.181 2012/01/20 23:26:51 zmedico Exp $ + +*calibre-0.8.36 (20 Jan 2012) + + 20 Jan 2012; Zac Medico <zmedico@gentoo.org> +calibre-0.8.36.ebuild, + -calibre-0.8.34.ebuild: + 0.8.36 version bump. *calibre-0.8.35 (14 Jan 2012) diff --git a/app-text/calibre/calibre-0.8.34.ebuild b/app-text/calibre/calibre-0.8.36.ebuild index 96b1811aa5b8..f343cbb29d9f 100644 --- a/app-text/calibre/calibre-0.8.34.ebuild +++ b/app-text/calibre/calibre-0.8.36.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.8.34.ebuild,v 1.1 2012/01/06 09:42:16 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.36.ebuild,v 1.1 2012/01/20 23:26:51 zmedico Exp $ EAPI=4 PYTHON_DEPEND=2:2.7 @@ -73,6 +73,14 @@ src_prepare() { 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 } @@ -109,7 +117,7 @@ src_install() { mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" # Bug #334243 - respect LDFLAGS when building calibre-mount-helper - export OVERRIDE_CFLAGS="$CFLAGS $LDFLAGS" + export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS" local libdir=$(get_libdir) [[ -n $libdir ]] || die "get_libdir returned an empty string" @@ -159,6 +167,9 @@ src_install() { 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() { |