Stop using dohtml, remove old.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

4 files changed, 24 insertions, 230 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index a4ed9eb2250c..feacaf2b3686 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.265 2014/07/17 10:21:25 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.266 2014/09/13 01:39:25 pesa Exp $
+
+  13 Sep 2014; Davide Pesavento <pesa@gentoo.org> -PyQt4-4.10.3-r3.ebuild,
+  PyQt4-4.11.1.ebuild:
+  Stop using dohtml, remove old.
 
   17 Jul 2014; Michael Palimaka <kensington@gentoo.org> -PyQt4-4.11.ebuild:
   Remove old.
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 6cbbdc136733..e08404131110 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -5,25 +5,25 @@ AUX PyQt4-4.7.3-qreal_float_support.patch 5954 SHA256 e2f86905d0d648eda5bebf50b1
 DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 SHA512 4edd3539e1855bc3358dcba866433e53d4b9444b867c14cc27115cf5a6c123b0af3bb0bae3085f6d71a31f0b6716da40809ac4ffcaaff415673ed7462f1a0420 WHIRLPOOL 675e324993e8f9a3b2a0a8975c9f1e2af9cd315073a68e6649a8de04e8e8a905d756be2c138a8c19b4ec16a75c7b118b32a3ffc27f8399953599a1b88ac76fad
 DIST PyQt-x11-gpl-4.11.1.tar.gz 11118850 SHA256 df9d7358d70748efa5b84fa3fe9e182a80c39ac590157daaabcc2618df176da3 SHA512 3851d4e61d9c6a0c62cbfd2a08153972fa3446c1982fc925796eb1d4c6524e7054cdb14ed2f4566386727e9e0cf67246765de19fab79152b0834477452681113 WHIRLPOOL 17e23997afcf06b99028d0d2115bc9328848acaaa1b6bcd8ec7397409ab2001d5fa29ca08bf42e0cef6dcd0441d0cff04e349fa8913a2b0fc86da878b79b5a5d
 EBUILD PyQt4-4.10.3-r2.ebuild 5661 SHA256 b71c877ca0b824dabb9ac99ab1c0e27b5b1686be20a642ef278e344c33413238 SHA512 67195e69490050607741915966ecd3cf4b4be2a7036feb731ce8535aa7fc82c9fc932d6a2e1eb1d301204971d53d6901bf01731bcdbdcaa500916e3cf91b24fe WHIRLPOOL 70db74ec457deae5ff938067882c2bf48973f15e625a2214450e04db8a6ef04219a64894e7993df71ad1fe78e521404bde003a6800fd9153007c18d347381a00
-EBUILD PyQt4-4.10.3-r3.ebuild 5652 SHA256 b5bfa3c15cf25f6f95becd141fe843344b1f600be9e935f734c4426a70a942e9 SHA512 64b95bcf65421021ffa50a0bfba6e3441ccee39489eca953d5cb9b4101ed67ac1b3a96af3d8ba4e87883fd54dc5b9e11ce3e2219a63abcb1b024f2511f4e807b WHIRLPOOL 73337b9d5b066dc472b2a32359df7f3fcef06a0fae04c4e0a9f5f5299ce2fc59274216ff4866f220c1fc4d7e8f5c2b1dfbf129f2135db8b00d4d6f3ef55aa3e4
-EBUILD PyQt4-4.11.1.ebuild 5646 SHA256 7e1cce81f2bf38677c8f14202db9167cfacb2e7f779ff198846121ae36923525 SHA512 01abc63348e181b1a9ddb2d2a824d37d48b321521e70f2616875f7ff04da8123797929930a1e47db9896b70e884f2e107de841d2e7d9587e168453caa4cdf8b8 WHIRLPOOL 08acf1bb63411691682b2b8e9e30af538ba6d3e731cbb5b86c43a4f137f6f4046f19fb7129046689c745715be91e05aa68a62035263efc12740de10270c3000e
-MISC ChangeLog 36476 SHA256 c7ebc3e7cb6db4d62033206fd2544f52e60113795fdd196d57ab2af70801aac4 SHA512 f61ccdec2a1ce6058af5a1a046956546d21b14b86a40fde15d36c6baeeb587b2d7a154c72ae0d9529c25b34d7478ba6048f5012833a0171b3c87fcb2eddbef77 WHIRLPOOL 9e5dfd75983812bf9e7ef90e6d9876a40ea9e963a7204424e34a6440ba7fb0cf6f18494269dd7bfa3ca2ebd2e4b5ed2930031dcc7af0c5ecd5f3820f98774eec
+EBUILD PyQt4-4.11.1.ebuild 5643 SHA256 6d48d8a6c01dc4f4a5b75f5998b0263209269cd747c48c4940df228eb5c71149 SHA512 140c25b989acb2dfc3e2fc7933c24b606ccdc5aae14ec88213847d7c4c3b4d1eab53fa8644f40307e7b7aa88b3124592a0b40fd28001263d83739656d96275f5 WHIRLPOOL eb8f6f3ae876900af80ec29c815f2a55b8e7f656d4d96c75aefd451883591eff8aaabb6fe73a6090cc74a6c4462678c6bd7f0b6b48eefeb815551f8e0c23f1c5
+MISC ChangeLog 36602 SHA256 944cf4a585921906f46bf6b1a91b4bd05c1ae7cc191ba683ee127a02281edc90 SHA512 f1cbeda1be1c9f69c98fedb8bc7053d560923ed9491f1cb36257fb23196c53f9b255e081d84ffde9933cc84c9eaba4373fdb9be4d4b8c03d449a307c9a58629d WHIRLPOOL 2b4265cd1cea0539c3753b157603697c607e20fbde9fa8842f4a21ad61acc4811ba3ce1f0e8cfa824c28f616607840a7e9f53399665d738d52f0d43bdbccc0f1
 MISC metadata.xml 1206 SHA256 1757eb7c7f29865aecd996948d3f6a2eb20986a3b938cddba4618e1eedfc69d3 SHA512 d94177fa61099360b74bdeb3e3f9667d8b1b5b7e5b055323524b325a655970bd61420ae76da59e8d519c3e020394f4174d0e50dc95e7bb57d3d7fca602932104 WHIRLPOOL 0c93eff1a6dad85699c198f0496695b88d01541ed35dce79a316360f123242e6daf8955e36bb848c92dd3210815065fc89a4d0e94438be169f2aa87f2e478b33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJTx6OsRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7HP8EACIzCVXT8Dg9GNgLTdNIDdJDDX/5dWSylVreP2jaJCmpLD6palJygPWQ6pT
