Delete older ebuilds.

(Portage version: 2.2.0_alpha9_p4/cvs/Linux x86_64)

6 files changed, 7 insertions, 423 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 14e699ccfab8..94d8f592a80f 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.135 2010/12/06 19:12:39 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.136 2010/12/19 18:51:55 arfrever Exp $
+
+  19 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/PyQt4-4.5.4-qgraphicslinearlayout-fix.patch,
+  -files/configure-4.6.1.py.patch, -PyQt4-4.6.2.ebuild, -PyQt4-4.8.ebuild,
+  -files/configure.py.patch:
+  Delete.
 
   06 Dec 2010; Alex Alexander <wired@gentoo.org> -PyQt4-4.5.4-r4.ebuild:
   old, depends on qt 4.5
diff --git a/dev-python/PyQt4/PyQt4-4.6.2.ebuild b/dev-python/PyQt4/PyQt4-4.6.2.ebuild
deleted file mode 100644
index 9c45d8712665..000000000000
--- a/dev-python/PyQt4/PyQt4-4.6.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.6.2.ebuild,v 1.11 2010/11/06 17:32:34 jer Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python qt4-r2 toolchain-funcs
-
-MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
-QTVER="4.5.3"
-
-DESCRIPTION="A set of Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="X assistant +dbus debug doc examples kde opengl phonon sql svg webkit xmlpatterns"
-
-DEPEND=">=dev-python/sip-4.9
-	>=x11-libs/qt-core-${QTVER}:4
-	>=x11-libs/qt-script-${QTVER}:4
-	>=x11-libs/qt-test-${QTVER}:4
-	X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?] )
-	assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 )
-	dbus? (
-		>=dev-python/dbus-python-0.80
-		>=x11-libs/qt-dbus-${QTVER}:4
-	)
-	opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 )
-	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
-		kde? ( media-sound/phonon )
-	)
-	sql? ( >=x11-libs/qt-sql-${QTVER}:4 )
-	svg? ( >=x11-libs/qt-svg-${QTVER}:4 )
-	webkit? ( >=x11-libs/qt-webkit-${QTVER}:4 )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:4 )"
-RDEPEND="${DEPEND}"
-RESTRICT_PYTHON_ABIS="3.2"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/configure-4.6.1.py.patch"
-	"${FILESDIR}/${PN}-4.6.1-configure-multilib.patch"
-)
-
-src_prepare() {
-	if ! use dbus; then
-		sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \
-			"${S}"/configure.py || die
-	fi
-	qt4-r2_src_prepare
-
-	python_copy_sources
-
-	preparation() {
-		if [[ "${PYTHON_ABI:0:1}" == "3" ]]; then
-			rm -fr pyuic/uic/port_v2
-		else
-			rm -fr pyuic/uic/port_v3
-		fi
-	}
-	python_execute_function -s preparation
-}
-
-pyqt4_use_enable() {
-	use $1 && echo "--enable=${2:-$1}"
-}
-
-src_configure() {
-	configuration() {
-		local myconf="$(PYTHON) configure.py
-				--confirm-license
-				--bindir=/usr/bin
-				--destdir=$(python_get_sitedir)
-				--sipdir=/usr/share/sip
-				$(use debug && echo '--debug')
-				--enable=QtCore
-				--enable=QtNetwork
-				--enable=QtScript
-				--enable=QtTest
-				--enable=QtXml
-				$(pyqt4_use_enable X QtGui)
-				$(pyqt4_use_enable X QtDesigner)
-				$(pyqt4_use_enable X QtScriptTools)
-				$(pyqt4_use_enable assistant QtAssistant)
-				$(pyqt4_use_enable assistant QtHelp)
-				$(pyqt4_use_enable opengl QtOpenGL)
-				$(pyqt4_use_enable phonon)
-				$(pyqt4_use_enable sql QtSql)
-				$(pyqt4_use_enable svg QtSvg)
-				$(pyqt4_use_enable webkit QtWebKit)
-				$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
-				CC=$(tc-getCC) CXX=$(tc-getCXX)
-				LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX)
-				CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'"
-		echo ${myconf}
-		eval ${myconf} || return 1
-
-		for mod in QtCore $(use X && echo 'QtDesigner QtGui'); do
-			# Run eqmake4 inside the qpy subdirs to prevent
-			# stripping and many other QA issues
-			pushd qpy/${mod} > /dev/null || die
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || die
-
-			# Fix insecure runpaths
-			sed -i -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
-				${mod}/Makefile || die "failed to fix rpath issues"
-		done
-
-		# Fix pre-stripping of libpythonplugin.so
-		if use X; then
-			cd "${BUILDDIR}"/designer
-			eqmake4 python.pro
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is needed for the QtDesigner module,
-		# the other Makefiles use DESTDIR.
-		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	}
-	python_execute_function -s installation
-
-	dodoc ChangeLog doc/pyqt4ref.txt NEWS THANKS || die
-
-	if use doc; then
-		dohtml -r doc/* || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}
diff --git a/dev-python/PyQt4/PyQt4-4.8.ebuild b/dev-python/PyQt4/PyQt4-4.8.ebuild
deleted file mode 100644
index 8cc32b5bce3b..000000000000
--- a/dev-python/PyQt4/PyQt4-4.8.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.ebuild,v 1.2 2010/11/06 17:32:34 jer Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python qt4-r2 toolchain-funcs
-
-MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
-
-# Minimal supported version of Qt.
-QT_VER="4.6.2"
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-DEPEND=">=dev-python/sip-4.11.2
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
-	>=x11-libs/qt-test-${QT_VER}:4
-	X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] )
-	assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 )
-	dbus? (
-		>=dev-python/dbus-python-0.80
-		>=x11-libs/qt-dbus-${QT_VER}:4
-	)
-	declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
-	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
-	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 )
-	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) )
-		kde? ( media-sound/phonon )
-	)
-	sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
-	svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )
-	webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6.1-configure-multilib.patch"
-	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
-)
-
-src_prepare() {
-	if ! use dbus; then
-		sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
-	fi
-
-	# Support qreal for arm architecture (bug #322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	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"
-
-	python_copy_sources
-
-	preparation() {
-		if [[ "$(python_get_version --major)" == "3" ]]; then
-			rm -fr pyuic/uic/port_v2
-		else
-			rm -fr pyuic/uic/port_v3
-		fi
-	}
-	python_execute_function -s preparation
-}
-
-pyqt4_use_enable() {
-	use $1 && echo "--enable=${2:-$1}"
-}
-
-src_configure() {
-	configuration() {
-		local myconf=("$(PYTHON)"
-			configure.py
-			--confirm-license
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
-			--sipdir="${EPREFIX}/usr/share/sip"
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtTest
-			--enable=QtXml
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtDesigner)
-			$(pyqt4_use_enable X QtScriptTools)
-			$(pyqt4_use_enable assistant QtAssistant)
-			$(pyqt4_use_enable assistant QtHelp)
-			$(pyqt4_use_enable declarative QtDeclarative)
-			$(pyqt4_use_enable multimedia QtMultimedia)
-			$(pyqt4_use_enable opengl QtOpenGL)
-			$(pyqt4_use_enable phonon)
-			$(pyqt4_use_enable sql QtSql)
-			$(pyqt4_use_enable svg QtSvg)
-			$(pyqt4_use_enable webkit QtWebKit)
-			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
-			CC="$(tc-getCC)"
-			CXX="$(tc-getCXX)"
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			CFLAGS="${CFLAGS}"
-			CXXFLAGS="${CXXFLAGS}"
-			LFLAGS="${LDFLAGS}")
-		echo "${myconf[@]}"
-		"${myconf[@]}" || return 1
-
-		local mod
-		for mod in QtCore $(use X && echo QtDesigner QtGui); do
-			# Run eqmake4 inside the qpy subdirectories to avoid stripping and many other QA issues.
-			pushd qpy/${mod} > /dev/null || return 1
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return 1
-
-			# Fix insecure runpaths.
-			sed -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of rpaths failed"
-		done
-
-		# Fix pre-stripping of libpythonplugin.so
-		if use X; then
-			cd "${BUILDDIR}/designer"
-			eqmake4 python.pro
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	python_src_compile
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR.
-		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	}
-	python_execute_function -s installation
-
-	dodoc doc/pyqt4ref.txt NEWS THANKS || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/* || die "dohtml failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}
diff --git a/dev-python/PyQt4/files/PyQt4-4.5.4-qgraphicslinearlayout-fix.patch b/dev-python/PyQt4/files/PyQt4-4.5.4-qgraphicslinearlayout-fix.patch
deleted file mode 100644
index 7138ee0d7fbe..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.5.4-qgraphicslinearlayout-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nurp PyQt-x11-gpl-4.5.orig/sip/QtGui/qgraphicslinearlayout.sip PyQt-x11-gpl-4.5/sip/QtGui/qgraphicslinearlayout.sip
---- PyQt-x11-gpl-4.5.orig/sip/QtGui/qgraphicslinearlayout.sip	2009-06-05 10:50:38.000000000 +0200
-+++ PyQt-x11-gpl-4.5/sip/QtGui/qgraphicslinearlayout.sip	2009-06-25 15:22:56.297020424 +0200
-@@ -74,7 +74,7 @@ public:
-         {
-             PyObject *itmo = sipGetPyObject(itm, sipType_QGraphicsLayoutItem);
-         
--            if (itmo)
-+            if (itmo && ! itm->parentLayoutItem())
-                 sipTransferBack(itmo);
-         }
- %End
diff --git a/dev-python/PyQt4/files/configure-4.6.1.py.patch b/dev-python/PyQt4/files/configure-4.6.1.py.patch
deleted file mode 100644
index b9d3db7dbd70..000000000000
--- a/dev-python/PyQt4/files/configure-4.6.1.py.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- PyQt-x11-gpl-4.6.1~orig/configure.py	2009-10-23 23:03:13.000000000 +0200
-+++ PyQt-x11-gpl-4.6.1/configure.py	2009-10-23 23:33:06.000000000 +0200
-@@ -341,7 +341,7 @@
-         check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
-         check_module("QtXml", "qdom.h", "new QDomDocument()")
-         check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
--        check_module("phonon", "Phonon/VideoWidget",
-+        check_module("phonon", "phonon/videowidget.h",
-                 "new Phonon::VideoWidget()")
-         check_module("QtAssistant", "qassistantclient.h",
-                 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
-@@ -451,7 +451,7 @@
-             generate_code("QtXmlPatterns")
- 
-         if "phonon" in pyqt_modules:
--            generate_code("phonon")
-+            generate_code("phonon", extra_include_dirs=["/usr/include/phonon"])
- 
-         if "QtAssistant" in pyqt_modules:
-             generate_code("QtAssistant")
-@@ -759,6 +759,7 @@
-                 install_dir=pydbusmoddir,
-                 qt=["QtCore"],
-                 debug=opts.debug,
-+                strip=0,
-                 universal=sipcfg.universal,
-                 arch=sipcfg.arch
-             )
-@@ -1468,6 +1469,7 @@
-         warnings=1,
-         static=opts.static,
-         debug=opts.debug,
-+        strip=0,
-         universal=sipcfg.universal,
-         arch=sipcfg.arch
-     )
diff --git a/dev-python/PyQt4/files/configure.py.patch b/dev-python/PyQt4/files/configure.py.patch
deleted file mode 100644
index 4c3387883c3b..000000000000
--- a/dev-python/PyQt4/files/configure.py.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naur PyQt-x11-gpl-4.4.4~orig/configure.py PyQt-x11-gpl-4.4.4/configure.py
---- PyQt-x11-gpl-4.4.4~orig/configure.py	2009-06-01 01:54:27.000000000 +0200
-+++ PyQt-x11-gpl-4.4.4/configure.py	2009-06-01 01:55:57.000000000 +0200
-@@ -300,7 +300,8 @@
-         check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
-         check_module("QtXml", "qdom.h", "new QDomDocument()")
-         check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
--        check_module("phonon", "phonon", "new Phonon::VideoWidget()")
-+        check_module("phonon", "videowidget.h", "new Phonon::VideoWidget()",
-+			extra_include_dirs=["/usr/include/phonon"])
-         check_module("QtAssistant", "qassistantclient.h",
-                 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
-                 extra_libs=ass_libs)
-@@ -394,7 +395,7 @@
-             generate_code("QtXmlPatterns")
- 
-         if "phonon" in pyqt_modules:
--            generate_code("phonon")
-+            generate_code("phonon", extra_include_dirs=["/usr/include/phonon"])
- 
-         if "QtAssistant" in pyqt_modules:
-             generate_code("QtAssistant")
-@@ -666,6 +667,7 @@
-                 install_dir=pydbusmoddir,
-                 qt=["QtCore"],
-                 debug=opts.debug,
-+                strip=0,
-                 universal=sipcfg.universal
-             )
- 
-@@ -1350,6 +1352,7 @@
-         warnings=1,
-         static=opts.static,
-         debug=opts.debug,
-+        strip=0,
-         universal=sipcfg.universal
-     )
- 
-@@ -1510,7 +1513,7 @@
-         # The Qt binary installer has macx-xcode as the default.
-         args = "-spec macx-g++ " + args
- 
--    return args
-+    return " QMAKE_STRIP= " + args
- 
- 
- def get_qt_configuration():