Cleanup

Package-Manager: portage-2.1.3_rc5

3 files changed, 42 insertions, 29 deletions

diff --git a/net-nds/luma/ChangeLog b/net-nds/luma/ChangeLog
index efd21008bdd1..42f352136fae 100644
--- a/net-nds/luma/ChangeLog
+++ b/net-nds/luma/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nds/luma
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/luma/ChangeLog,v 1.26 2007/02/21 18:35:49 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/luma/ChangeLog,v 1.27 2007/06/23 11:21:59 dev-zero Exp $
+
+  23 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> luma-2.3.ebuild:
+  Cleanup
 
   21 Feb 2007; Lukasz Strzygowski <lucass@gentoo.org>
   files/digest-luma-2.1.3, files/digest-luma-2.2.1, Manifest:
diff --git a/net-nds/luma/Manifest b/net-nds/luma/Manifest
index b9cce3551210..eedbc3293b7e 100644
--- a/net-nds/luma/Manifest
+++ b/net-nds/luma/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST luma-2.1.3.tar.bz2 574532 RMD160 ff49e4cd397eef620b86f92c1a1c4847b787d498 SHA1 23a6aa6282cfaf90c6715b23af7d0ad722badee0 SHA256 00a9f3c9257859b86f7e27782f6bb2aca53e7970310789c74f9ef3dca4b245f3
 DIST luma-2.2.1.tar.bz2 656788 RMD160 1f83569ccd6dfa2ec50e235ca73423c23e4bad90 SHA1 58eb188e9c5dbc7061fe2763eea775175ee11fc5 SHA256 f7cc7b4827bb086fd2b12802e5532cf8c7d3065bc19c89e482bdf4e2d1350517
 DIST luma-2.3.tar.bz2 648383 RMD160 434291342dc5fb7ed4981211c383dd78e5f7d3d3 SHA1 c6641ddd6689f3c02086ce500ee5799b873eeaab SHA256 46c36e900357a32ec82decbc7adfc48218bd964f8eef0032aa2c13b15cd81c54
@@ -12,14 +9,14 @@ EBUILD luma-2.2.1.ebuild 1128 RMD160 09f3005df95e909e2d85f0e2917c1d656eb32802 SH
 MD5 ed3ebe6e6f992050db0e0b1ffce7e33e luma-2.2.1.ebuild 1128
 RMD160 09f3005df95e909e2d85f0e2917c1d656eb32802 luma-2.2.1.ebuild 1128
 SHA256 b05cb83ba3729491cfc8c477498645102d4ec49cb20177cdf388bdc346b3ab7d luma-2.2.1.ebuild 1128
