| 1 |
hwoarang 10/09/01 09:04:59 |
| 2 |
|
| 3 |
Modified: ChangeLog PyQt4-4.7.4.ebuild |
| 4 |
Added: PyQt4-4.7.5.ebuild |
| 5 |
Log: |
| 6 |
Version bump |
| 7 |
|
| 8 |
(Portage version: 2.2_rc72/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.123 dev-python/PyQt4/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.123&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.123&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.122&r2=1.123 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v |
| 20 |
retrieving revision 1.122 |
| 21 |
retrieving revision 1.123 |
| 22 |
diff -u -r1.122 -r1.123 |
| 23 |
--- ChangeLog 18 Aug 2010 03:50:35 -0000 1.122 |
| 24 |
+++ ChangeLog 1 Sep 2010 09:04:59 -0000 1.123 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for dev-python/PyQt4 |
| 27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.122 2010/08/18 03:50:35 jer Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.123 2010/09/01 09:04:59 hwoarang Exp $ |
| 30 |
+ |
| 31 |
+*PyQt4-4.7.5 (01 Sep 2010) |
| 32 |
+ |
| 33 |
+ 01 Sep 2010; Markos Chandras <hwoarang@g.o> PyQt4-4.7.4.ebuild, |
| 34 |
+ +PyQt4-4.7.5.ebuild: |
| 35 |
+ Version bump |
| 36 |
|
| 37 |
18 Aug 2010; Jeroen Roovers <jer@g.o> PyQt4-4.7.3.ebuild: |
| 38 |
Stable for HPPA (bug #315775). |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.3 dev-python/PyQt4/PyQt4-4.7.4.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.4.ebuild?rev=1.3&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.4.ebuild?rev=1.3&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.4.ebuild?r1=1.2&r2=1.3 |
| 47 |
|
| 48 |
Index: PyQt4-4.7.4.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.4.ebuild,v |
| 51 |
retrieving revision 1.2 |
| 52 |
retrieving revision 1.3 |
| 53 |
diff -u -r1.2 -r1.3 |
| 54 |
--- PyQt4-4.7.4.ebuild 15 Jul 2010 11:19:50 -0000 1.2 |
| 55 |
+++ PyQt4-4.7.4.ebuild 1 Sep 2010 09:04:59 -0000 1.3 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2010 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.4.ebuild,v 1.2 2010/07/15 11:19:50 hwoarang Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.4.ebuild,v 1.3 2010/09/01 09:04:59 hwoarang Exp $ |
| 61 |
|
| 62 |
EAPI="2" |
| 63 |
PYTHON_EXPORT_PHASE_FUNCTIONS="1" |
| 64 |
@@ -88,7 +88,7 @@ |
| 65 |
use prefix || EPREFIX= |
| 66 |
|
| 67 |
configuration() { |
| 68 |
- local myconf="$(PYTHON) configure.py |
| 69 |
+ set -- $(PYTHON) configure.py |
| 70 |
--confirm-license |
| 71 |
--bindir=${EPREFIX}/usr/bin |
| 72 |
--destdir=${EPREFIX}$(python_get_sitedir) |
| 73 |
@@ -114,9 +114,9 @@ |
| 74 |
$(pyqt4_use_enable xmlpatterns QtXmlPatterns) |
| 75 |
CC=$(tc-getCC) CXX=$(tc-getCXX) |
| 76 |
LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX) |
| 77 |
- CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'" |
| 78 |
- echo ${myconf} |
| 79 |
- eval ${myconf} || return 1 |
| 80 |
+ CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}' |
| 81 |
+ echo "$@" |
| 82 |
+ "$@" || die "configure.py failed" |
| 83 |
|
| 84 |
for mod in QtCore $(use X && echo 'QtDesigner QtGui'); do |
| 85 |
# Run eqmake4 inside the qpy subdirs to prevent |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
1.1 dev-python/PyQt4/PyQt4-4.7.5.ebuild |
| 90 |
|
| 91 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.5.ebuild?rev=1.1&view=markup |
| 92 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.5.ebuild?rev=1.1&content-type=text/plain |
| 93 |
|
| 94 |
Index: PyQt4-4.7.5.ebuild |
| 95 |
=================================================================== |
| 96 |
# Copyright 1999-2010 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.5.ebuild,v 1.1 2010/09/01 09:04:59 hwoarang Exp $ |
| 99 |
|
| 100 |
EAPI="2" |
| 101 |
PYTHON_EXPORT_PHASE_FUNCTIONS="1" |
| 102 |
SUPPORT_PYTHON_ABIS="1" |
| 103 |
|
| 104 |
inherit qt4-r2 python toolchain-funcs |
| 105 |
|
| 106 |
MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}" |
| 107 |
QTVER="4.6.2" # minimal Qt version this is supposed to work with |
| 108 |
|
| 109 |
DESCRIPTION="A set of Python bindings for the Qt toolkit" |
| 110 |
HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt" |
| 111 |
SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz" |
| 112 |
|
| 113 |
SLOT="0" |
| 114 |
LICENSE="|| ( GPL-2 GPL-3 )" |
| 115 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 116 |
IUSE="X assistant +dbus debug doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" |
| 117 |
|
| 118 |
DEPEND=">=dev-python/sip-4.11 |
| 119 |
>=x11-libs/qt-core-${QTVER}:4 |
| 120 |
>=x11-libs/qt-script-${QTVER}:4 |
| 121 |
>=x11-libs/qt-test-${QTVER}:4 |
| 122 |
X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?] ) |
| 123 |
assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 ) |
| 124 |
dbus? ( |
| 125 |
>=dev-python/dbus-python-0.80 |
| 126 |
>=x11-libs/qt-dbus-${QTVER}:4 |
| 127 |
) |
| 128 |
multimedia? ( >=x11-libs/qt-multimedia-${QTVER}:4 ) |
| 129 |
opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 ) |
| 130 |
phonon? ( |
| 131 |
!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) ) |
| 132 |
kde? ( media-sound/phonon ) |
| 133 |
) |
| 134 |
sql? ( >=x11-libs/qt-sql-${QTVER}:4 ) |
| 135 |
svg? ( >=x11-libs/qt-svg-${QTVER}:4 ) |
| 136 |
webkit? ( >=x11-libs/qt-webkit-${QTVER}:4 ) |
| 137 |
xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:4 )" |
| 138 |
RDEPEND="${DEPEND}" |
| 139 |
RESTRICT_PYTHON_ABIS="3.2" # doesn't build with python:3.2 (yet), bug 292419 |
| 140 |
|
| 141 |
S=${WORKDIR}/${MY_P} |
| 142 |
|
| 143 |
PATCHES=( |
| 144 |
"${FILESDIR}/${PN}-4.6.1-configure-multilib.patch" |
| 145 |
"${FILESDIR}/${PN}-4.7.2-configure.py.patch" |
| 146 |
) |
| 147 |
|
| 148 |
src_prepare() { |
| 149 |
use prefix || EPREFIX= |
| 150 |
|
| 151 |
if ! use dbus; then |
| 152 |
sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \ |
| 153 |
"${S}"/configure.py || die |
| 154 |
fi |
| 155 |
|
| 156 |
# Patch to support qreal for arm architecture |
| 157 |
# wrt bug #322349 |
| 158 |
use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" |
| 159 |
|
| 160 |
qt4-r2_src_prepare |
| 161 |
|
| 162 |
# Use proper include dir |
| 163 |
sed -e "s|/usr/include|${EPREFIX}/usr/include|g" \ |
| 164 |
-i configure.py |
| 165 |
|
| 166 |
python_copy_sources |
| 167 |
|
| 168 |
preparation() { |
| 169 |
if [[ "${PYTHON_ABI:0:1}" == "3" ]]; then |
| 170 |
rm -fr pyuic/uic/port_v2 |
| 171 |
else |
| 172 |
rm -fr pyuic/uic/port_v3 |
| 173 |
fi |
| 174 |
} |
| 175 |
python_execute_function -s preparation |
| 176 |
} |
| 177 |
|
| 178 |
pyqt4_use_enable() { |
| 179 |
use $1 && echo "--enable=${2:-$1}" |
| 180 |
} |
| 181 |
|
| 182 |
src_configure() { |
| 183 |
use prefix || EPREFIX= |
| 184 |
|
| 185 |
configuration() { |
| 186 |
local myconf="$(PYTHON) configure.py |
| 187 |
--confirm-license |
| 188 |
--bindir="${EPREFIX}"/usr/bin |
| 189 |
--destdir="${EPREFIX}"$(python_get_sitedir) |
| 190 |
--sipdir="${EPREFIX}"/usr/share/sip |
| 191 |
--qsci-api |
| 192 |
$(use debug && echo '--debug') |
| 193 |
--enable=QtCore |
| 194 |
--enable=QtNetwork |
| 195 |
--enable=QtScript |
| 196 |
--enable=QtTest |
| 197 |
--enable=QtXml |
| 198 |
$(pyqt4_use_enable X QtGui) |
| 199 |
$(pyqt4_use_enable X QtDesigner) |
| 200 |
$(pyqt4_use_enable X QtScriptTools) |
| 201 |
$(pyqt4_use_enable assistant QtAssistant) |
| 202 |
$(pyqt4_use_enable assistant QtHelp) |
| 203 |
$(pyqt4_use_enable multimedia QtMultimedia) |
| 204 |
$(pyqt4_use_enable opengl QtOpenGL) |
| 205 |
$(pyqt4_use_enable phonon) |
| 206 |
$(pyqt4_use_enable sql QtSql) |
| 207 |
$(pyqt4_use_enable svg QtSvg) |
| 208 |
$(pyqt4_use_enable webkit QtWebKit) |
| 209 |
$(pyqt4_use_enable xmlpatterns QtXmlPatterns) |
| 210 |
CC=$(tc-getCC) CXX=$(tc-getCXX) |
| 211 |
LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX) |
| 212 |
CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'" |
| 213 |
echo ${myconf} |
| 214 |
eval ${myconf} || return 1 |
| 215 |
|
| 216 |
for mod in QtCore $(use X && echo 'QtDesigner QtGui'); do |
| 217 |
# Run eqmake4 inside the qpy subdirs to prevent |
| 218 |
# stripping and many other QA issues |
| 219 |
pushd qpy/${mod} > /dev/null || die |
| 220 |
eqmake4 $(ls w_qpy*.pro) |
| 221 |
popd > /dev/null || die |
| 222 |
|
| 223 |
# Fix insecure runpaths |
| 224 |
sed -i -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \ |
| 225 |
${mod}/Makefile || die "failed to fix rpath issues" |
| 226 |
done |
| 227 |
|
| 228 |
# Fix pre-stripping of libpythonplugin.so |
| 229 |
if use X; then |
| 230 |
cd "${BUILDDIR}"/designer |
| 231 |
eqmake4 python.pro |
| 232 |
fi |
| 233 |
} |
| 234 |
python_execute_function -s configuration |
| 235 |
} |
| 236 |
|
| 237 |
src_compile() { |
| 238 |
python_src_compile |
| 239 |
} |
| 240 |
|
| 241 |
src_install() { |
| 242 |
installation() { |
| 243 |
# INSTALL_ROOT is needed for the QtDesigner module, |
| 244 |
# the other Makefiles use DESTDIR. |
| 245 |
emake DESTDIR="${D}" INSTALL_ROOT="${D}" install |
| 246 |
} |
| 247 |
python_execute_function -s installation |
| 248 |
|
| 249 |
dodoc doc/pyqt4ref.txt NEWS THANKS || die |
| 250 |
|
| 251 |
if use doc; then |
| 252 |
dohtml -r doc/* || die |
| 253 |
fi |
| 254 |
|
| 255 |
if use examples; then |
| 256 |
insinto /usr/share/doc/${PF} |
| 257 |
doins -r examples || die |
| 258 |
fi |
| 259 |
} |
| 260 |
|
| 261 |
pkg_postinst() { |
| 262 |
python_mod_optimize PyQt4 |
| 263 |
} |
| 264 |
|
| 265 |
pkg_postrm() { |
| 266 |
python_mod_cleanup PyQt4 |
| 267 |
} |
Archives