Add kde use flag and related patch to handle pykde4 automagic dependency

Package-Manager: portage-2.2_rc58/cvs/Linux x86_64

4 files changed, 211 insertions, 2 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index fa83262d0191..f5a5482763a1 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/eric
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.99 2009/12/12 22:10:23 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.100 2009/12/13 18:00:14 hwoarang Exp $
+
+*eric-4.3.10-r1 (13 Dec 2009)
+
+  13 Dec 2009; Markos Chandras <hwoarang@gentoo.org> +eric-4.3.10-r1.ebuild,
+  +files/eric-4.3-no-pykde.patch:
+  Add kde use flag and related patch to handle pykde4 automagic dependency
 
 *eric-4.3.10 (12 Dec 2009)
 
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 392b10b04f6b..d2cffee8b7cf 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,4 +1,5 @@
 AUX 4.2.3-no-interactive.patch 958 RMD160 0f96217e49cd30e042315b73fe39afc827006cce SHA1 4c4784ebe9b58f8de62f33b6f4c30f131a0fd6cf SHA256 a947414abd6176809b258e885fbe80ec54f1fe1c2e2c621cc65e5483a9d19eee
+AUX eric-4.3-no-pykde.patch 3667 RMD160 49938766d7027433c2f6988edcef163fe159a260 SHA1 fa2927272ee02f85a28b561087d1bcc7dfe65b7b SHA256 fc77938c3f116fc339979938dc08c151ffcee5f7435021c09a6c33d2f9151f5d
 DIST eric4-4.3.1.tar.gz 5132500 RMD160 719a955bb1d2f64efb3e9958a63bb3f4313d1423 SHA1 58d6c8cf1cb9acbfeab634a165cdee731fe4a257 SHA256 463b82e1f226d0f5b76e5b6e4158e9518f88a6f7f751963a87d9587b423ff9a1
 DIST eric4-4.3.10.tar.gz 4930563 RMD160 7815090c7829a4e47395fc6659865f6c14dc8c64 SHA1 afde40a05d51d41bd7e9aa5bbdcbf04cf99b6b3a SHA256 aee1da03f4f1b1f1170d9190708c9e58336bc8036e3e12fa7941e89a41b7bd76
 DIST eric4-4.3.8.tar.gz 4921477 RMD160 7505423c93fdccc28c166d720a7d523a499e1ccc SHA1 e9479c09fba9b82068fa304cd07be13a34a75e26 SHA256 d4ccb99d92764d36f49d15c8075ed918b7f489af09fe369e724223a844514b3c
@@ -31,8 +32,9 @@ DIST eric4-i18n-zh_CN.GB2312-4.3.10.tar.gz 370574 RMD160 34477924e9e82859ce78d2a
 DIST eric4-i18n-zh_CN.GB2312-4.3.8.tar.gz 370570 RMD160 c4325fbaed7129e15bf75558e605a3b4736d0d7a SHA1 53d5793b4db8da779da93499f7a0631f4b241ee9 SHA256 05741dcdbaf5b3513b3a66a4baf60a92b2a0735d3f091539e769b75d76174c92
 DIST eric4-i18n-zh_CN.GB2312-4.3.9.tar.gz 370571 RMD160 ecb82b88d3d9b2b3be429b0e45db6ce197ab3092 SHA1 af0abbea9ac348a17eb54a2e40e56c79d42e506f SHA256 4b6b03691112e9e21fdb83b127766aa894bc1dc57675a8206cccef045160bd8c
 EBUILD eric-4.3.1.ebuild 2363 RMD160 c5f66997de9e963377706b06af863827d4901c7a SHA1 0a43987f730b69552230929ec064cd4b296ca135 SHA256 b82721ba89294521aff5cc99a36440ccc77d260f04b22f22ba8e0e2c53d2327e
+EBUILD eric-4.3.10-r1.ebuild 2569 RMD160 d7fec406989b7c16aeb94de1048cf41123918df4 SHA1 8962652fd774b0a0fd95a29bf2a95f1da57f35f3 SHA256 5cfc5cf9ec142dbd5fc453cdde9929a3a754e83207bf69e405e1ead1ed4a95a7
 EBUILD eric-4.3.10.ebuild 2476 RMD160 83169eba5b344e399433d3faeae5f6205a160e26 SHA1 fe85bce5c55a758378b3cce49a9809cd7f74b11b SHA256 a53bf914fb784f3cd1918c744f71814bd046c0ba84e87e74a5ac83aaad9ccec6
 EBUILD eric-4.3.8.ebuild 2463 RMD160 b0ddbab0c181973e9edb6ff8189c82223906eada SHA1 de6b2a2320fca73719d4e9a731bebbb134c257f4 SHA256 99bc54d467531eae24535606add61a2ecfe04b916d2073359f0e80db7db671b9
 EBUILD eric-4.3.9.ebuild 2467 RMD160 591c4489c2d062c68bfe0faf062ef2d9feae1ebb SHA1 5d11e9f71c1bf7ae8ccb2d5106f8e667c9213f69 SHA256 ca8fe9365077fec9881aaa98025bd2d1ce7019351ed6ebd2df1d03d6bfa05a0b
