Added doc/examples use-flags. Cleanup.

Package-Manager: portage-2.1.3_rc4

3 files changed, 41 insertions, 21 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index aa096ce141dd..86c21cd2af2a 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/eric
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.43 2007/06/23 12:29:09 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.44 2007/06/23 21:07:44 lucass Exp $
+
+  23 Jun 2007; Lukasz Strzygowski <lucass@gentoo.org> eric-3.9.5.ebuild:
+  Added doc/examples use-flags. Cleanup.
 
 *eric-3.9.5 (23 Jun 2007)
 
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 4b88df5d3dc3..952385b69acd 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.9.5-disable_compilation.patch 3017 RMD160 cd93973f117235af31082b6c1ccce70575ec3d92 SHA1 c1f6ad2d35f8235e59f8c72c68b165ee089981c2 SHA256 2d2d797f28d4c654ba1087cea1aa770584682541e726f83f1a5124817429eca9
 MD5 716fa7bf47b5594d9248d9a019e22864 files/3.9.5-disable_compilation.patch 3017
 RMD160 cd93973f117235af31082b6c1ccce70575ec3d92 files/3.9.5-disable_compilation.patch 3017
@@ -22,14 +25,14 @@ EBUILD eric-3.9.4.ebuild 1546 RMD160 1b8c047c624eaa56e265cdf753ffdcfa63c51c49 SH
 MD5 116f9949d93e02d86b8c556755b3344d eric-3.9.4.ebuild 1546
 RMD160 1b8c047c624eaa56e265cdf753ffdcfa63c51c49 eric-3.9.4.ebuild 1546
 SHA256 a0ce393ca1be93fca9129bc0a5526bf41802068532747499dae997eed4175497 eric-3.9.4.ebuild 1546
-EBUILD eric-3.9.5.ebuild 2605 RMD160 9e1e0c8e154d7aabdf06d926a050519d5c9f78f8 SHA1 18e073d03a13bb8320a3c8988e0b5a8e04fa4a03 SHA256 f8537027f3bfd3885221fcd8d0b4526fe411af17c20df645da82750d23ce01b0
-MD5 0010174bb643eec5315fd8959fc96282 eric-3.9.5.ebuild 2605
-RMD160 9e1e0c8e154d7aabdf06d926a050519d5c9f78f8 eric-3.9.5.ebuild 2605
-SHA256 f8537027f3bfd3885221fcd8d0b4526fe411af17c20df645da82750d23ce01b0 eric-3.9.5.ebuild 2605
-MISC ChangeLog 5205 RMD160 d83940286382f56521987e6bb76915e33a1ba8cf SHA1 6b9a00a9e08309c07bf82924e922cc5ea65bdb52 SHA256 ad804c395fd2badbd4bb6a4cf209989309e3e55c86f729d00dbb1911d3eea0ff
-MD5 4dade1701625022f3a33273ab50f3250 ChangeLog 5205
-RMD160 d83940286382f56521987e6bb76915e33a1ba8cf ChangeLog 5205
-SHA256 ad804c395fd2badbd4bb6a4cf209989309e3e55c86f729d00dbb1911d3eea0ff ChangeLog 5205
+EBUILD eric-3.9.5.ebuild 2578 RMD160 a3770a35d79a17030b0cb8b949c2ae6eb67f3b1b SHA1 08d6fb10b6e3a1a4ffdcf18968be4900caddf1b8 SHA256 1058ebcae3a9b95003796cd87654a5883681b3df0d03c7320642e49d50e94277
+MD5 31a854ca77fa094f5aac744748a60f6f eric-3.9.5.ebuild 2578
+RMD160 a3770a35d79a17030b0cb8b949c2ae6eb67f3b1b eric-3.9.5.ebuild 2578
+SHA256 1058ebcae3a9b95003796cd87654a5883681b3df0d03c7320642e49d50e94277 eric-3.9.5.ebuild 2578
+MISC ChangeLog 5318 RMD160 a2d3f32b4b31e60056b411dee3a95e24cfac6f36 SHA1 0bddd4e9ac961bcb9aabea41e277a23bf013b94a SHA256 7ccd9a5479f338b33cdee46efc5f5b957eba5cf22f792b6c297e86463a46094b
+MD5 abf94f82840c893be2656cc05bc9d7c1 ChangeLog 5318
+RMD160 a2d3f32b4b31e60056b411dee3a95e24cfac6f36 ChangeLog 5318
+SHA256 7ccd9a5479f338b33cdee46efc5f5b957eba5cf22f792b6c297e86463a46094b ChangeLog 5318
 MISC metadata.xml 175 RMD160 220bb3f470a506fe50312f4b69c2e5df90b7c282 SHA1 a17b5760bd5ecd4be11ca0a15698fc6d3f3cc76e SHA256 815ada75b169c0b450bdb3429137e6edd42429656bb6369d42e89fd652bdf7c2
 MD5 56ad59727dbcdbf30e7ed8282d3913e5 metadata.xml 175
 RMD160 220bb3f470a506fe50312f4b69c2e5df90b7c282 metadata.xml 175
