public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-text/calibre: ChangeLog calibre-0.6_beta10.ebuild
@ 2009-07-22  7:55 Zac Medico (zmedico)
  0 siblings, 0 replies; 2+ messages in thread
From: Zac Medico (zmedico) @ 2009-07-22  7:55 UTC (permalink / raw
  To: gentoo-commits

zmedico     09/07/22 07:55:17

  Modified:             ChangeLog calibre-0.6_beta10.ebuild
  Log:
  Bug #276858 - Bump dependency from PyQt4-4.4.2 to PyQt4-4.5.
  (Portage version: 2.2_rc33_p13845/cvs/Linux i686)

Revision  Changes    Path
1.37                 app-text/calibre/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog	5 Jul 2009 08:17:08 -0000	1.36
+++ ChangeLog	22 Jul 2009 07:55:17 -0000	1.37
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.36 2009/07/05 08:17:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.37 2009/07/22 07:55:17 zmedico Exp $
+
+  22 Jul 2009; Zac Medico <zmedico@gentoo.org> calibre-0.6_beta10.ebuild:
+  Bug #276858 - Bump dependency from PyQt4-4.4.2 to PyQt4-4.5.
 
   05 Jul 2009; Zac Medico <zmedico@gentoo.org> -calibre-0.6_beta6.ebuild,
   -calibre-0.6_beta8.ebuild, calibre-0.6_beta10.ebuild:



1.3                  app-text/calibre/calibre-0.6_beta10.ebuild

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

Index: calibre-0.6_beta10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6_beta10.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- calibre-0.6_beta10.ebuild	5 Jul 2009 08:17:08 -0000	1.2
+++ calibre-0.6_beta10.ebuild	22 Jul 2009 07:55:17 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6_beta10.ebuild,v 1.2 2009/07/05 08:17:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6_beta10.ebuild,v 1.3 2009/07/22 07:55:17 zmedico Exp $
 
 EAPI=2
 NEED_PYTHON=2.6
@@ -26,7 +26,7 @@
 	>=dev-python/setuptools-0.6_rc5
 	>=dev-python/imaging-1.1.6
 	dev-libs/libusb:0
-	>=dev-python/PyQt4-4.4.2[X,svg,webkit]
+	>=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






^ permalink raw reply	[flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/calibre: ChangeLog calibre-0.6_beta10.ebuild
@ 2009-06-28 19:46 Zac Medico (zmedico)
  0 siblings, 0 replies; 2+ messages in thread
From: Zac Medico (zmedico) @ 2009-06-28 19:46 UTC (permalink / raw
  To: gentoo-commits

zmedico     09/06/28 19:46:15

  Modified:             ChangeLog
  Added:                calibre-0.6_beta10.ebuild
  Log:
  0.6_beta10 bump.
  (Portage version: 13694-svn/cvs/Linux i686)

Revision  Changes    Path
1.35                 app-text/calibre/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	23 Jun 2009 22:23:49 -0000	1.34
+++ ChangeLog	28 Jun 2009 19:46:15 -0000	1.35
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.34 2009/06/23 22:23:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.35 2009/06/28 19:46:15 zmedico Exp $
+
+*calibre-0.6_beta10 (28 Jun 2009)
+
+  28 Jun 2009; Zac Medico <zmedico@gentoo.org> +calibre-0.6_beta10.ebuild:
+  0.6_beta10 bump.
 
 *calibre-0.6_beta8 (23 Jun 2009)
 



1.1                  app-text/calibre/calibre-0.6_beta10.ebuild

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

Index: calibre-0.6_beta10.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6_beta10.ebuild,v 1.1 2009/06/28 19:46:15 zmedico Exp $

EAPI=2
NEED_PYTHON=2.6

inherit python distutils eutils fdo-mime bash-completion

DESCRIPTION="Ebook management application."
HOMEPAGE="http://calibre.kovidgoyal.net"
# Snapshots for beta releases are not distributed on upstream mirrors.
SRC_URI="mirror://gentoo/$P.tar.gz"
#SRC_URI="http://calibre.kovidgoyal.net/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
	>=dev-python/PyQt4-4.4.2[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
	>=sys-apps/help2man-1.36.4
	>=dev-python/pyPdf-1.12
	>=app-text/pdftk-1.12
	>=dev-python/cherrypy-3.0.2-r1
	>=dev-python/cssutils-0.9.5.1
	>=dev-python/odfpy-0.7"

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

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

src_prepare() {
	# Removing the post_install call. We'll do that stuff in src_install.
	sed -i -e "/if 'install'/,/subprocess.check_call/d" \
		setup.py || die "couldn't remove post_install call"
	# For help2man to succeed, we need to tell it the path to the tools.
	sed -i -e "s:\('help2man',\) \(prog\):\1 \'PYTHONPATH=\"${D}$(python_get_sitedir)\" \' + \'${D}usr/bin/\' + \2:" \
		src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
	# calls xdg-desktop-menu (bug #258938). This also prevents
	# "${D}"/usr/share/applications/{mimeinfo.cache,defaults.list}
	# from being installed (we don't want them anyway).
	sed -i -e "s:xdg-desktop-menu install:xdg-desktop-menu install --mode user:" \
		src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
	distutils_src_prepare
}

src_install() {
	pushd "${S}"/build
	ln -s lib\.* lib
	popd
	distutils_src_install

	# Create directory before running the postinst script
	# otherwise it will bail out.
	dodir /usr/share/icons/hicolor
	dodir /etc/xdg/menus
	dodir /usr/share/applications
	dodir /usr/share/desktop-directories
	dodir /usr/share/applnk
	dodir /usr/share/mime/packages

	# Bypass the default kde-config output, and force it to
	# tell xdg-mime to use a different path.
	cat - > "${T}/kde-config" <<EOF
#!/bin/bash

case \$1:\$2 in
	--version:) echo -e "Qt: 3.3.8\nKDE: 3.5.8\nkde-config: 1.0" ;;
	--path:mime) echo "${D}/usr/share/mimelnk/" ;;
esac
EOF

	chmod +x "${T}/kde-config"

	PATH="${T}:${PATH}" KDEDIRS="${D}/usr" XDG_DATA_DIRS="${D}/usr/share" DESTDIR="${D}" PYTHONPATH="${S}/build/lib" \
		python "${S}"/src/${PN}/linux.py \
		--use-destdir --do-not-reload-udev-hal \
		--group-file="${ROOT}"/etc/group --dont-check-root \
		|| die "post-installation failed."

	# The menu entries end up here due to '--mode user' being added to
	# xdg-desktop-menu options in src_prepare.
	domenu "$HOME"/.local/share/applications/*.desktop || \
		die "failed to install .desktop menu files"

	# Move the bash-completion file and properly install it.
	mv "${D}"/etc/bash_completion.d/calibre "${S}/" \
		|| die "cannot move the bash-completion file"
	dobashcompletion "${S}"/calibre
	find "${D}"/etc -type d -empty -delete

	# Removing junk.
	# Bundled python modules:     Module       | Package
	#                             ----------------------------
	#                             encutils     | cssutils
	#                             odf          | odfpy
	rm -r "${D}"/usr/share/mime/{subclasses,XMLnamespaces,globs{,2},mime.cache,magic,aliases,types,treemagic,{generic-,}icons} \
		"${D}"/usr/share/{applnk,desktop-directories} \
		"${D}$(python_get_sitedir)"/{cherrypy,cssutils,encutils,odf,pyPdf}
}

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






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

end of thread, other threads:[~2009-07-22  7:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-22  7:55 [gentoo-commits] gentoo-x86 commit in app-text/calibre: ChangeLog calibre-0.6_beta10.ebuild Zac Medico (zmedico)
  -- strict thread matches above, loose matches on Subject: below --
2009-06-28 19:46 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