[gentoo-commits] gentoo-x86 commit in kde-base/pykde4: pykde4-4.3.5-r1.ebuild pykde4-4.3.4-r1.ebuild ChangeLog pykde4-4.3.3.ebuild pykde4-4.3.3-r1.ebuild pykde4-4.3.4.ebuild

[Jonathan Callen (abcd)]

abcd        10/02/07 21:24:46

  Modified:             pykde4-4.3.5-r1.ebuild ChangeLog
                        pykde4-4.3.3.ebuild
  Added:                pykde4-4.3.4-r1.ebuild pykde4-4.3.3-r1.ebuild
  Removed:              pykde4-4.3.4.ebuild
  Log:
  Backport pykdeuic4 patch to 4.3.3 and 4.3.4; add blocker to DEPEND as well as RDEPEND (compile-time errors)
  (Portage version: -svn/cvs/Linux i686)

Revision  Changes    Path
1.2                  kde-base/pykde4/pykde4-4.3.5-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/pykde4-4.3.5-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/pykde4-4.3.5-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/pykde4-4.3.5-r1.ebuild?r1=1.1&r2=1.2

Index: pykde4-4.3.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.5-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pykde4-4.3.5-r1.ebuild	28 Jan 2010 06:13:52 -0000	1.1
+++ pykde4-4.3.5-r1.ebuild	7 Feb 2010 21:24:45 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.5-r1.ebuild,v 1.1 2010/01/28 06:13:52 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.5-r1.ebuild,v 1.2 2010/02/07 21:24:45 abcd Exp $
 
 EAPI="2"
 
@@ -14,17 +14,16 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="akonadi debug doc examples policykit semantic-desktop"
 
+# blocker added due to compatibility issues and error during compile time
 DEPEND="
+	!dev-python/pykde
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,aqua] )
 	!aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X] )
 	akonadi? ( $(add_kdebase_dep kdepimlibs) )
 	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
 "
-# blocker added due to compatibility issues and error during compile time
-RDEPEND="${DEPEND}
-	!dev-python/pykde
-"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.4-typedefs.sip.patch



1.53                 kde-base/pykde4/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/ChangeLog?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/ChangeLog?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/ChangeLog?r1=1.52&r2=1.53

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog	28 Jan 2010 06:13:52 -0000	1.52
+++ ChangeLog	7 Feb 2010 21:24:45 -0000	1.53
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.52 2010/01/28 06:13:52 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.53 2010/02/07 21:24:45 abcd Exp $
+
+*pykde4-4.3.4-r1 (07 Feb 2010)
+*pykde4-4.3.3-r1 (07 Feb 2010)
+
+  07 Feb 2010; Jonathan Callen <abcd@g.o> pykde4-4.3.3.ebuild,
+  +pykde4-4.3.3-r1.ebuild, -pykde4-4.3.4.ebuild, +pykde4-4.3.4-r1.ebuild,
+  pykde4-4.3.5-r1.ebuild:
+  Backport pykdeuic4 patch to 4.3.3 and 4.3.4; add blocker to DEPEND as well
+  as RDEPEND (compile-time errors)
 
 *pykde4-4.3.5-r1 (28 Jan 2010)
 



1.7                  kde-base/pykde4/pykde4-4.3.3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/pykde4-4.3.3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/pykde4-4.3.3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/pykde4-4.3.3.ebuild?r1=1.6&r2=1.7

Index: pykde4-4.3.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pykde4-4.3.3.ebuild	19 Jan 2010 00:52:30 -0000	1.6
+++ pykde4-4.3.3.ebuild	7 Feb 2010 21:24:45 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.3.ebuild,v 1.6 2010/01/19 00:52:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.3.ebuild,v 1.7 2010/02/07 21:24:45 abcd Exp $
 
 EAPI="2"
 
@@ -14,17 +14,15 @@
 KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="akonadi debug examples policykit semantic-desktop"
 
-COMMON_DEPEND="
+# blocker added due to compatibility issues and error during compile time
+DEPEND="
+	!dev-python/pykde
 	>=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X]
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	akonadi? ( $(add_kdebase_dep kdepimlibs) )
 	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
 "
-DEPEND="${COMMON_DEPEND}"
-# blocker added due to compatibility issues and error during compile time
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/pykde
-"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	python_pkg_setup



1.1                  kde-base/pykde4/pykde4-4.3.4-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/pykde4-4.3.4-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/pykde4-4.3.4-r1.ebuild?rev=1.1&content-type=text/plain

