Version bump, remove old.

(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

3 files changed, 27 insertions, 71 deletions

diff --git a/dev-python/qscintilla-python/ChangeLog b/dev-python/qscintilla-python/ChangeLog
index f6ac8714c668..a0eefaaf0c21 100644
--- a/dev-python/qscintilla-python/ChangeLog
+++ b/dev-python/qscintilla-python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/qscintilla-python
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.94 2012/09/09 15:53:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.95 2012/12/10 12:27:54 pesa Exp $
+
+*qscintilla-python-2.7 (10 Dec 2012)
+
+  10 Dec 2012; Davide Pesavento <pesa@gentoo.org> +qscintilla-python-2.7.ebuild,
+  -qscintilla-python-2.5.1.ebuild, -qscintilla-python-2.6.1.ebuild:
+  Version bump, remove old.
 
   09 Sep 2012; Raúl Porcel <armin76@gentoo.org>
   qscintilla-python-2.6.2.ebuild:
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.5.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.5.1.ebuild
deleted file mode 100644
index 84bd15c02f66..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.5.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.5.1.ebuild,v 1.6 2012/03/25 17:59:08 pesa Exp $
-
-EAPI="3"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit eutils python toolchain-funcs
-
-MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
-
-DESCRIPTION="Python bindings for Qscintilla"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="debug"
-
-DEPEND=">=dev-python/sip-4.10
-	>=dev-python/PyQt4-4.7[X]
-	~x11-libs/qscintilla-${PV}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/Python"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-disable_stripping.patch"
-
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=("$(PYTHON)"
-			configure.py
-			-p 4
-			--destdir="${EPREFIX}$(python_get_sitedir)/PyQt4"
-			$(use debug && echo --debug))
-		echo "${myconf[@]}"
-		"${myconf[@]}"
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	building() {
-		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)"
-	}
-	python_execute_function -s building
-}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.6.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.7.ebuild
index 06ebe6b58b95..d817d5941637 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.6.1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.7.ebuild
@@ -1,47 +1,51 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.6.1.ebuild,v 1.5 2012/07/09 14:28:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.7.ebuild,v 1.1 2012/12/10 12:27:54 pesa Exp $
 
-EAPI="3"
+EAPI=4
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
 
 inherit eutils python toolchain-funcs
 
-MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
+MY_P=QScintilla-gpl-${PV}
 
 DESCRIPTION="Python bindings for Qscintilla"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug"
 
-DEPEND=">=dev-python/sip-4.10
-	>=dev-python/PyQt4-4.7[X]
-	~x11-libs/qscintilla-${PV}"
+DEPEND="
+	>=dev-python/sip-4.12
+	>=dev-python/PyQt4-4.8[X]
+	~x11-libs/qscintilla-${PV}
+"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}/Python"
+S=${WORKDIR}/${MY_P}/Python
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.5.1-disable_stripping.patch"
 
-	python_copy_sources
+	python_src_prepare
 }
 
 src_configure() {
 	configuration() {
-		local myconf=("$(PYTHON)"
-			configure.py
-			-p 4
+		local myconf=(
+			"$(PYTHON)" configure.py
 			--destdir="${EPREFIX}$(python_get_sitedir)/PyQt4"
-			$(use debug && echo --debug))
+			-p 4
+			--no-timestamp
+			$(use debug && echo --debug)
+		)
 		echo "${myconf[@]}"
-		"${myconf[@]}"
+		"${myconf[@]}" || die
 	}
 	python_execute_function -s configuration
 }