@@ -43,3 +46,10 @@ SHA256 974634bba00a8aa9f4a257e95f38f796419a48bb49f6a0acfa46dc92fea4226c files/di
 MD5 0d1758f4c30fdf274569ebbd2a514557 files/digest-eric-3.9.5 1003
 RMD160 d98ce371bfcc3e13dbfdf6b694ae3c64e708477d files/digest-eric-3.9.5 1003
 SHA256 efdc6d9d5bc02435ff0b3051dda2b6345a85e82e9e6a41e40e8504fabc71da0b files/digest-eric-3.9.5 1003
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGfYuu2jLqHNfbg2URAssHAKDPg7eT65/OjO7XJ2fd7nQWFZV9agCgo9u1
+i4+Pv2YeRbkDG1/o/A+K1fg=
+=IuYQ
+-----END PGP SIGNATURE-----
diff --git a/dev-util/eric/eric-3.9.5.ebuild b/dev-util/eric/eric-3.9.5.ebuild
index 78414cb5dcbf..d256d4f4394a 100644
--- a/dev-util/eric/eric-3.9.5.ebuild
+++ b/dev-util/eric/eric-3.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.9.5.ebuild,v 1.1 2007/06/23 12:29:09 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.9.5.ebuild,v 1.2 2007/06/23 21:07:44 lucass Exp $
 
 NEED_PYTHON=2.3
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/eric-ide/${P}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="idl"
+IUSE="doc examples idl"
 
 DEPEND=">=dev-python/PyQt-3.13
 	>=dev-python/pyxml-0.8.4
@@ -30,16 +30,22 @@ LANGS="de fr ru"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${FILESDIR}/${PV}-disable_compilation.patch"
+
+	use doc || rm -rf eric/Documentation/Source
+	use examples || rm -rf eric/Examples
 }
 
 src_install() {
 	python_version
 
-cat >> gentoo_config.py <<- _EOF_
+	local sitedir="usr/$(get_libdir)/python${PYVER}/site-packages"
+
+cat > gentoo_config.py <<- _EOF_
 
 cfg = {
-	'ericDir': r"/usr/$(get_libdir)/python${PYVER}/site-packages/eric3",
+	'ericDir': r"/${sitedir}/eric3",
 	'ericPixDir': r"/usr/share/eric3/pixmaps",
 	'ericIconDir': r"/usr/share/eric3/icons",
 	'ericDTDDir': r"/usr/share/eric3/DTDs",
@@ -47,26 +53,27 @@ cfg = {
 	'ericDocDir': r"/usr/share/doc/${PF}/Documentation",
 	'ericExamplesDir': r"/usr/share/doc/${PF}/Examples",
 	'ericTranslationsDir': r"/usr/share/eric3/i18n",
-	'ericWizardsDir': r"/usr/$(get_libdir)/python${PYVER}/site-packages/Wizards",
+	'ericWizardsDir': r"/${sitedir}/Wizards",
 	'ericTemplatesDir': r"/usr/share/eric3/DesignerTemplates",
-	'ericOthersDir': r"/usr/lib/python2.4/site-packages/eric3",
+	'ericOthersDir': r"/${sitedir}/eric3",
 	'bindir': r"/usr/bin",
-	'mdir': r"/usr/$(get_libdir)/python${PYVER}/site-packages"
+	'mdir': r"/${sitedir}"
 }
 _EOF_
 
 
-	${python} install.py \
+	"${python}" install.py \
 		-f "gentoo_config.py" \
 		-b "${ROOT}usr/bin" \
 		-i "${D}" \
-		-d "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages" \
+		-d "${ROOT}${sitedir}" \
 		-c || die "${python} install.py failed"
 
 	dodoc ChangeLog THANKS eric/README*
+
 	make_desktop_entry "eric3 --nosplash" \
 			eric3 \
-			"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3/icons/default/eric.png" \
+			"${ROOT}usr/share/eric3/icons/default/eric.png" \
 			"Development;IDE;Qt"
 }
 
@@ -75,10 +82,10 @@ pkg_postinst() {
 	elog "  \"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3/patch_modpython.py\"."
 
 	python_version
-	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
+	python_mod_optimize "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
 }
 
 pkg_postrm() {
 	python_version
-	python_mod_cleanup "/usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
+	python_mod_cleanup "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
 }