[gentoo-commits] gentoo-x86 commit in dev-python/PyQt4: metadata.xml ChangeLog PyQt4-4.4.4-r5.ebuild

[Markos Chandras (hwoarang)]

hwoarang    09/06/01 16:30:49

  Modified:             metadata.xml ChangeLog
  Added:                PyQt4-4.4.4-r5.ebuild
  Log:
  Fixed automagic dependency issue. ( bug 236341 ). Fixed rpath issues ( bug 235819 , bug 271870 )
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  dev-python/PyQt4/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/metadata.xml?r1=1.3&r2=1.4

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml	23 Nov 2008 13:03:07 -0000	1.3
+++ metadata.xml	1 Jun 2009 16:30:48 -0000	1.4
@@ -4,7 +4,14 @@
 <herd>python</herd>
 <herd>qt</herd>
 <use>
-	<flag name='qt3support'>enable the Qt3Support libraries for Qt4</flag>
-	<flag name='webkit'>enable WebKit support</flag>
+	<flag name='X'>Build the QtGui and QtDesigner modules</flag>
+	<flag name='assistant'>Build the QtHelp and QtAssistant modules</flag>
+	<flag name='opengl'>Build the QtOpenGL module</flag>
+	<flag name='phonon'>Build the phonon module</flag>
+	<flag name='qt3support'>Enable the Qt3Support libraries for Qt4</flag>
+	<flag name='sql'>Build the QtSql module</flag>
+	<flag name='svg'>Build the QtSvg module</flag>
+	<flag name='webkit'>Build the QtWebKit module</flag>
+	<flag name='xmlpatterns'>Build the QtXmlPatterns module</flag>
 </use>
 </pkgmetadata>



1.57                 dev-python/PyQt4/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.56&r2=1.57

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog	20 May 2009 23:01:26 -0000	1.56
+++ ChangeLog	1 Jun 2009 16:30:48 -0000	1.57
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.56 2009/05/20 23:01:26 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.57 2009/06/01 16:30:48 hwoarang Exp $
+
+*PyQt4-4.4.4-r5 (01 Jun 2009)
+
+  01 Jun 2009; Markos Chandras <hwoarang@g.o> +PyQt4-4.4.4-r5.ebuild,
+  files/configure.py.patch, metadata.xml:
+  Fixed automagic dependency issue. ( bug 236341 ). Fixed rpath issues ( bug
+  235819 , bug 271870 ). Thanks to Davide Pesavento <davidepesa@×××××.com>
+  for
+  the ebuilds and the rpath patch.
 
   20 May 2009; Ben de Groot <yngwin@g.o> -PyQt4-4.4-r1.ebuild,
   -PyQt4-4.4.4-r1.ebuild, -PyQt4-4.4.4-r3.ebuild, PyQt4-4.4.4-r4.ebuild:



1.1                  dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild?rev=1.1&content-type=text/plain

Index: PyQt4-4.4.4-r5.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild,v 1.1 2009/06/01 16:30:48 hwoarang Exp $

EAPI="2"

inherit distutils qt4

MY_P=PyQt-x11-gpl-${PV}
QTVER="4.4.2"

DESCRIPTION="A set of Python bindings for the Qt toolkit"
HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/"
SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"

SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="X assistant +dbus debug doc examples opengl phonon +qt3support sql svg webkit xmlpatterns"

DEPEND=">=dev-python/sip-4.7.8
	>=x11-libs/qt-core-${QTVER}:4[qt3support?]
	>=x11-libs/qt-script-${QTVER}:4
	>=x11-libs/qt-test-${QTVER}:4
	X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?,qt3support?] )
	assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 )
	dbus? (
		>=dev-python/dbus-python-0.80
		>=x11-libs/qt-dbus-${QTVER}:4
	)
	opengl? ( >=x11-libs/qt-opengl-${QTVER}:4[qt3support?] )
	phonon? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
	qt3support? ( >=x11-libs/qt-qt3support-${QTVER}:4 )
	sql? ( >=x11-libs/qt-sql-${QTVER}:4 )
	svg? ( >=x11-libs/qt-svg-${QTVER}:4 )
	webkit? ( >=x11-libs/qt-webkit-${QTVER}:4 )
	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:4 )"
RDEPEND="${DEPEND}"

S="${WORKDIR}/${MY_P}"

PATCHES=(
	"${FILESDIR}/configure.py.patch"
	"${FILESDIR}/${P}-qgraphicsproxywidget-avoid-event-callback-loop.patch"
	"${FILESDIR}/fix_license_check.patch"
)

pyqt4_use_enable() {
	use $1 && echo "--enable=${2:-$1}"
}

src_prepare() {
	if ! use dbus; then
		sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \
			"${S}"/configure.py || die
	fi
	qt4_src_prepare
}

src_configure() {
	distutils_python_version

	local myconf="${python} configure.py
			--confirm-license
			--bindir=/usr/bin
			--destdir=/usr/$(get_libdir)/python${PYVER}/site-packages
			--sipdir=/usr/share/sip
			$(use debug && echo '--debug')
			--enable=QtCore
			--enable=QtNetwork
			--enable=QtScript
			--enable=QtTest
			--enable=QtXml
			$(pyqt4_use_enable X QtGui)
			$(pyqt4_use_enable X QtDesigner)
			$(pyqt4_use_enable assistant QtAssistant)
			$(pyqt4_use_enable assistant QtHelp)
			$(pyqt4_use_enable opengl QtOpenGL)
			$(pyqt4_use_enable phonon)
			$(pyqt4_use_enable sql QtSql)
			$(pyqt4_use_enable svg QtSvg)
			$(pyqt4_use_enable webkit QtWebKit)
			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)"
	echo ${myconf}
	${myconf} || die "configuration failed"

	# Fix insecure runpath
	sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}/qpy/QtDesigner::" \
		"${S}"/QtDesigner/Makefile || die
}

src_install() {
	# INSTALL_ROOT is needed for the QtDesigner module,
	# the other Makefiles use DESTDIR.
	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install || die "installation failed"

	dodoc ChangeLog NEWS THANKS || die

	if use doc; then
		dohtml -r doc/html/* || die
	fi

	if use examples; then
		insinto /usr/share/doc/${PF}
		doins -r examples || die
	fi
}