Fix for bug #153888 thanks to Robert Buchholz

Package-Manager: portage-2.1.2_rc1-r6

4 files changed, 48 insertions, 28 deletions

diff --git a/net-analyzer/jffnms/ChangeLog b/net-analyzer/jffnms/ChangeLog
index 1f2120fdd7b2..58c791666dca 100644
--- a/net-analyzer/jffnms/ChangeLog
+++ b/net-analyzer/jffnms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/jffnms
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/ChangeLog,v 1.5 2006/10/11 23:14:36 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/ChangeLog,v 1.6 2006/11/13 23:04:11 jokey Exp $
+
+  13 Nov 2006; Markus Ullmann <jokey@gentoo.org> jffnms-0.8.2.ebuild,
+  jffnms-0.8.3.ebuild:
+  Fix for bug #153888 thanks to Robert Buchholz
 
   11 Oct 2006; Markus Ullmann <jokey@gentoo.org> jffnms-0.8.3.ebuild:
   Even more improved
diff --git a/net-analyzer/jffnms/Manifest b/net-analyzer/jffnms/Manifest
index 68d65bb652d9..5da744f449c9 100644
--- a/net-analyzer/jffnms/Manifest
+++ b/net-analyzer/jffnms/Manifest
@@ -15,18 +15,18 @@ RMD160 94cdb129a4944235408efc138f40340c9f19f682 files/postgresql_db_table 24
 SHA256 201a55d370e38b9c7f981a7cb6b9901302fcccb8cf21511905f5343834aa387e files/postgresql_db_table 24
 DIST jffnms-0.8.2.tar.gz 557085 RMD160 5ce08a50f5bbedbc00c990933c6ade935e681772 SHA1 3e1ff8f302d5fd30e14f4f363338b68870343d30 SHA256 d42b2b9e0a65b744bec12f2eea34efe14a4b836c37c37f187d835774395edf90
 DIST jffnms-0.8.3.tar.gz 698871 RMD160 681d498bf49f3e1011241254c441540ebbbe1860 SHA1 230cd88b9ff5b869e7a07c828425be15ede9614f SHA256 51f84606aa81113b2ea894c9e499f18df84e5317853aefd51610f5b279853ae4
-EBUILD jffnms-0.8.2.ebuild 1670 RMD160 2f9468b08caf2184ebf4f81b550c3fdf7ac038af SHA1 9c91d8a5dfd9223fe9d37d8cd9fb748b93a2167f SHA256 eb3eeab4ba7056d3c61a53c57f2dd12982d3ea41928e8fab2a8c407090ac6f67
-MD5 cd73d5ef750e1f142e27f7409bc359e4 jffnms-0.8.2.ebuild 1670
-RMD160 2f9468b08caf2184ebf4f81b550c3fdf7ac038af jffnms-0.8.2.ebuild 1670
-SHA256 eb3eeab4ba7056d3c61a53c57f2dd12982d3ea41928e8fab2a8c407090ac6f67 jffnms-0.8.2.ebuild 1670
-EBUILD jffnms-0.8.3.ebuild 1911 RMD160 b628d158ccf234febbc4361a2767273c68e25748 SHA1 49226c1a52f461e1436fd440190f521a3593a268 SHA256 aa6d7c646d38b2d9b0c545d6fb4527f12744ea39d9adf7f803a51f421af9afb7
-MD5 bea6769ff7b37b801b2a5d6df391f29e jffnms-0.8.3.ebuild 1911
-RMD160 b628d158ccf234febbc4361a2767273c68e25748 jffnms-0.8.3.ebuild 1911
-SHA256 aa6d7c646d38b2d9b0c545d6fb4527f12744ea39d9adf7f803a51f421af9afb7 jffnms-0.8.3.ebuild 1911
-MISC ChangeLog 937 RMD160 b13dd551f7b5fbcc81be374eed728aab8e31ff96 SHA1 7971f3403ac626a207c8e5e9c0d7d683b0f5e16d SHA256 8e01862fbf3ca66bee34f04c9ee151bfaeb51175dab444e4cf7ca9af674c5e7c
-MD5 c91ad1f0a614bc2c7e81a6f050f535d7 ChangeLog 937
-RMD160 b13dd551f7b5fbcc81be374eed728aab8e31ff96 ChangeLog 937
-SHA256 8e01862fbf3ca66bee34f04c9ee151bfaeb51175dab444e4cf7ca9af674c5e7c ChangeLog 937
+EBUILD jffnms-0.8.2.ebuild 1871 RMD160 c21b30e5a4a976f209c58d4abddd725a2d5a0da5 SHA1 106c4c787f0ab964c175bca94c6864c4cdb13a6d SHA256 d8ecf3534460e03399bc06ab20f8fdf8c385310e3a034e69bec14ff282da0d45
+MD5 79d2f0998d6f8412e43d69f7a11326e1 jffnms-0.8.2.ebuild 1871
+RMD160 c21b30e5a4a976f209c58d4abddd725a2d5a0da5 jffnms-0.8.2.ebuild 1871
+SHA256 d8ecf3534460e03399bc06ab20f8fdf8c385310e3a034e69bec14ff282da0d45 jffnms-0.8.2.ebuild 1871
+EBUILD jffnms-0.8.3.ebuild 2112 RMD160 3b9dab9fd99ace9dadf3dbd605ed04363ccbbc2d SHA1 b4ec8f3e6cf23b98d37bd0ab29ca91b337939866 SHA256 2896c5e60eb8d583314eef91dcb9bbedbdc70c111b162c3079171096c5f8d084
+MD5 706a55dbe89fd54f2d9ebe23b177dae9 jffnms-0.8.3.ebuild 2112
+RMD160 3b9dab9fd99ace9dadf3dbd605ed04363ccbbc2d jffnms-0.8.3.ebuild 2112
+SHA256 2896c5e60eb8d583314eef91dcb9bbedbdc70c111b162c3079171096c5f8d084 jffnms-0.8.3.ebuild 2112
+MISC ChangeLog 1079 RMD160 51463f2814b47d18e20242e2f3297bfbaec93661 SHA1 75ecd2cdf82af7921ae9db226a75732a72db23b1 SHA256 467b6e93cec1e7adb95dbba081e388c6d6032cd8e439431bd10cb488e17cad8e
+MD5 ef19fdc50883a3025cd783efd6db1c1d ChangeLog 1079
+RMD160 51463f2814b47d18e20242e2f3297bfbaec93661 ChangeLog 1079
+SHA256 467b6e93cec1e7adb95dbba081e388c6d6032cd8e439431bd10cb488e17cad8e ChangeLog 1079
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
@@ -40,7 +40,7 @@ SHA256 28acbd4ddf1e417a4561d54fa7febbc163d9ac28080423b402d9f365120eb969 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLXrjz974XjDVpbkRAhdXAJwN9JjXmnFCCc3o/SoRqI7Pnv7I/ACfdoMj
-/8UzouEaUIauF29bkTYDke0=
-=x4eY
+iD8DBQFFWPoCz974XjDVpbkRAiE6AKDROFpQ4m0ZOcmUQK3gFIGiK3KrkgCgz0DX
+gP7Y0IrJrpcxLpsAmcTpGzs=
+=iLam
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/jffnms/jffnms-0.8.2.ebuild b/net-analyzer/jffnms/jffnms-0.8.2.ebuild
index 18660b2f4f43..e5387a249410 100644
--- a/net-analyzer/jffnms/jffnms-0.8.2.ebuild
+++ b/net-analyzer/jffnms/jffnms-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/jffnms-0.8.2.ebuild,v 1.2 2006/10/08 23:02:06 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/jffnms-0.8.2.ebuild,v 1.3 2006/11/13 23:04:11 jokey Exp $
 
 inherit eutils
 
@@ -50,12 +50,20 @@ pkg_setup() {
 }
 
 src_install(){
-	MY_DESTDIR="${D}opt/jffnms"
+	INSTALL_DIR="/opt/${PN}"
+	IMAGE_DIR="${D}${INSTALL_DIR}"
 
-	dodir "${MY_DESTDIR}"
-	cp -r * "${MY_DESTDIR}" || die
-	chown -R jffnms:apache "${MY_DESTDIR}" || die
-	chmod -R ug+rw "${MY_DESTDIR}" || die
+	dodir "${INSTALL_DIR}"
+	cp -r * "${IMAGE_DIR}" || die
+	rm -f "${IMAGE_DIR}/LICENSE"
+
+	# Clean up windows related stuff
+	rm -f "${IMAGE_DIR}/*.win32.txt"
+	rm -rf "${IMAGE_DIR}/docs/windows"
+	rm -rf "${IMAGE_DIR}/engine/windows"
+
+	chown -R jffnms:apache "${IMAGE_DIR}" || die
+	chmod -R ug+rw "${IMAGE_DIR}" || die
 
 	einfo "JFFNMS has been partialy installed on your system. However you"
 	einfo "still need proceed with final installation and configuration."
diff --git a/net-analyzer/jffnms/jffnms-0.8.3.ebuild b/net-analyzer/jffnms/jffnms-0.8.3.ebuild
index 6e34ca049bea..14752d1cdbb6 100644
--- a/net-analyzer/jffnms/jffnms-0.8.3.ebuild
+++ b/net-analyzer/jffnms/jffnms-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/jffnms-0.8.3.ebuild,v 1.3 2006/10/11 23:14:36 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jffnms/jffnms-0.8.3.ebuild,v 1.4 2006/11/13 23:04:11 jokey Exp $
 
 inherit eutils depend.php
 
@@ -55,12 +55,20 @@ pkg_setup() {
 }
 
 src_install(){
-	MY_DESTDIR="${D}opt/jffnms"
+	INSTALL_DIR="/opt/${PN}"
+	IMAGE_DIR="${D}${INSTALL_DIR}"
 
-	dodir "${MY_DESTDIR}"
-	cp -r * "${MY_DESTDIR}" || die
-	chown -R jffnms:apache "${MY_DESTDIR}" || die
-	chmod -R ug+rw "${MY_DESTDIR}" || die
+	dodir "${INSTALL_DIR}"
+	cp -r * "${IMAGE_DIR}" || die
+	rm -f "${IMAGE_DIR}/LICENSE"
+
+	# Clean up windows related stuff
+	rm -f "${IMAGE_DIR}/*.win32.txt"
+	rm -rf "${IMAGE_DIR}/docs/windows"
+	rm -rf "${IMAGE_DIR}/engine/windows"
+
+	chown -R jffnms:apache "${IMAGE_DIR}" || die
+	chmod -R ug+rw "${IMAGE_DIR}" || die
 
 	elog "${PN} has been partialy installed on your system. However you"
 	elog "still need proceed with final installation and configuration."