public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-0.6.37.ebuild ChangeLog
@ 2010-02-05 22:43 Zac Medico (zmedico)
  0 siblings, 0 replies; 4+ messages in thread
From: Zac Medico (zmedico) @ 2010-02-05 22:43 UTC (permalink / raw
  To: gentoo-commits

zmedico     10/02/05 22:43:13

  Modified:             ChangeLog
  Added:                calibre-0.6.37.ebuild
  Log:
  0.6.37 version bump.
  (Portage version: 2.2_rc62_p15322/cvs/Linux i686)

Revision  Changes    Path
1.72                 app-text/calibre/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?r1=1.71&r2=1.72

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog	30 Jan 2010 11:09:44 -0000	1.71
+++ ChangeLog	5 Feb 2010 22:43:13 -0000	1.72
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.71 2010/01/30 11:09:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.72 2010/02/05 22:43:13 zmedico Exp $
+
+*calibre-0.6.37 (05 Feb 2010)
+
+  05 Feb 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.6.37.ebuild:
+  0.6.37 version bump.
 
   30 Jan 2010; Zac Medico <zmedico@gentoo.org> -calibre-0.6.24.ebuild,
   -calibre-0.6.26.ebuild, -calibre-0.6.28.ebuild, -calibre-0.6.29.ebuild,



1.1                  app-text/calibre/calibre-0.6.37.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?rev=1.1&content-type=text/plain

Index: calibre-0.6.37.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v 1.1 2010/02/05 22:43:13 zmedico Exp $

EAPI=2
NEED_PYTHON=2.6
PYTHON_DEPEND=2

inherit python distutils eutils fdo-mime bash-completion

DESCRIPTION="Ebook management application."
HOMEPAGE="http://calibre-ebook.com/"
SRC_URI="http://calibre-ebook.com/downloads/$P.tar.gz"

LICENSE="GPL-2"

KEYWORDS="~amd64 ~x86"

SLOT="0"

IUSE=""

# libusb-compat is untested
SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
	>=dev-python/setuptools-0.6_rc5
	>=dev-python/imaging-1.1.6
	>=dev-libs/libusb-0.1.12:0
	>=dev-python/PyQt4-4.5[X,svg,webkit]
	>=dev-python/mechanize-0.1.11
	>=media-gfx/imagemagick-6.3.5
	>=x11-misc/xdg-utils-1.0.2
	>=dev-python/dbus-python-0.82.2
	>=dev-python/lxml-2.1.5
	>=dev-python/python-dateutil-1.4.1
	>=dev-python/beautifulsoup-3.0.5
	>=dev-python/dnspython-1.6.0
	>=virtual/poppler-0.12.0
	>=sys-apps/help2man-1.36.4
	app-text/podofo"

RDEPEND="$SHARED_DEPEND
	>=dev-python/reportlab-2.1"

DEPEND="$SHARED_DEPEND
	dev-python/setuptools
	>=gnome-base/librsvg-2.0.0
	>=x11-misc/xdg-utils-1.0.2-r2
	sys-apps/help2man"

S=$WORKDIR/$PN

pkg_setup() {
	python_set_active_version 2
}

src_prepare() {
	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
	# calls xdg-* (bug #258938).
	sed -e "s:'xdg-desktop-menu', 'install':'xdg-desktop-menu', 'install', '--mode', 'user':" \
		-e "s:xdg-icon-resource install:xdg-icon-resource install --mode user:" \
		-e "s:xdg-mime install:xdg-mime install --mode user:" \
		-e "s:old_udev = '/etc:old_udev = '${D}etc:" \
		-i src/calibre/linux.py || die "sed'ing in the IMAGE path failed"

	# 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'ing in the IMAGE path failed"

	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}

	# --bindir and --sharedir don't seem to work.
	# Pass them in anyway so we'll know when they are fixed.
	# 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 #295672 - Aavoid sandbox violation in ~/.config by forcing
	# variables to point to our fake temporary $HOME.
	export XDG_CONFIG_HOME="$HOME/.config"
	export CALIBRE_CONFIG_DIRECTORY="$XDG_CONFIG_HOME/calibre"
	mkdir -p "$XDG_CONFIG_HOME" "$CALIBRE_CONFIG_DIRECTORY"

	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
		distutils_src_install --bindir="${D}usr/bin" --sharedir="${D}usr/share"

	grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i ||
		die "failed to fix harcoded \$D in paths"

	# Python modules are no longer installed in
	# site-packages, so remove empty dirs.
	find "${D}$(python_get_libdir)" -type d -empty -delete

	# This code may fail if behavior of --root, --bindir or
	# --sharedir changes in the future.
	dodir /usr/lib
	mv "${D}lib/calibre" "${D}usr/lib/" ||
		die "failed to move lib dir"
	find "${D}"lib -type d -empty -delete

	dodir /usr/bin
	mv "${D}bin/"* "${D}usr/bin/" ||
		die "failed to move bin dir"
	find "${D}"bin -type d -empty -delete

	dodir /usr/share
	mv "${D}share/"* "${D}usr/share/" ||
		die "failed to move share dir"
	find "${D}"share -type d -empty -delete

	# 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/* "$D"usr/share/mime/packages/ ||
		die "failed to register mime types"
	dodir /usr/share/icons
	mv "$HOME"/.local/share/icons/* "$D"usr/share/icons/ ||
		die "failed to install icon files"
	domenu "$HOME"/.local/share/applications/*.desktop ||
		die "failed to install .desktop menu files"

	dobashcompletion "$D"etc/bash_completion.d/calibre
	rm -r "${D}"etc/bash_completion.d
	find "${D}"etc -type d -empty -delete

	python_convert_shebangs -r 2 "$D"
}

pkg_postinst() {
	fdo-mime_desktop_database_update
	fdo-mime_mime_database_update
	distutils_pkg_postinst
	bash-completion_pkg_postinst
}






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-0.6.37.ebuild ChangeLog
@ 2010-02-05 23:16 Zac Medico (zmedico)
  0 siblings, 0 replies; 4+ messages in thread
From: Zac Medico (zmedico) @ 2010-02-05 23:16 UTC (permalink / raw
  To: gentoo-commits

zmedico     10/02/05 23:16:49

  Modified:             calibre-0.6.37.ebuild ChangeLog
  Log:
  Don't set NEED_PYTHON and PYTHON_DEPEND at the same time.
  (Portage version: 2.2_rc62_p15322/cvs/Linux i686)

Revision  Changes    Path
1.2                  app-text/calibre/calibre-0.6.37.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?r1=1.1&r2=1.2

Index: calibre-0.6.37.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calibre-0.6.37.ebuild	5 Feb 2010 22:43:13 -0000	1.1
+++ calibre-0.6.37.ebuild	5 Feb 2010 23:16:49 -0000	1.2
@@ -1,9 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v 1.1 2010/02/05 22:43:13 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v 1.2 2010/02/05 23:16:49 zmedico Exp $
 
 EAPI=2
-NEED_PYTHON=2.6
 PYTHON_DEPEND=2
 
 inherit python distutils eutils fdo-mime bash-completion



1.73                 app-text/calibre/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?r1=1.72&r2=1.73

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog	5 Feb 2010 22:43:13 -0000	1.72
+++ ChangeLog	5 Feb 2010 23:16:49 -0000	1.73
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.72 2010/02/05 22:43:13 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.73 2010/02/05 23:16:49 zmedico Exp $
+
+  05 Feb 2010; Zac Medico <zmedico@gentoo.org> calibre-0.6.37.ebuild:
+  Don't set NEED_PYTHON and PYTHON_DEPEND at the same time.
 
 *calibre-0.6.37 (05 Feb 2010)
 






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-0.6.37.ebuild ChangeLog
@ 2010-02-06 18:37 Zac Medico (zmedico)
  0 siblings, 0 replies; 4+ messages in thread
From: Zac Medico (zmedico) @ 2010-02-06 18:37 UTC (permalink / raw
  To: gentoo-commits

zmedico     10/02/06 18:37:50

  Modified:             calibre-0.6.37.ebuild ChangeLog
  Log:
  Set PYTHON_DEPEND=2:2.6, as suggested by Arfrever.
  (Portage version: 2.2_rc62_p15322/cvs/Linux i686)

Revision  Changes    Path
1.3                  app-text/calibre/calibre-0.6.37.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?r1=1.2&r2=1.3

Index: calibre-0.6.37.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- calibre-0.6.37.ebuild	5 Feb 2010 23:16:49 -0000	1.2
+++ calibre-0.6.37.ebuild	6 Feb 2010 18:37:49 -0000	1.3
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v 1.2 2010/02/05 23:16:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v 1.3 2010/02/06 18:37:49 zmedico Exp $
 
 EAPI=2
-PYTHON_DEPEND=2
+PYTHON_DEPEND=2:2.6
 
 inherit python distutils eutils fdo-mime bash-completion
 



1.74                 app-text/calibre/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?r1=1.73&r2=1.74

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog	5 Feb 2010 23:16:49 -0000	1.73
+++ ChangeLog	6 Feb 2010 18:37:49 -0000	1.74
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.73 2010/02/05 23:16:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.74 2010/02/06 18:37:49 zmedico Exp $
+
+  06 Feb 2010; Zac Medico <zmedico@gentoo.org> calibre-0.6.37.ebuild:
+  Set PYTHON_DEPEND=2:2.6, as suggested by Arfrever.
 
   05 Feb 2010; Zac Medico <zmedico@gentoo.org> calibre-0.6.37.ebuild:
   Don't set NEED_PYTHON and PYTHON_DEPEND at the same time.






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-0.6.37.ebuild ChangeLog
@ 2010-02-06 18:56 Zac Medico (zmedico)
  0 siblings, 0 replies; 4+ messages in thread
From: Zac Medico (zmedico) @ 2010-02-06 18:56 UTC (permalink / raw
  To: gentoo-commits

zmedico     10/02/06 18:56:51

  Modified:             calibre-0.6.37.ebuild ChangeLog
  Log:
  Set PYTHON_USE_WITH=sqlite to generate the python[sqlite] dep.
  (Portage version: 2.2_rc62_p15322/cvs/Linux i686)

Revision  Changes    Path
1.4                  app-text/calibre/calibre-0.6.37.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild?r1=1.3&r2=1.4

Index: calibre-0.6.37.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- calibre-0.6.37.ebuild	6 Feb 2010 18:37:49 -0000	1.3
+++ calibre-0.6.37.ebuild	6 Feb 2010 18:56:51 -0000	1.4
@@ -1,9 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v 1.3 2010/02/06 18:37:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v 1.4 2010/02/06 18:56:51 zmedico Exp $
 
 EAPI=2
 PYTHON_DEPEND=2:2.6
+PYTHON_USE_WITH=sqlite
 
 inherit python distutils eutils fdo-mime bash-completion
 
@@ -20,8 +21,7 @@
 IUSE=""
 
 # libusb-compat is untested
-SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
-	>=dev-python/setuptools-0.6_rc5
+SHARED_DEPEND=">=dev-python/setuptools-0.6_rc5
 	>=dev-python/imaging-1.1.6
 	>=dev-libs/libusb-0.1.12:0
 	>=dev-python/PyQt4-4.5[X,svg,webkit]



1.75                 app-text/calibre/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?r1=1.74&r2=1.75

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog	6 Feb 2010 18:37:49 -0000	1.74
+++ ChangeLog	6 Feb 2010 18:56:51 -0000	1.75
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.74 2010/02/06 18:37:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.75 2010/02/06 18:56:51 zmedico Exp $
+
+  06 Feb 2010; Zac Medico <zmedico@gentoo.org> calibre-0.6.37.ebuild:
+  Set PYTHON_USE_WITH=sqlite to generate the python[sqlite] dep.
 
   06 Feb 2010; Zac Medico <zmedico@gentoo.org> calibre-0.6.37.ebuild:
   Set PYTHON_DEPEND=2:2.6, as suggested by Arfrever.






^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-02-06 18:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-06 18:56 [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-0.6.37.ebuild ChangeLog Zac Medico (zmedico)
  -- strict thread matches above, loose matches on Subject: below --
2010-02-06 18:37 Zac Medico (zmedico)
2010-02-05 23:16 Zac Medico (zmedico)
2010-02-05 22:43 Zac Medico (zmedico)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox