summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2012-03-03 11:48:59 +0000
committerDavide Pesavento <pesa@gentoo.org>2012-03-03 11:48:59 +0000
commitb4737c007564eb74c96db20bc86e7bfb37fc0d02 (patch)
treed44c7121fb9fa8bc6e188ec7b56e7195bdb3f23f /dev-python/PyQt4
parentMarked ~x64-macos (diff)
downloadhistorical-b4737c007564eb74c96db20bc86e7bfb37fc0d02.tar.gz
historical-b4737c007564eb74c96db20bc86e7bfb37fc0d02.tar.bz2
historical-b4737c007564eb74c96db20bc86e7bfb37fc0d02.zip
Switch to EAPI 4, add REQUIRED_USE.
Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64
Diffstat (limited to 'dev-python/PyQt4')
-rw-r--r--dev-python/PyQt4/ChangeLog5
-rw-r--r--dev-python/PyQt4/Manifest30
-rw-r--r--dev-python/PyQt4/PyQt4-4.9.1.ebuild38
3 files changed, 42 insertions, 31 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 94b9f819072f..85c5b767bb48 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/PyQt4
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.171 2012/03/02 18:34:25 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.172 2012/03/03 11:48:59 pesa Exp $
+
+ 03 Mar 2012; Davide Pesavento <pesa@gentoo.org> PyQt4-4.9.1.ebuild:
+ Switch to EAPI 4, add REQUIRED_USE.
02 Mar 2012; Davide Pesavento <pesa@gentoo.org> PyQt4-4.8.1.ebuild,
PyQt4-4.8.4.ebuild:
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index a125e1383b4d..88e25e559304 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -9,23 +9,23 @@ DIST PyQt-x11-gpl-4.8.4.tar.gz 9799081 RMD160 100d16e9005e3b83f0030e498a16d99636
DIST PyQt-x11-gpl-4.9.1.tar.gz 9742132 RMD160 056d6570ffc5ad873ef36d8181122cbb79d7b5ef SHA1 6aa0e64cdcca0f23946c5e6c244b19189c234306 SHA256 f283557f2190ffc00d72fe8451ac15536cab777c36a9b573031328f401629bb1
EBUILD PyQt4-4.8.1.ebuild 4793 RMD160 e35f951f8f5bb48548fd6a33a987ed10af1c723e SHA1 d6ae6c51968fb82a85e38f8482eb12048d792832 SHA256 fac6ce2aaab4a929c5916b70d887a2026754c0f328b16d3a0c6398ef799b7d56
EBUILD PyQt4-4.8.4.ebuild 4973 RMD160 d5735aa2c4e9a15217760b85a0f577bd81b81d51 SHA1 6cba4fea0f56f822ccb78284c4d6a12750563faa SHA256 2cd1435f5365485e20eceb773fe319273467ea854cc8f66d1f2969fd952ad719
-EBUILD PyQt4-4.9.1.ebuild 5701 RMD160 3b42c4ea9782c57dce078bebdde58e0cd3f7a79e SHA1 ab5a03a990964e6891353ac1bfa7851f3ccc1fcc SHA256 080a514c86ccc765bf706ab7db14ec9a31f63a28fc34d8ca70473f5a0b0de7f2
-MISC ChangeLog 24162 RMD160 5c0306ca8b4fa3d5d793f8813b77147fc69544bf SHA1 b0e9b2b02567534c66505b4734497914ac0bc102 SHA256 cbe8c079b39b7468dca8cb98100bf927449938466936750558cda32e47980687
+EBUILD PyQt4-4.9.1.ebuild 5676 RMD160 fea9ab471046e18406062b8fdd4ac37d4273708c SHA1 b484d0f831b3b94e86a4ae7295d9c0570ec4e6da SHA256 88a2bd80997292bf6e1bc80a748c81f1e765783f98465c3b1902289830b0e2a3
+MISC ChangeLog 24271 RMD160 37c604067253b00dcce25ff1855bd80cac704fef SHA1 6a5cdb0ed7b691d4dce3c0cb0e3d7aec5837df4c SHA256 e1924b1cfde6cc6f55fbd71814bd4835e5896fa448c5b74abf1183d352a40a60
MISC metadata.xml 1101 RMD160 063bcdaa197bc36e68607dc1763db7632e9bf2a7 SHA1 0e0af73c38ef13195a610013895660d5b644156f SHA256 7cea702a27791d9fd0f1d8f4f220dfbbab50faad817f807df7a15bf7b3f8f470
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCgAGBQJPURK5AAoJENXLsxwXqFxyHXYP/R03ErXlep+VyBbRKJKbBCfn
-pU7x1p3qZNttHDYkm7zqHWuM9HKemGdVZbnIJnrHWQMKL7nxI1EaTddjROi6Z4Sf
-Rhd8W5HMJMj3FJ9TEpUS7emTqO+9SChqFVjbz0KwCAEI+ia85MdryxdIrvUTu8GY
-tJ/LOfdHLcdVEvUUYv8foHR6d1+uEtgIUq4AFVjDFg9zg8dBXpjPy5s+Tk7HiOvY
-tND316WqudaXm3NBsK0zJF71Gh9L8tpctz9uwTVauPhq0v5279mKzn9gHEqEw5U8
-gKvNOcfoNNLtTKwImTwLI+37O03PgQGmBv9X5KDEQqUC8OQygFkOBYhCc4nmBcsj
-W926718/VcmZa0BQNYgY381x3DUYrZfN072GbN7RT08/A3WayTZiAHJP3CEuMxE8
-3dYMCohUxVIVCmk2FVHPSrmLScGl/z9/awiKze4sXeiIT6YRvW/Qiw8uVU30bVa7
-uiJkjHWMxaW/owVFCrdS4t2/2teVBfRFvmVGS/JtBvGWYV4OQ6aJTcie7gOOBr4M
-uIyCyiboL0nAbiUyQRjxtTn7rgIjcvQMiojC+P+xpCIcZdEyf8PZ+rS/0dK0XqHC
-8CSoD1AjNP6T1iGTdlRxY4OO85iMis72z57UAzKHq9S4Djeux7mUi8TIofvvAkvt
-FVghlYkCtLpABIoPAynG
-=Wo1Z
+iQIcBAEBCgAGBQJPUgU8AAoJENXLsxwXqFxyD14P/A2PQxp8mwRtObIqOL6T1r1H
+leQ1nmipQ+50gsRt6IqnWpikmJjDiMXfc/NG7goXIUsAUXyS5goQXG80hivM6bMq
+v4pWlz2RktT0wye8QOMc+yEMvTMmf4TdaIiO3/uR5Q457hU2gEJ1BasVWPOBPN9B
+u4MzaYw1hXjx6bC5wTQnCpbtN/ahFjYhgR/OEoMMD9o4/PpwtUIh+zKgCFqz7Vjd
+fAJfB8eoNzFupn0GJmsfB58Mwtxc7NGWqdH2Q3h5gPRGKgBlzmGb0SLP0jUepMRb
+g5GCyitrbdt7YO9/MJJJdcu0cVeziRyPZPAiQ2dJUjw22kZHlegT1aWOvaPYzD/z
+M2BnP3iTUoOZZPnSM3sK6SMmbDyCjJWb9VLPddzOmICOimGZY9yZScbGwNhSfBYZ
+eHQDDCaCNqP0wHFC5vFh5lk+a6OIZ3bkeKkvFT/cA5DI/xh3LZ/8/ifM0IZH+EpC
+OBv5IJyZwyhHEcc8O8xwSEnddWtg3L+Hk11J96buAT2ZiasJYnEWRD4MFZIzHPCQ
+DbXJeR+fZGKau5CUh4YjYjHYuXpVSDQglG4mxwauiYAIWoxDpZt8NnV5hWh77Qgb
+eMHOsRsnVnyPYsRIdhIFXQz+A0fplt5WaUO5qeihDNzjR3OT/mVy5hJIY+zzMUW8
+SaYqE5fHVe2PiOqqz5X5
+=lICn
-----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.9.1.ebuild b/dev-python/PyQt4/PyQt4-4.9.1.ebuild
index 26de845435f1..82e27dfd08cf 100644
--- a/dev-python/PyQt4/PyQt4-4.9.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.1.ebuild
@@ -1,14 +1,15 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.4 2012/03/02 18:23:33 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.5 2012/03/03 11:48:59 pesa Exp $
+
+EAPI=4
-EAPI="3"
PYTHON_DEPEND="*"
PYTHON_EXPORT_PHASE_FUNCTIONS="1"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-inherit python qt4-r2 toolchain-funcs
+inherit toolchain-funcs qt4-r2 python
# Minimal supported version of Qt.
QT_VER="4.7.2"
@@ -27,7 +28,18 @@ fi
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
+IUSE="X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
+
+REQUIRED_USE="
+ assistant? ( X )
+ declarative? ( X )
+ multimedia? ( X )
+ opengl? ( X )
+ phonon? ( X )
+ sql? ( X )
+ svg? ( X )
+ webkit? ( X )
+"
RDEPEND="
>=dev-python/sip-4.13.1
@@ -71,7 +83,7 @@ PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
src_prepare() {
if ! use dbus; then
- sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
+ sed -e 's/^\([[:blank:]]\+\)check_dbus()/\1pass/' -i configure.py || die
fi
# Support qreal for arm architecture (bug #322349).
@@ -80,12 +92,12 @@ src_prepare() {
qt4-r2_src_prepare
# Use proper include directory.
- sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed"
+ sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die
python_copy_sources
preparation() {
- if [[ "$(python_get_version -l --major)" == "3" ]]; then
+ if [[ $(python_get_version -l --major) == 3 ]]; then
rm -fr pyuic/uic/port_v2
else
rm -fr pyuic/uic/port_v3
@@ -136,7 +148,7 @@ src_configure() {
CXXFLAGS="${CXXFLAGS}"
LFLAGS="${LDFLAGS}")
echo "${myconf[@]}"
- "${myconf[@]}" || return 1
+ "${myconf[@]}" || die
local mod
for mod in QtCore \
@@ -165,10 +177,6 @@ src_configure() {
python_execute_function -s configuration
}
-src_compile() {
- python_src_compile
-}
-
src_install() {
installation() {
# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
@@ -177,15 +185,15 @@ src_install() {
python_execute_function -s installation
python_merge_intermediate_installation_images "${T}/images"
- dodoc NEWS THANKS || die "dodoc failed"
+ dodoc NEWS THANKS
if use doc; then
- dohtml -r doc/html/* || die "dohtml failed"
+ dohtml -r doc/html/*
fi
if use examples; then
insinto /usr/share/doc/${PF}
- doins -r examples || die "doins failed"
+ doins -r examples
fi
}