-MISC ChangeLog 12894 RMD160 6b0d228d9a1e8e4a1c6e901fb28510204dfcecee SHA1 f5185570e653b3637495bcd103b9ed20f597f1c1 SHA256 4533b0dcc6e4c5e9f8f2988d9a03614f6ba28a61f775d3a5ab1ab8070429f87d
+MISC ChangeLog 13113 RMD160 b47fbb8b37ffcf83eb1b018fe6baaece6b116d53 SHA1 7fe93aa845924604d7c4a2994c3e667c159b0171 SHA256 e3311c97e737d3de7db0a76e3392ba0f0f397cc559cf3eca9a840efed3fa30af
 MISC metadata.xml 179 RMD160 887c899594fdaa3d82028c3d84188354d3784cd9 SHA1 551c6b2378ff31eadc1e4860211ec8709ce960bd SHA256 1fbdee58e0ba0f8730f6a27979cb7eeed8ebd3afa316d61b34a5f4893291a646
diff --git a/dev-util/eric/eric-4.3.10-r1.ebuild b/dev-util/eric/eric-4.3.10-r1.ebuild
new file mode 100644
index 000000000000..e13446f2c93c
--- /dev/null
+++ b/dev-util/eric/eric-4.3.10-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.10-r1.ebuild,v 1.1 2009/12/13 18:00:14 hwoarang Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python
+
+MY_PN=${PN}4
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="A full featured Python IDE that is written in PyQt4 using the QScintilla editor widget"
+HOMEPAGE="http://eric-ide.python-projects.org/index.html"
+SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz
+	linguas_cs? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-cs-${PV}.tar.gz )
+	linguas_de? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-de-${PV}.tar.gz )
+	linguas_es? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-es-${PV}.tar.gz )
+	linguas_fr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-fr-${PV}.tar.gz )
+	linguas_ru? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-ru-${PV}.tar.gz )
+	linguas_tr? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-tr-${PV}.tar.gz )
+	linguas_zh_CN? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-zh_CN.GB2312-${PV}.tar.gz )"
+
+SLOT="4"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="kde linguas_cs linguas_de linguas_es linguas_fr linguas_ru linguas_tr"
+
+DEPEND="dev-python/PyQt4[svg,webkit,X]
+	>=dev-python/qscintilla-python-2.2[qt4]
+	kde? ( kde-base/pykde4 )"
+RDEPEND="${DEPEND}"
+RESTRICT_PYTHON_ABIS="3.*"
+
+S=${WORKDIR}/${MY_P}
+
+LANGS="cs de es fr ru tr"
+
+python_version
+
+src_prepare() {
+	epatch "${FILESDIR}/4.2.3-no-interactive.patch"
+	! use kde && epatch "${FILESDIR}"/${PN}-4.3-no-pykde.patch
+}
+
+src_install() {
+	# Change qt dir to be located in ${D}
+	dodir /usr/share/qt4
+
+	installation() {
+		"$(PYTHON)" install.py \
+			-z \
+			-b "/usr/bin" \
+			-i "${D}" \
+			-d "$(python_get_sitedir)" \
+			-c
+	}
+	python_execute_function installation
+
+	python_version
+	make_desktop_entry "eric4 --nosplash" \
+			eric4 \
+			"/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
+			"Development;IDE;Qt"
+}
+
+pkg_postinst() {
+	python_mod_optimize eric4{,config.py,plugins}
+
+	elog
+	elog "If you want to use eric4 with mod_python, have a look at"
+	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
+	elog
+	elog "The following packages will give eric extended functionality:"
+	elog "  dev-python/pylint"
+	elog "  dev-python/pysvn"
+	elog
+	elog "This version has a plugin interface with plugin-autofetch from"
+	elog "the App itself. You may want to check those as well."
+	elog
+}
+
+pkg_postrm() {
+	python_mod_cleanup eric4{,config.py,plugins}
+}
diff --git a/dev-util/eric/files/eric-4.3-no-pykde.patch b/dev-util/eric/files/eric-4.3-no-pykde.patch
new file mode 100644
index 000000000000..1765bb68839c
--- /dev/null
+++ b/dev-util/eric/files/eric-4.3-no-pykde.patch
@@ -0,0 +1,117 @@
+Index: eric4-4.3.10/eric/eric4.py
+===================================================================
+--- eric4-4.3.10.orig/eric/eric4.py
++++ eric4-4.3.10/eric/eric4.py
+@@ -31,13 +31,12 @@ restartArgsList = ["--nokde", "--nosplas
+ restartArgs = [arg for arg in sys.argv[1:] if arg.split("=", 1)[0] in restartArgsList]
+ 
+ # disable the usage of KDE widgets, if requested
+-sys.e4nokde = False
++sys.e4nokde = True
+ if "--nokde" in sys.argv:
+     del sys.argv[sys.argv.index("--nokde")]
+     sys.e4nokde = True
+ else:
+-    sys.e4nokde = os.getenv("e4nokde") is not None and os.getenv("e4nokde") == "1"
+-
++	print "PyKDE support is disabled. Enable 'kde' useflag to bring it back"
+ # make ThirdParty package available as a packages repository
+ try:
+     import pygments
+Index: eric4-4.3.10/eric/KdeQt/__init__.py
+===================================================================
+--- eric4-4.3.10.orig/eric/KdeQt/__init__.py
++++ eric4-4.3.10/eric/KdeQt/__init__.py
+@@ -20,19 +20,6 @@ import sys
+ import Preferences
+ 
+ if Preferences.getUI("UseKDEDialogs") and not sys.e4nokde:
+-    try:
+-        import PyKDE4
+-        from PyQt4.QtCore import QString
+-        
+-        def __kdeIsKDE():
+-            """
+-            Public function to signal the availability of KDE4.
+-            
+-            @return availability flag (always True)
+-            """
+-            return True
+-        
+-    except (ImportError, RuntimeError):
+         sys.e4nokde = True
+ 
+ def __kdeKdeVersionString():
+@@ -56,25 +43,6 @@ def __kdeKdeVersionString():
+         return QString("unknown")
+     
+ def __kdePyKdeVersionString():
+-    """
+-    Public function to return the PyKDE4 version as a string.
+-    
+-    @return PyKDE4 version as a string (QString)
+-    """
+-    try:
+-        try:
+-            from PyKDE4.kdecore import pykde_versionMajor, pykde_versionMinor, \
+-                                       pykde_versionRelease
+-            return QString("%d.%d.%d" % \
+-                (pykde_versionMajor(), pykde_versionMinor(), 
+-                 pykde_versionRelease()))
+-        except (ImportError, AttributeError):
+-            from PyKDE4 import pykdeconfig
+-            try:
+-                return QString(pykdeconfig.Configuration().pykde_version_str)
+-            except:
+-                return QString("unknown")
+-    except ImportError:
+         return QString("unknown")
+     
+ from PyQt4.QtCore import QString
+@@ -106,46 +74,13 @@ def __qtPyKdeVersionString():
+ ################################################################################
+ 
+ def isKDEAvailable():
+-    """
+-    Public function to signal the availability of KDE.
+-    
+-    @return availability flag (always False)
+-    """
+-    try:
+-        import PyKDE4
+-        return True
+-    except ImportError:
+         return False
+ 
+ def isKDE():
+-    """
+-    Public function to signal, if KDE usage is enabled.
+-    
+-    @return KDE support flag (always False)
+-    """
+-    if Preferences.getUI("UseKDEDialogs") and not sys.e4nokde:
+-        return __kdeIsKDE()
+-    else:
+         return __qtIsKDE()
+     
+ def kdeVersionString():
+-    """
+-    Public function to return the KDE version as a string.
+-    
+-    @return KDE version as a string (QString) (always empty)
+-    """
+-    if isKDEAvailable():
+-        return __kdeKdeVersionString()
+-    else:
+         return __qtKdeVersionString()
+     
+ def pyKdeVersionString():
+-    """
+-    Public function to return the PyKDE version as a string.
+-    
+-    @return PyKDE version as a string (QString) (always empty)
+-    """
+-    if isKDEAvailable():
+-        return __kdePyKdeVersionString()
+-    else:
+         return __qtPyKdeVersionString()