Index: pykde4-4.3.4-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.4-r1.ebuild,v 1.1 2010/02/07 21:24:45 abcd Exp $

EAPI="2"

KMNAME="kdebindings"
KMMODULE="python/${PN}"
OPENGL_REQUIRED="always"
PYTHON_USE_WITH="threads"
inherit python kde4-meta

DESCRIPTION="Python bindings for KDE4"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="akonadi debug examples policykit semantic-desktop"

# blocker added due to compatibility issues and error during compile time
DEPEND="
	!dev-python/pykde
	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
	aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,aqua] )
	!aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X] )
	akonadi? ( $(add_kdebase_dep kdepimlibs) )
	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
"
RDEPEND="${DEPEND}"

PATCHES=(
	"${FILESDIR}"/${P}-fix-pykdeuic4.patch
)

pkg_setup() {
	python_pkg_setup
	kde4-meta_pkg_setup
}

src_prepare() {
	kde4-meta_src_prepare

	if ! use examples; then
		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
			|| die "Failed to disable examples"
	fi
	epatch "${FILESDIR}"/${P}-typedefs.sip.patch
}

src_configure() {
	mycmakeargs=(
		-DWITH_QScintilla=OFF
		$(cmake-utils_use_with semantic-desktop Soprano)
		$(cmake-utils_use_with semantic-desktop Nepomuk)
		$(cmake-utils_use_with akonadi)
		$(cmake-utils_use_with akonadi KdepimLibs)
		$(cmake-utils_use_with policykit PolkitQt)
	)

	kde4-meta_src_configure
}

src_install() {
	kde4-meta_src_install

	rm -f \
		"${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
		"${ED}${PREFIX}"/share/apps/"${PN}"/*.py[co]
}

pkg_postinst() {
	kde4-meta_pkg_postinst

	python_mod_optimize "$(python_get_sitedir)"/PyKDE4

	if use examples; then
		echo
		elog "PyKDE4 examples have been installed to"
		elog "${EKDEDIR}/share/apps/${PN}/examples"
		echo
	fi
}

pkg_postrm() {
	kde4-meta_pkg_postrm

	python_mod_cleanup "$(python_get_sitedir)"/PyKDE4
}



1.1                  kde-base/pykde4/pykde4-4.3.3-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/pykde4-4.3.3-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde4/pykde4-4.3.3-r1.ebuild?rev=1.1&content-type=text/plain

Index: pykde4-4.3.3-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.3-r1.ebuild,v 1.1 2010/02/07 21:24:45 abcd Exp $

EAPI="2"

KMNAME="kdebindings"
KMMODULE="python/${PN}"
OPENGL_REQUIRED="always"
PYTHON_USE_WITH="threads"
inherit python kde4-meta

DESCRIPTION="Python bindings for KDE4"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="akonadi debug examples policykit semantic-desktop"

# blocker added due to compatibility issues and error during compile time
DEPEND="
	!dev-python/pykde
	>=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X]
	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
	akonadi? ( $(add_kdebase_dep kdepimlibs) )
	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
"
RDEPEND="${DEPEND}"

PATCHES=(
	"${FILESDIR}"/${PN}-4.3.5-fix-pykdeuic4.patch
)

pkg_setup() {
	python_pkg_setup
	kde4-meta_pkg_setup
}

src_prepare() {
	kde4-meta_src_prepare

	if ! use examples; then
		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \
			|| die "Failed to disable examples"
	fi
}

src_configure() {
	mycmakeargs="${mycmakeargs}
		-DWITH_QScintilla=OFF
		$(cmake-utils_use_with semantic-desktop Soprano)
		$(cmake-utils_use_with semantic-desktop Nepomuk)
		$(cmake-utils_use_with akonadi)
		$(cmake-utils_use_with akonadi KdepimLibs)
		$(cmake-utils_use_with policykit PolkitQt)
	"

	kde4-meta_src_configure
}

src_install() {
	kde4-meta_src_install

	python_version
	rm -f \
		"${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co] \
		"${D}${PREFIX}"/share/apps/"${PN}"/*.py[co]
}

pkg_postinst() {
	kde4-meta_pkg_postinst

	python_mod_optimize ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4

	if use examples; then
		echo
		elog "PyKDE4 examples have been installed to"
		elog "${PREFIX}/share/apps/${PN}/examples"
		echo
	fi
}

pkg_postrm() {
	kde4-meta_pkg_postrm

	python_mod_cleanup ${ROOT}"usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4
}