-EBUILD luma-2.3.ebuild 1122 RMD160 62cb2ec75b197748a74c3e56f11215e566b2f064 SHA1 731b16af61e6541d101cfa826a9110d618aabe49 SHA256 2dcdeab80ac9b5503498607a970495002f627aab46b1037176810c41c1a69256
-MD5 e7a2beb0b6bbf5c199a169eec51d7b30 luma-2.3.ebuild 1122
-RMD160 62cb2ec75b197748a74c3e56f11215e566b2f064 luma-2.3.ebuild 1122
-SHA256 2dcdeab80ac9b5503498607a970495002f627aab46b1037176810c41c1a69256 luma-2.3.ebuild 1122
-MISC ChangeLog 3093 RMD160 cf76087f88024e16a2e5c9c162ae2020f2dbc7ed SHA1 a7a612c4e8879f6bfb984e4faa3a34fb860d120c SHA256 a23562498f40ac011e81d5afbc7f4e9a328efdbdf2b06d646c7aff05442d7774
-MD5 ce4ad186dce936635eef7b32cb91b401 ChangeLog 3093
-RMD160 cf76087f88024e16a2e5c9c162ae2020f2dbc7ed ChangeLog 3093
-SHA256 a23562498f40ac011e81d5afbc7f4e9a328efdbdf2b06d646c7aff05442d7774 ChangeLog 3093
+EBUILD luma-2.3.ebuild 1371 RMD160 2255dc4b87801b338cb4cc24b98f385c313add3d SHA1 3f30fa7f1f5fffb922e51ce210f53dcbea853e93 SHA256 2461adc9ab9f0bdca8cb8f864e149f0e1a33147f6f8f2b63c452246799133e2c
+MD5 7da221c2edfa0e853b35ff3f86529fd2 luma-2.3.ebuild 1371
+RMD160 2255dc4b87801b338cb4cc24b98f385c313add3d luma-2.3.ebuild 1371
+SHA256 2461adc9ab9f0bdca8cb8f864e149f0e1a33147f6f8f2b63c452246799133e2c luma-2.3.ebuild 1371
+MISC ChangeLog 3176 RMD160 b63c5c06665f6d96d67b5bcf4b9ed5bd02d27e27 SHA1 1217011e83fb3a914c39e5de85042dc708d6ac64 SHA256 bdd95cf329182091c9c17fa630d4104ef76f36ff8114b5253a09b6cffe2a7bde
+MD5 6dd1c354dd26083c078891280a93aae7 ChangeLog 3176
+RMD160 b63c5c06665f6d96d67b5bcf4b9ed5bd02d27e27 ChangeLog 3176
+SHA256 bdd95cf329182091c9c17fa630d4104ef76f36ff8114b5253a09b6cffe2a7bde ChangeLog 3176
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 metadata.xml 175
@@ -33,10 +30,3 @@ SHA256 db884a84ece851b8c2736fca6ed06ccaf7a4a3fa7283f64b0e41665c88a4c124 files/di
 MD5 3f17ff37f6004a00a5518494137a552d files/digest-luma-2.3 229
 RMD160 11b9c477267c71130dc04a88f4ce9c9205c34be0 files/digest-luma-2.3 229
 SHA256 61b0b700fefd6c334e26155bf3e1bfa4587121e7518857f083cbedc7cdf2a615 files/digest-luma-2.3 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF3JES2jLqHNfbg2URAtfBAKCIIzLzvbKdg9w0KSuENfZ3+mhsSQCgsJn5
-g5yqZ9YuJewVRmfRCB4PS3U=
-=Ew+C
------END PGP SIGNATURE-----
diff --git a/net-nds/luma/luma-2.3.ebuild b/net-nds/luma/luma-2.3.ebuild
index abf112ebeb21..8de7547f2ab4 100644
--- a/net-nds/luma/luma-2.3.ebuild
+++ b/net-nds/luma/luma-2.3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/luma/luma-2.3.ebuild,v 1.1 2006/03/16 17:27:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/luma/luma-2.3.ebuild,v 1.2 2007/06/23 11:21:59 dev-zero Exp $
 
-inherit eutils qt3
+NEED_PYTHON=2.3
+
+inherit eutils python qt3
 
 DESCRIPTION="Luma is a graphical utility for accessing and managing data stored on LDAP servers."
 HOMEPAGE="http://luma.sourceforge.net/"
@@ -14,15 +16,20 @@ KEYWORDS="~ppc ~sparc ~x86 ~amd64"
 IUSE="samba"
 
 RDEPEND="$(qt_min_version 3.2)
-	>=dev-lang/python-2.3
-	>=dev-python/PyQt-3.10
-	>=dev-python/python-ldap-2.0.1
-	samba? ( >=dev-python/py-smbpasswd-1.0 )"
-DEPEND="$(qt_min_version 3.2)
-	>=dev-lang/python-2.3
 	>=dev-python/PyQt-3.10
 	>=dev-python/python-ldap-2.0.1
 	samba? ( >=dev-python/py-smbpasswd-1.0 )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# We do the optimization seperately
+	sed -i \
+		-e '/^doCompile/d' \
+		install.py || "sed failed"
+}
 
 src_install() {
 	# if $QTDIR/etc/settings/qtrc file exists, the qt build tools try to create
@@ -30,6 +37,19 @@ src_install() {
 	addpredict "$QTDIR/etc/settings"
 
 	dodir /usr
-	python install.py --prefix=${D}/usr
+
+	python_version
+	${python} install.py --prefix="${D}/usr"
 	make_desktop_entry "luma" Luma "/usr/share/luma/icons/luma-128.png" "System;Qt"
 }
+
+# Maintainer-Info:
+# Luma installs it's stuff to /usr/lib/luma, even on 64bit-systems.
+
+pkg_postinst() {
+	python_mod_optimize "${ROOT}/usr/lib/luma"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${ROOT}/usr/lib/luma"
+}