| 1 |
pesa 12/03/03 11:48:59 |
| 2 |
|
| 3 |
Modified: PyQt4-4.9.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Switch to EAPI 4, add REQUIRED_USE. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 dev-python/PyQt4/PyQt4-4.9.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: PyQt4-4.9.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- PyQt4-4.9.1.ebuild 2 Mar 2012 18:23:33 -0000 1.4 |
| 23 |
+++ PyQt4-4.9.1.ebuild 3 Mar 2012 11:48:59 -0000 1.5 |
| 24 |
@@ -1,14 +1,15 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.4 2012/03/02 18:23:33 pesa Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.5 2012/03/03 11:48:59 pesa Exp $ |
| 29 |
+ |
| 30 |
+EAPI=4 |
| 31 |
|
| 32 |
-EAPI="3" |
| 33 |
PYTHON_DEPEND="*" |
| 34 |
PYTHON_EXPORT_PHASE_FUNCTIONS="1" |
| 35 |
SUPPORT_PYTHON_ABIS="1" |
| 36 |
RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*" |
| 37 |
|
| 38 |
-inherit python qt4-r2 toolchain-funcs |
| 39 |
+inherit toolchain-funcs qt4-r2 python |
| 40 |
|
| 41 |
# Minimal supported version of Qt. |
| 42 |
QT_VER="4.7.2" |
| 43 |
@@ -27,7 +28,18 @@ |
| 44 |
LICENSE="|| ( GPL-2 GPL-3 )" |
| 45 |
SLOT="0" |
| 46 |
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
| 47 |
-IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" |
| 48 |
+IUSE="X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" |
| 49 |
+ |
| 50 |
+REQUIRED_USE=" |
| 51 |
+ assistant? ( X ) |
| 52 |
+ declarative? ( X ) |
| 53 |
+ multimedia? ( X ) |
| 54 |
+ opengl? ( X ) |
| 55 |
+ phonon? ( X ) |
| 56 |
+ sql? ( X ) |
| 57 |
+ svg? ( X ) |
| 58 |
+ webkit? ( X ) |
| 59 |
+" |
| 60 |
|
| 61 |
RDEPEND=" |
| 62 |
>=dev-python/sip-4.13.1 |
| 63 |
@@ -71,7 +83,7 @@ |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
if ! use dbus; then |
| 67 |
- sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed" |
| 68 |
+ sed -e 's/^\([[:blank:]]\+\)check_dbus()/\1pass/' -i configure.py || die |
| 69 |
fi |
| 70 |
|
| 71 |
# Support qreal for arm architecture (bug #322349). |
| 72 |
@@ -80,12 +92,12 @@ |
| 73 |
qt4-r2_src_prepare |
| 74 |
|
| 75 |
# Use proper include directory. |
| 76 |
- sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed" |
| 77 |
+ sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die |
| 78 |
|
| 79 |
python_copy_sources |
| 80 |
|
| 81 |
preparation() { |
| 82 |
- if [[ "$(python_get_version -l --major)" == "3" ]]; then |
| 83 |
+ if [[ $(python_get_version -l --major) == 3 ]]; then |
| 84 |
rm -fr pyuic/uic/port_v2 |
| 85 |
else |
| 86 |
rm -fr pyuic/uic/port_v3 |
| 87 |
@@ -136,7 +148,7 @@ |
| 88 |
CXXFLAGS="${CXXFLAGS}" |
| 89 |
LFLAGS="${LDFLAGS}") |
| 90 |
echo "${myconf[@]}" |
| 91 |
- "${myconf[@]}" || return 1 |
| 92 |
+ "${myconf[@]}" || die |
| 93 |
|
| 94 |
local mod |
| 95 |
for mod in QtCore \ |
| 96 |
@@ -165,10 +177,6 @@ |
| 97 |
python_execute_function -s configuration |
| 98 |
} |
| 99 |
|
| 100 |
-src_compile() { |
| 101 |
- python_src_compile |
| 102 |
-} |
| 103 |
- |
| 104 |
src_install() { |
| 105 |
installation() { |
| 106 |
# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR. |
| 107 |
@@ -177,15 +185,15 @@ |
| 108 |
python_execute_function -s installation |
| 109 |
python_merge_intermediate_installation_images "${T}/images" |
| 110 |
|
| 111 |
- dodoc NEWS THANKS || die "dodoc failed" |
| 112 |
+ dodoc NEWS THANKS |
| 113 |
|
| 114 |
if use doc; then |
| 115 |
- dohtml -r doc/html/* || die "dohtml failed" |
| 116 |
+ dohtml -r doc/html/* |
| 117 |
fi |
| 118 |
|
| 119 |
if use examples; then |
| 120 |
insinto /usr/share/doc/${PF} |
| 121 |
- doins -r examples || die "doins failed" |
| 122 |
+ doins -r examples |
| 123 |
fi |
| 124 |
} |
| 125 |
|
| 126 |
|
| 127 |
|
| 128 |
|
| 129 |
1.172 dev-python/PyQt4/ChangeLog |
| 130 |
|
| 131 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.172&view=markup |
| 132 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.172&content-type=text/plain |
| 133 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.171&r2=1.172 |
| 134 |
|
| 135 |
Index: ChangeLog |
| 136 |
=================================================================== |
| 137 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v |
| 138 |
retrieving revision 1.171 |
| 139 |
retrieving revision 1.172 |
| 140 |
diff -u -r1.171 -r1.172 |
| 141 |
--- ChangeLog 2 Mar 2012 18:34:25 -0000 1.171 |
| 142 |
+++ ChangeLog 3 Mar 2012 11:48:59 -0000 1.172 |
| 143 |
@@ -1,6 +1,9 @@ |
| 144 |
# ChangeLog for dev-python/PyQt4 |
| 145 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 146 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.171 2012/03/02 18:34:25 pesa Exp $ |
| 147 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.172 2012/03/03 11:48:59 pesa Exp $ |
| 148 |
+ |
| 149 |
+ 03 Mar 2012; Davide Pesavento <pesa@g.o> PyQt4-4.9.1.ebuild: |
| 150 |
+ Switch to EAPI 4, add REQUIRED_USE. |
| 151 |
|
| 152 |
02 Mar 2012; Davide Pesavento <pesa@g.o> PyQt4-4.8.1.ebuild, |
| 153 |
PyQt4-4.8.4.ebuild: |
Archives