-3kEH7JxDjKrUDTHWAE7cDjYOgwYTzsieYhmIYdAlxYNvfc52XXH9rj6BYjYsrtRI
-VWDA3wGvuzKVAy2+sxLaPN6P5BPAM8w6PRlHsrkeFx2a0XJxpyZunIkvULgQBOhc
-h9bmlLL90KNm27buwSNNVmpWbI9X8ra5GDTU6Qf7WXOXbYnGrO4JZd4IjvVabSCF
-lQGKV4U0qebF8U8NRbLrZ5yQm2w11eyn9ezZimwqyncOsL3duW6QXm4c5IyY1znw
-QhI3I5YQgEDpLal23v+U+nE60GtDCkH/74Nvtn0eeJZGOr5+dtvKc6bL+qiIG4+v
-KOepZIC/n0gQ1BOWe89cTqFDzu7rmkDTQTkQKKhfNn3wg1sP3ApJBUpJZ5DIaXE9
-/9Z2Yxx1VAZq05mdIb0lT2oH9EX3HUiauIDbi+DHrJFkfIL/FTJw4xp2uHsBuBjn
-jGHwpBFgMHnMw67vlQCqEThzRZHLQw1Vhrb8Ric2ovwYUt24bOrFQcmRpmxblTBv
-72+Nzi0HoWiXDGDQsi4QPSdQK8JOyVFUW/zGOwjZFJ0cB923V+1QMgYRlR24+fqF
-/Z+mPltXFPfuauHBqvCF2pLLD7YBbTCIgeEKHQ6Av1iuVdmngA==
-=b4mw
+iQJ8BAEBCABmBQJUE6BOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9yVMQAJeRHrmQBAYfvMG/+9QNbtQE
+8QKDmCkC5T5SmPelGeo/tqR/yqCqy6oX6ToQLcsf7eTw17MBsIGqGoFI29hGTFXT
+fzoZ7u9Px8FE31ZIPm8iju4sfTrr9FUSYToTQw5/UKc5ZxVLF/EPDHaa1mwO7Xsb
+CAICrsJNIiIkt9D7T2ER9pv6YLNSOGDUvxwFmmJ6r2fP3mNgBcrBDtVWkGceOdq4
+CsTAqXUZ2tT7gVsLsmr5n9uMYQG1BZn/4wCFDoOBmkqvJxIWaVorEIQKJP2BC9hb
+UEB5MLCblbhWcdSEhExNrKTzsdXc0iINrH86ys5T0JrNgYXoqxavFGCi6pqt+w5g
+DMQkuWLwCQRhIt9RqJHyvrYJGROkzMjiaZY6PyftjdgSNIWUOKOgJf2QX3iwl8lm
+5mi6Dx1ixw495i74H/lk4wWJCBYjZmap1Vz4B3qIy2TRVpsEVJp7qMB30KYLobCD
+vBLf+CBF7Hc7DONp0DcUo2ufZ0uGN6uKE9lDN+FLkTQcUtxQGgXOvKQAUnZqwtVD
+Ri2Xacz3MezDOWxS500fmSWOJEKeNH/rWYxJB3trnyTWiU16jOg4t4gUD6UmRDIi
+Y8Y2+xk7vZQLlddjMAnZWtTGGVu3XOAyVp9AAlNwQzNHxEFqNpn/skk/bW3QsZe6
+uF6Cu4llhc09J/XUDq8P
+=5Khg
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild b/dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild
deleted file mode 100644
index f9e837092182..000000000000
--- a/dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild,v 1.4 2014/06/20 14:01:12 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-
-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/ https://pypi.python.org/pypi/PyQt4"
-
-if [[ ${PV} == *_pre* ]]; then
-	MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
-	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-else
-	MY_P="PyQt-x11-gpl-${PV}"
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	declarative? ( X )
-	designer? ( X )
-	help? ( X )
-	multimedia? ( X )
-	opengl? ( X )
-	phonon? ( X )
-	scripttools? ( X script )
-	sql? ( X )
-	svg? ( X )
-	webkit? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.0:4"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	=dev-python/sip-4.15*:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	X? (
-		>=dev-qt/qtgui-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-	dbus? (
-		>=dev-python/dbus-python-0.80[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	designer? ( || ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 ) )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? (
-		kde? ( media-libs/phonon )
-		!kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) )
-	)
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Support qreal on arm architecture (bug 322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	# Allow building against KDE's phonon (bug 433944 and others).
-	sed -i \
-		-e "s:VideoWidget()\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/qt4/QtGui\"]:" \
-		-e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
-		configure.py || die
-
-	if ! use dbus; then
-		sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.py || die
-	fi
-
-	python_copy_sources
-
-	preparation() {
-		if [[ ${EPYTHON} == python3.* ]]; then
-			rm -fr pyuic/uic/port_v2
-		else
-			rm -fr pyuic/uic/port_v3
-		fi
-	}
-	python_foreach_impl run_in_build_dir preparation
-}
-
-pyqt4_use_enable() {
-	use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}" configure.py
-			--confirm-license
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--sipdir="${EPREFIX}/usr/share/sip"
-			--assume-shared
-			--no-timestamp
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtXml
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtTest)
-			$(pyqt4_use_enable dbus QtDBus)
-			$(pyqt4_use_enable declarative)
-			$(pyqt4_use_enable designer) $(use designer || echo --no-designer-plugin)
-			$(pyqt4_use_enable help)
-			$(pyqt4_use_enable multimedia)
-			$(pyqt4_use_enable opengl QtOpenGL)
-			$(pyqt4_use_enable phonon phonon)
-			$(pyqt4_use_enable script)
-			$(pyqt4_use_enable scripttools QtScriptTools)
-			$(pyqt4_use_enable sql)
-			$(pyqt4_use_enable svg)
-			$(pyqt4_use_enable webkit QtWebKit)
-			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		local mod
-		for mod in QtCore \
-				$(use X && echo QtGui) \
-				$(use dbus && echo QtDBus) \
-				$(use declarative && echo QtDeclarative) \
-				$(use designer && echo QtDesigner) \
-				$(use opengl && echo QtOpenGL); do
-			# Run eqmake4 inside the qpy subdirectories to respect
-			# CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
-			pushd qpy/${mod} > /dev/null || return
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return
-
-			# Fix insecure runpaths.
-			sed -i -e "/^LFLAGS\s*=/ s:-Wl,-rpath,${BUILD_DIR}/qpy/${mod}::" \
-				${mod}/Makefile || die "failed to fix rpath for ${mod}"
-		done
-
-		# Avoid stripping of libpythonplugin.so.
-		if use designer; then
-			pushd designer > /dev/null || return
-			eqmake4 python.pro
-			popd > /dev/null || return
-		fi
-	}
-	python_parallel_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D%/}/tmp
-
-		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
-		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
-
-	dodoc NEWS THANKS
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/PyQt4/PyQt4-4.11.1.ebuild b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
index b671aab06914..0eeaf8215d62 100644
--- a/dev-python/PyQt4/PyQt4-4.11.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.1.ebuild,v 1.1 2014/07/15 17:34:33 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.1.ebuild,v 1.2 2014/09/13 01:39:25 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -200,7 +200,7 @@ src_install() {
 	dodoc NEWS THANKS
 
 	if use doc; then
-		dohtml -r doc/html/*
+		dodoc -r doc/html
 	fi
 
 	if use examples; then