Add X use dep for PyQt4, bug 272189. Version bump, with some optimizations in the ebuild.

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

5 files changed, 92 insertions, 7 deletions

diff --git a/x11-misc/treeline/ChangeLog b/x11-misc/treeline/ChangeLog
index 3dbb61241073..5f83ebf3b5e9 100644
--- a/x11-misc/treeline/ChangeLog
+++ b/x11-misc/treeline/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/treeline
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/treeline/ChangeLog,v 1.36 2009/03/16 11:58:54 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/treeline/ChangeLog,v 1.37 2009/06/06 18:24:44 yngwin Exp $
+
+*treeline-1.2.3 (06 Jun 2009)
+
+  06 Jun 2009; Ben de Groot <yngwin@gentoo.org> treeline-1.2.2.ebuild,
+  +treeline-1.2.3.ebuild, +files/treeline-1.2.3-nocompile.patch:
+  Add X use dep for PyQt4, bug 272189. Version bump, with some optimizations
+  in the ebuild.
 
 *treeline-1.2.2 (16 Mar 2009)
 
diff --git a/x11-misc/treeline/Manifest b/x11-misc/treeline/Manifest
index f314319e20db..bd70d8fd7d28 100644
--- a/x11-misc/treeline/Manifest
+++ b/x11-misc/treeline/Manifest
@@ -1,8 +1,12 @@
+AUX treeline-1.2.3-nocompile.patch 605 RMD160 590d0ef89f0e2407c157b9f407cecbf4fea82517 SHA1 71569bfdd8de91bdab711f8072384bb63bf5a9ed SHA256 3f988b01f5234f69fd5735d37a86547a7145bbbfe03938c2ea99e54f300933e5
 DIST treeline-1.0.2.tar.gz 332001 RMD160 ab0e0b2d6e4eb236c39f83fe1a93112702a2712a SHA1 2b1873ba32baa0554efc4331d10d0bf3164f3236 SHA256 df6cc44842eadfd01e73037a6b611088bc19f44cbbe4e78844ad9638fbda4104
 DIST treeline-1.2.2.tar.gz 478460 RMD160 864878468ed66f8a8b7d3538cc26691fb23edef3 SHA1 477456e058b60f58d915cb9cf183a452f6f5323b SHA256 3f7a9675768bbab05ee5e837c5d3a99c1d19496ccf7a094dd8bb090cda4ae88b
+DIST treeline-1.2.3.tar.gz 478755 RMD160 72dea37eabedb595ca6c690d98f8b2b8aec74a1d SHA1 fae4e0511422c7bdcb3d26b31e3cebaec5446774 SHA256 673db9e63869b3f711d6c3604c7a3fd40be9c59fb474fbe6d6b974900d36c2ca
 DIST treeline-i18n-1.0.2a.tar.gz 470942 RMD160 1eecb186adf6b6c4639f23afebc23ea73281fb32 SHA1 89e01a4234e3abe6d18a30ace70458eb5fd6c1b7 SHA256 88a7e0132ba6659efe3fc81bfb17d6d0e1237b1574b195fd98bc5eb2b7444710
 DIST treeline-i18n-1.2.2a.tar.gz 281896 RMD160 437c60155e09277248d77d25c62587803f5334b8 SHA1 64ea1fa1cc68c4d7f049dad368bff2a945556bb8 SHA256 c473ee8c3874f3cf881314f784f0249a657a039d9064c64f23df804964e14adc
+DIST treeline-i18n-1.2.3a.tar.gz 281892 RMD160 ca677b69b01705fc3f5bc70848946dd74b3c9dd9 SHA1 dfe0b595b85eaf9ea4e0639812e1fcf9bcd5abf0 SHA256 10a7e074d448c317db6b6b33a3d7b9a9b3e5e32b15196ed1af0b3e3a60933eb3
 EBUILD treeline-1.0.2.ebuild 1495 RMD160 4781925f3000c281fd91082776d7ef426a1ecf97 SHA1 06a38a4fc2490697a518c72908ee9c7ea726be7e SHA256 8b60e6ab14b8364c36237d6c8558e79f14edab978da9b4e71787a530f60f0614
-EBUILD treeline-1.2.2.ebuild 1144 RMD160 58d9f57b7b9315a1d93e77febfb5cd9df2669829 SHA1 0fa0f4f6d2d6fb0984468b59daf8fe8f58e8edd3 SHA256 514b78d51d94570b5e63509a4789dbf207cf409d8eaa42719e0ce7a32eef810a
-MISC ChangeLog 5009 RMD160 64d22a6831c8fba27d4fe9772e74d938af9b631f SHA1 e5a8fe01e706740ed7b331a22606664c11fbcf14 SHA256 ad2dc33712a43e6fc45013bc73cc3fbe0706717c7de3463a686cb2c6a8ff0d36
+EBUILD treeline-1.2.2.ebuild 1160 RMD160 a86ade6784088f604a10ea3d78419abd6fbc84e5 SHA1 f210e6745d925e8ef90fd2690bfa78ef0a5cd96b SHA256 078ee0e69ec6ce3951741861922968a31932bb63a9141c402b79ed33d9bbe47a
+EBUILD treeline-1.2.3.ebuild 1538 RMD160 5f835218d936be3b008b410c9eb71eeec752b74d SHA1 72fcb2feef7da542d576075ee68251e946566ba3 SHA256 c8d069d543bd7f3cc1ffcf9602961fd0f31e92ebae2086c1fed4ef354a730bc2
+MISC ChangeLog 5274 RMD160 5a9451c471cba389dc21cb1116b746d039b29991 SHA1 b676dca8f6f91cbca69c090e01bdf946d7bbccf4 SHA256 c7d83ea6c839184115182b2950eaabc8007e7aeec4ed88976260f29ac2862677
 MISC metadata.xml 231 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 SHA1 f78294e25f7fd11c0954f753892ece303fc491b3 SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a
