[gentoo-commits] dev/jmbsvicetto:master commit in: net-analyzer/ocsng/

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     00aff4fb62ab50526aeb9e9c4930bb29edf354e6
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 14:16:19 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 14:16:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=00aff4fb

[net-analyzer/ocsng] Revbumped the 2.0 ebuild to use EAPI-4's REQUIRED_USE and drop pkg_setup tests.
Reviewed dev-lang/php dependency.
Thanks to Maxim Koltsov (maksbotan) for poking me and getting me to work on the updates.

(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 net-analyzer/ocsng/ChangeLog           |   10 ++
 net-analyzer/ocsng/Manifest            |   29 +++---
 net-analyzer/ocsng/ocsng-2.0-r1.ebuild |  181 ++++++++++++++++++++++++++++++++
 3 files changed, 206 insertions(+), 14 deletions(-)

diff --git a/net-analyzer/ocsng/ChangeLog b/net-analyzer/ocsng/ChangeLog
index b991110..523e59b 100644
--- a/net-analyzer/ocsng/ChangeLog
+++ b/net-analyzer/ocsng/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ocsng-2.0-r1 (24 Aug 2011)
+
+  24 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +ocsng-2.0-r1.ebuild:
+  [net-analyzer/ocsng] Revbumped the 2.0 ebuild to use EAPI-4's REQUIRED_USE
+  and drop pkg_setup tests.
+  Reviewed dev-lang/php dependency.
+  Thanks to Maxim Koltsov (maksbotan) for poking me and getting me to work on
+  the updates.
+
   23 Aug 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -ocsng-1.01.ebuild, -ocsng-1.02.1.ebuild, ocsng-1.3.ebuild,
   ocsng-1.3.1.ebuild, ocsng-1.3.2.ebuild, ocsng-2.0.ebuild, +metadata.xml,

diff --git a/net-analyzer/ocsng/Manifest b/net-analyzer/ocsng/Manifest
index cbeb812..f3b7141 100644
--- a/net-analyzer/ocsng/Manifest
+++ b/net-analyzer/ocsng/Manifest
@@ -9,23 +9,24 @@ DIST OCSNG_UNIX_SERVER-2.0.tar.gz 6348697 RMD160 ec251d0e7416deef1332bbab81a91d9
 EBUILD ocsng-1.3.1.ebuild 4790 RMD160 4bf1e9d27cab695426de2346ab45e390ae5202fb SHA1 f9617fb08d5bec9339aabd723a5e691281e3b026 SHA256 958de97a41b22003222dfe533bfcee9bf8e90b30c4c5de7baccf606841ca998f
 EBUILD ocsng-1.3.2.ebuild 4961 RMD160 c77f509dffdabcaf9fbaedf2e41e84bbc87f9a29 SHA1 10f1db2103efeda11de9d052c1be77eafa6cfda0 SHA256 ebed43fd391cfeb3077190675fb430b4c7060dcf677dffad3aac335350ec23bb
 EBUILD ocsng-1.3.ebuild 4775 RMD160 bf95782332efbe99106efe6713b98cfb31eff15b SHA1 ad4f5bd02a3f55e178c00068a78486fca603a66f SHA256 95f7bef4d5270b984b2b3d6bc0e6353d2c5b52842c0372daacda2d13c01057f0
+EBUILD ocsng-2.0-r1.ebuild 4632 RMD160 f43e5c51cd716da5ad3152ce8b8dbbbf9c1c069a SHA1 4f2d97a1b64e183db5ad7668a4ea3f95af83547d SHA256 d80e870866b5c8c55a2c73b02e6adaaf488b7357bb2eca5f9483bf82980df384
 EBUILD ocsng-2.0.ebuild 4972 RMD160 4733d7020dcdccb1dfef55c5eb31a44d1594a587 SHA1 5be6bd457210fbee101993bcb80481195c4b824f SHA256 94bf9ae48c8937631fa3de30a76f92e4f31f534b3bb80f9dad0cfdefb4aaaffe
-MISC ChangeLog 2975 RMD160 c04b5500b81317a4e3e50f6d555aaae0e69b74c3 SHA1 9fcbd54cab1abfda8e9d5bceff293600147a818d SHA256 c981c3fe97ee3cacfffeb0aec1fdb99aead5d4e899b2f3c93f3821a68b48b095
+MISC ChangeLog 3330 RMD160 1a6c41a2c77be26e78065a754bf4e34fe23c638e SHA1 0136b0c94c58da8bfba1bd1f5e3053a988f36f28 SHA256 48821701011cf8ed7831a1eb83ff626cf549b75e6a7718376a1fdc69fa47c1fd
 MISC metadata.xml 565 RMD160 287ce4ba6ccd8fa51cea279f9eddd783eebf76ca SHA1 0d407195398c663f44b9af289252fbcbb6396aa6 SHA256 fba7af61fb555da05dcf7c3677093c8553ef821b8893214656605fd3aaf6aa9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOU/tUAAoJEC8ZTXQF1qEP134P/iSwEQRvW80v8PZxhHYPl8i1
-IDQyheK0zV9/aUx5RZwXfEAxXPPkrTqSh7JaM9afOIDo0bOX8Kvc8cpXiX15XMsm
-Y3e1woy61yhnII7AwpmAAMgxQw/D4v3+7HA6lZhk1leWSqsdjbPu0RrzBgXiLTBi
-kqXxtoe7dotxMkNIWcO+wxEB9cVos120xf1F6+RhyvxQf51actzG4Qcs0ZvwM6eN
-ACw2P1R7bs4T5eKJHBTbqpeFIFzojH9SlJPeS3oiFSj8JKfHSyB+pRhyEbVtNoUP
-cibNSos9hMnhm+IZeYtIkGB2Y1NQmFmmC1hGCuZ9w2/12ofZJe6PAa2SdkoqBi+v
-Q4wlBn9lGgzlfVFYTdu7pYhaGIx58ulSk+dr+kTApkIBfcu1/NquaROVm0S1be0p
-wddup8EWZsgSUklbR11okm0MWHU7cvMBqBe+Zy+U0LC6a3xzIlP5ydcCvesbnvh2
-b+VdlTWhMZyXTw3d9OSg+9k+35GwbC0BNo6LIYFmTRn1OaP/kYYZERwS/Ompsk4m
-qAm6u+74L6eYKhfeLJcr5yiWBne/KKrDRcHBOTafaQlxCqQ7Txc6VYwv5+FohlpG
-9x/sOsFeQupNRqkwwVYO6zLEuztE39QF2PhbfjN7Q5CNkVkNwG6qk5QcvG5XuT3y
-BQQfKrLWSGI59yg8U6Id
-=F3oR
+iQIcBAEBAgAGBQJOVQezAAoJEC8ZTXQF1qEPPu4QAMx5bi4CvQzscYegq3SYCJ2m
+UBFN6KbReKCE8inGEdPkAiMTwtdUazmiamJEWkHh3MP/uEolEFXasaBzuHpvhEmA
+rHLCDzdreG1KMqJGMgXznbDcAK9EoxxUODgX4nkuKWqUO2ziOaHagfNXpJWS12jk
+F0znH8iL6OS4qazQzPzLx3C0yngGJOGpIjoBMdqT7Jps6VObJ9KDzoIWNeU1CTFQ
+bFvjcCPZ55gOWR/MCeC1I11ZYmCPY2bnNO5RSAFL8YrFCYJJZ7UrT/jimiEkbyTS
+g3ZMUxmpJBG3lHnNFU6tgXl4mLXvCrr8SGMs7m0XRUDhE/HGqadDNYUeyMHAxocW
+RtuSZNGYUAJAEpGLbvbZ6mWja6AyTwVOVoUEGV+v4Ih+R7V8kw5RPyGdXsnlUTHP
+2dTaQgoqjuF/9cTIwktSg6R2UcinE8ANxyNQ8GmqpWB2GzTLYpcKFR6V3SdwTSo8
+W9tuA0h39ak+vMpFGm/3Ry9n3PaN9rOQox/obz5BFWcc0vWWem8KVjGaxgYg7SFh
+9XUsdQNrMHMsRKHii3HLpmoud71wdF/w8oAKC+f30xIIkBBqYnKtIX48gyoptR7h
+6XaS1L8RIY87vm+/e8UcHFY/sUJMKhq23x53406JOidgtQZYHlJIaYDlwHANMsiy
+rkwKRmHkuIassNVV1A01
+=L6ks
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/ocsng/ocsng-2.0-r1.ebuild b/net-analyzer/ocsng/ocsng-2.0-r1.ebuild
new file mode 100644
index 0000000..7d2ed9a
--- /dev/null
+++ b/net-analyzer/ocsng/ocsng-2.0-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit depend.php eutils versionator webapp
+
+MY_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
+MY_PV="${PV//[_]/}"
+MY_P="OCSNG_UNIX_SERVER-${MY_PV}"
+MY_LPN="ocsinventory-server"
+MY_HTDOCSDIR="/usr/share/webapps/${PN}/"
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="OCS Inventory NG Management Server"
+HOMEPAGE="http://ocsinventory.sourceforge.net/"
+SRC_URI="http://launchpad.net/${MY_LPN}/stable-${MY_PV_MAJOR}/${MY_PV}/+download/${MY_P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64"
+IUSE="+comm admin logrotate"
+
+# INSTALL_DIR is used by webapp.eclass when USE=-vhosts
+INSTALL_DIR="ocsng"
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="
+	dev-lang/perl
+	comm? ( sys-devel/make )
+	app-admin/webapp-config
+"
+RDEPEND="${DEPEND}
+	>=dev-perl/Apache-DBI-0.93
+	>=dev-perl/DBI-1.40
+	>=dev-perl/DBD-mysql-2.9004
+	>=dev-perl/XML-Simple-2.12
+	>=dev-perl/Net-IP-1.21
+	www-apache/mod_perl
+	>=www-servers/apache-1.3
+	admin? ( dev-lang/php[mysql,xml] )
+	logrotate? ( app-admin/logrotate )
+"
+REQUIRED_USE="|| ( admin comm )"
+
+pkg_setup() {
+
+	# call default eclass pkg_setup
+	webapp_pkg_setup
+}
+
+src_compile() {
+
+	if ( use comm ); then
+
+		pushd "Apache"
+		perl Makefile.PL || die "perl Makefile.PL failed"
+		emake || die "emake failed"
+		popd
+	fi
+}
+
+src_install() {
+
+	LOGDIR="/var/log/ocsng"
+	IPDDIR="ipd"
+	SNMPDIR="snmp"
+	PACKAGESDIR="download"
+
+	# call default eclass src_preinst
+	webapp_src_preinst
+
+	fowners root:apache "${MY_HTDOCSDIR}"
+	fperms g-w,o-rwx "${MY_HTDOCSDIR}"
+
+	if ( use comm ); then
+
+		pushd "Apache"
+		emake DESTDIR="${D}" install || die "Install failed"
+		popd
+
+		if use logrotate; then
+
+			# create logrotate config file
+			elog "Create logrotate config file"
+
+			dodir /etc/logrotate.d
+			cat <<- EOF > "${D}etc/logrotate.d/ocsng"
+				# Copyright 1999-2011 Gentoo Foundation
+				# Distributed under the terms of the GNU General Public License v2
+				# $Header: $
+				#
+				# OCSNG logrotate config for Gentoo Linux
+				# Contributed by Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto@gentoo.org
+				# Based on the original ocsng logrotate file by Didier LIROULET
+
+				/var/log/ocsng/*.log {
+				daily
+				# rotate 7
+				compress
+				create 0660 root apache
+				notifyempty
+				missingok
+				# postrotate
+				# /etc/init.d/apache2 reload > /dev/null 2>&1 || true
+				# endscript
+				}
+			EOF
+		fi
+
+		# set mod_perl version > 1.999_21
+		sed -i -e "s/VERSION_MP/2/" etc/ocsinventory/ocsinventory-server.conf
+		sed -i -e "s:PATH_TO_LOG_DIRECTORY:${LOGDIR}:" etc/ocsinventory/ocsinventory-server.conf
+
+		# install the communication
+		webapp_server_configfile apache "etc/ocsinventory/ocsinventory-server.conf"
+
+	fi
+
+	if use admin; then
+
+		# Create dirs
+		elog "Creating ${MY_HTDOCSDIR}/{${PACKAGESDIR},${IPDDIR},${SNMPDIR}} dirs"
+		for dir in ${PACKAGESDIR} ${IPDDIR} ${SNMPDIR} ; do
+			dodir "${MY_HTDOCSDIR}/${dir}" || die "Unable to create ${MY_HTDOCSDIR}/${dir}"
+			webapp_serverowned -R "${MY_HTDOCSDIR}/${dir}"
+			fowners -R apache:apache "${MY_HTDOCSDIR}/${dir}"
+			fperms g+w,o-rwx "${MY_HTDOCSDIR}/${dir}"
+		done
+
+		# copy ocsreports
+		insinto "${MY_HTDOCSDIR}"
+		doins -r ocsreports
+
+		# Protect the db config file and ocsreports
+		webapp_configfile "${MY_HTDOCSDIR}/ocsreports/dbconfig.inc.php"
+		webapp_serverowned -R "${MY_HTDOCSDIR}/ocsreports"
+		fowners -R root:apache "${MY_HTDOCSDIR}/ocsreports"
+		fperms -R g-w,o-rwx "${MY_HTDOCSDIR}/ocsreports"
+		if [[ -f "${MY_HTDOCSDIR}/ocsreports/dbconfig.inc.php" ]] ; then
+			fperms g-w,o-rwx "${MY_HTDOCSDIR}/ocsreports/dbconfig.inc.php"
+		fi
+
+		# install ipdiscover-util.pl script
+		elog "Install ipdiscover-util.pl script"
+		insinto "${MY_HTDOCSDIR}/ocsreports"
+		doins binutils/ipdiscover-util.pl
+
+		fowners root:apache  "${MY_HTDOCSDIR}/ocsreports/ipdiscover-util.pl"
+		fperms ug+x,o-rwx "${MY_HTDOCSDIR}/ocsreports/ipdiscover-util.pl"
+
+		# install snmp_com.txt
+		elog "Install snmp_com.txt"
+		insinto "${MY_HTDOCSDIR}/snmp"
+		doins etc/ocsinventory/snmp_com.txt
+
+		fowners root:apache  "${MY_HTDOCSDIR}/snmp/snmp_com.txt"
+		fperms g+w,o-rwx "${MY_HTDOCSDIR}/snmp/snmp_com.txt"
+
+		webapp_server_configfile apache "etc/ocsinventory/ocsinventory-reports.conf"
+	fi
+
+	# create log dir
+	elog "Creating log dir"
+	dodir "${LOGDIR}"
+	fowners root:apache "${LOGDIR}"
+	fperms 770 "${LOGDIR}"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+
+	# call default eclass src_install
+	webapp_src_install
+}
+
+pkg_postinst () {
+
+	elog "If you want to run ocsng in this box make sure to install"
+	elog "at least mysql-4.1."
+
+	webapp_pkg_postinst
+}