diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2014-04-24 13:44:31 -0700 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-04-24 13:44:31 -0700 |
| commit | 663b5e6beca3012b273eb932f0664a47ebc3b843 (patch) | |
| tree | 05a2f020faad40ac33af4466d7d4fee677b5a98d | |
| parent | dev-libs/libtasn1: drop as multilibutized upstream (diff) | |
| download | gmt-663b5e6beca3012b273eb932f0664a47ebc3b843.tar.gz gmt-663b5e6beca3012b273eb932f0664a47ebc3b843.tar.bz2 gmt-663b5e6beca3012b273eb932f0664a47ebc3b843.zip | |
dev-python/PyQt4-4.10.3-r4: revbump/merge
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
| -rw-r--r-- | dev-python/PyQt4/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild (renamed from dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild) | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest index d8c33a4..e91d143 100644 --- a/dev-python/PyQt4/Manifest +++ b/dev-python/PyQt4/Manifest @@ -1,5 +1,5 @@ AUX PyQt4-4.7.3-qreal_float_support.patch 5954 SHA256 e2f86905d0d648eda5bebf50b165120bcb0f4c83e99742eeb2ed17568a6429ec SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2 WHIRLPOOL 83f8c3d00fb92099414a03492d40ddbee362e53be75b180f3842980e0dec69e1a3094e3ea7d951140de028e75c36acb040ca159d710c4a20d20da9c04e6a31dd DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 SHA512 4edd3539e1855bc3358dcba866433e53d4b9444b867c14cc27115cf5a6c123b0af3bb0bae3085f6d71a31f0b6716da40809ac4ffcaaff415673ed7462f1a0420 WHIRLPOOL 675e324993e8f9a3b2a0a8975c9f1e2af9cd315073a68e6649a8de04e8e8a905d756be2c138a8c19b4ec16a75c7b118b32a3ffc27f8399953599a1b88ac76fad -EBUILD PyQt4-4.10.3-r3.ebuild 6053 SHA256 2311d79602689a43edee913135a3499d0c41305dea56219fd7586570ad47ed9e SHA512 47713b7f3fac37e45ff5d17a6f5bfe874ec20a2395e9286f7e7b189914a5236320e6e2b896387c371bc84b772cd851d52d58706086ed6c3f7361016499330847 WHIRLPOOL ec077f0eaa2c2f3d2c0ecf67f83f1a954d59b163e0045cc302a5dcb31d370ad08294a975e91c0d5171bdfdbf959c10b75cbf8f688b96e80a21231a4d71618acb +EBUILD PyQt4-4.10.3-r4.ebuild 6031 SHA256 453932475ac26bcb270af30fd951102463358cf18ac95c33365053298bf3a226 SHA512 ab4304fb18189f6410e85ec5911fca161afb7503f36c98fab203491dea3de5e063fdd738fb4cc1b381b8f72168b1c823c6e07081decc6833a4eb78994f8e1bad WHIRLPOOL a3331291f47dbd547430eb772e94d9810b6ae8bbd1ef58062ffd77683516f0818dfb970ddcea475253fdbdb74c665097a820fdd32d77af0f62991a4bfbbd05e4 MISC ChangeLog 34292 SHA256 6917bb71bd9f2a9ea7f0ea5b63922924bfe6f4f4dc0382ae2051b0bf36802f42 SHA512 76e22a28f43a882a7002a11046e45d3ee7efb81800ec48d271ea943eba96f04c3d3cf5441461d7b520ec6c852298a3186a38982fd00395c65901b04d4ddebcb6 WHIRLPOOL d634fce36da5b5e8553719f595a2c46d6a837efd321bb0059dd7aa3ce9e934313787d64c2d9021f5c6e6512892c84362194f1c80d9d9dfae22511694e234310c MISC metadata.xml 1226 SHA256 546a210961a96d0a0872aa993643899a2becaf81a6c90f6eeb7cdab789f8e2f7 SHA512 f7cbfc11447e1ec407fce921e9dcc44a6a49f013fdce380d43845e15ea45ea88963f8c0a672fa77eeb1b3f2271477c0c740d81ec4c0061cf5f5b2e9d053ca035 WHIRLPOOL fd601eb093c494fcf0730d858a44f30e36403d1f9e046f5671c6ede591d617015ff05c4d8d014be767334daa81497e1bafc0960db50c1380d683324a884f62dc diff --git a/dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild b/dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild index 28b7bbe..53984b7 100644 --- a/dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild +++ b/dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild @@ -5,7 +5,7 @@ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) -inherit eutils python-r1 qmake-utils toolchain-funcs +inherit eutils multibuild python-r1 qmake-utils toolchain-funcs DESCRIPTION="Python bindings for the Qt toolkit" HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt" @@ -42,7 +42,6 @@ QT_PV="4.8.0:4" RDEPEND=" ${PYTHON_DEPS} - dev-lang/python-exec:2[${PYTHON_USEDEP}] >=dev-python/sip-4.15.0:=[${PYTHON_USEDEP}] >=dev-qt/qtcore-${QT_PV} X? ( @@ -194,15 +193,18 @@ src_install() { installation() { local CFLAGS="${CFLAGS} $(python_get_CFLAGS)" CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)" export CFLAGS CXXFLAGS + local tmp_root="${D%/}/tmp" # INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR. - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - mkdir -p "${ED}"/usr/lib/python-exec/${EPYTHON} || die - mv "${ED}"/usr/bin/pyuic4 "${ED}"/usr/lib/python-exec/${EPYTHON}/ || die + emake DESTDIR="${tmp_root}" INSTALL_ROOT="${tmp_root}" install + + python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 + rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die + + multibuild_merge_root "${tmp_root}" "${D}" python_optimize } python_foreach_impl run_in_build_dir installation - dosym ../lib/python-exec/python-exec2 /usr/bin/pyuic4 dodoc NEWS THANKS if use doc; then |