diff --git a/x11-misc/treeline/files/treeline-1.2.3-nocompile.patch b/x11-misc/treeline/files/treeline-1.2.3-nocompile.patch
new file mode 100644
index 000000000000..297a926d9091
--- /dev/null
+++ b/x11-misc/treeline/files/treeline-1.2.3-nocompile.patch
@@ -0,0 +1,12 @@
+--- install.py.orig	2009-06-06 19:21:00.000000000 +0200
++++ install.py	2009-06-06 19:26:28.000000000 +0200
+@@ -230,7 +230,8 @@
+     pythonBuildDir = os.path.join(buildRoot, pythonPrefixDir[1:])
+ 
+     if os.path.isdir('source'):
+-        compileall.compile_dir('source', ddir=os.path.join(prefixDir, 'source'))
++        # don't compile, let our eclass handle that
++        # compileall.compile_dir('source', ddir=os.path.join(prefixDir, 'source'))
+         print 'Installing files...'
+         print '  Copying python files to %s' % pythonBuildDir
+         removeDir(pythonBuildDir)         # remove old?
diff --git a/x11-misc/treeline/treeline-1.2.2.ebuild b/x11-misc/treeline/treeline-1.2.2.ebuild
index f03b0709c58b..7278f9ba138a 100644
--- a/x11-misc/treeline/treeline-1.2.2.ebuild
+++ b/x11-misc/treeline/treeline-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/treeline/treeline-1.2.2.ebuild,v 1.2 2009/03/17 06:27:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/treeline/treeline-1.2.2.ebuild,v 1.3 2009/06/06 18:24:44 yngwin Exp $
 
 EAPI=2
 inherit python
@@ -22,7 +22,8 @@ done
 
 DEPEND="spell? ( || ( app-text/aspell app-text/ispell ) )
 	>=dev-lang/python-2.3[xml]
-	>=dev-python/PyQt4-4.1"
+	dev-python/PyQt4[X]"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/TreeLine
 
@@ -30,7 +31,7 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	for lang in ${LANGS}; do
 		if use linguas_${lang}; then
-			tar xozf ${DISTDIR}/${PN}-i18n-${PV}a.tar.gz \
+			tar xozf "${DISTDIR}"/${PN}-i18n-${PV}a.tar.gz \
 				TreeLine/doc/{readme_${lang}.trl,README_${lang}.html} \
 				TreeLine/translations/{treeline_${lang}.{qm,ts},qt_${lang}.{qm,ts}} || die
 		fi
diff --git a/x11-misc/treeline/treeline-1.2.3.ebuild b/x11-misc/treeline/treeline-1.2.3.ebuild
new file mode 100644
index 000000000000..42521e0e4a72
--- /dev/null
+++ b/x11-misc/treeline/treeline-1.2.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/treeline/treeline-1.2.3.ebuild,v 1.1 2009/06/06 18:24:44 yngwin Exp $
+
+EAPI=2
+NEED_PYTHON="2.4"
+PYTHON_USE_WITH="xml"
+
+inherit eutils python
+
+DESCRIPTION="TreeLine is a structured information storage program."
+HOMEPAGE="http://treeline.bellz.org/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="spell"
+
+LANGS="de fr"
+for lang in ${LANGS}; do
+	IUSE="${IUSE} linguas_${lang}"
+	SRC_URI="${SRC_URI} linguas_${lang}? ( mirror://berlios/${PN}/${PN}-i18n-${PV}a.tar.gz )"
+done
+
+DEPEND="spell? ( || ( app-text/aspell app-text/ispell ) )
+	dev-python/PyQt4[X]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/TreeLine"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	for lang in ${LANGS}; do
+		if use linguas_${lang}; then
+			tar xozf "${DISTDIR}"/${PN}-i18n-${PV}a.tar.gz \
+				TreeLine/doc/{readme_${lang}.trl,README_${lang}.html} \
+				TreeLine/translations/{treeline_${lang}.{qm,ts},qt_${lang}.{qm,ts}} || die
+		fi
+	done
+}
+
+src_prepare() {
+	# let's leave compiling to python_mod_optimize
+	epatch "${FILESDIR}"/${P}-nocompile.patch
+
+	# install into proper python site-packages dir
+	sed -i "s;prefixDir, 'lib;'$(python_get_sitedir);" install.py || die 'sed failed'
+}
+
+src_install() {
+	"${python}" install.py -x -p /usr/ -d /usr/share/${PF} -b "${D}"
+}
+
+pkg_postinst() {
+	python_mod_optimize "$(python_get_sitedir)/${PN}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}