(non maintainer commit) Version bump for bug #170498

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27.4 x86_64

10 files changed, 47 insertions, 248 deletions

diff --git a/app-admin/osiris/ChangeLog b/app-admin/osiris/ChangeLog
index 5e8402eb1ec8..3ec5389bb872 100644
--- a/app-admin/osiris/ChangeLog
+++ b/app-admin/osiris/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/osiris
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/ChangeLog,v 1.16 2008/06/04 16:52:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/ChangeLog,v 1.17 2008/11/11 03:28:28 darkside Exp $
+
+*osiris-4.2.3 (11 Nov 2008)
+
+  11 Nov 2008; Jeremy Olexa <darkside@gentoo.org> -files/osirisd-4.2.2,
+  -files/osirisd_confd-4.2.2, -files/osirismd-4.2.2,
+  -files/osirismd_confd-4.2.2, -files/osiris-4.2.2-externaldb.patch,
+  +files/osirisd-4.2.3, +files/osirisd_confd-4.2.3, +files/osirismd-4.2.3,
+  +files/osirismd_confd-4.2.3, -osiris-1.5.2.ebuild,
+  -osiris-1.5.2-r1.ebuild, -osiris-4.2.2.ebuild, +osiris-4.2.3.ebuild:
+  (non maintainer commit) Version bump for bug #170498
 
   04 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> osiris-4.2.2.ebuild:
   Use eautoreconf, not the bootstrap script.
diff --git a/app-admin/osiris/Manifest b/app-admin/osiris/Manifest
index 1ae9ad01787b..010ac7d87b6b 100644
--- a/app-admin/osiris/Manifest
+++ b/app-admin/osiris/Manifest
@@ -1,25 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX osiris-4.2.2-externaldb.patch 4043 RMD160 5a92cbb24b1b139687f48f176b191b26c892ab16 SHA1 5584beb30e2155336c0e31ce3bdcfa32587067b4 SHA256 6fed4bc6418cc86d66342278e539bedae91f6c4370332af3c7a576f9faa823e8
-AUX osirisd-4.2.2 591 RMD160 7aec89e9cefb51427934cf6af00d5871f155b4a3 SHA1 b073bef9e63fcd6d84e15336c8c08078a03e9610 SHA256 e1b01914c463994e2620debe36122a9e9532931023cc77a308bc30867055c1e0
-AUX osirisd_confd-4.2.2 267 RMD160 e6418261bd62c674d746a454d053ba2fdd60e8ba SHA1 fc50b163ceca4276c90f300a44f8b5f37bdb8d4d SHA256 4ad91c2f2ecc24688a0f38b54a4291ddd4448e5772c0c25a7883e96ff98fa3d1
-AUX osirismd-4.2.2 592 RMD160 7a80e99bdaa725ea123de69125ff9c4c7d36e3d1 SHA1 31ae2903933ff2e1ca8c26fcf83c6e3fdbf5c47e SHA256 aaf460d5406679bf09c5f63a04d6216f412b8144ae7f51681de9e7ebc90e1b5f
-AUX osirismd_confd-4.2.2 195 RMD160 b8192932e349e4ad621c293e8e2e4446c747dbda SHA1 8feb8e0b18ccae9a0d48a54ef2979c3dc79a3310 SHA256 d756880bbf685a3678ad354e3c77263c965ff1f999af30c5f3dbc7d5fb4be027
+AUX osirisd-4.2.3 591 RMD160 7aec89e9cefb51427934cf6af00d5871f155b4a3 SHA1 b073bef9e63fcd6d84e15336c8c08078a03e9610 SHA256 e1b01914c463994e2620debe36122a9e9532931023cc77a308bc30867055c1e0
+AUX osirisd_confd-4.2.3 267 RMD160 e6418261bd62c674d746a454d053ba2fdd60e8ba SHA1 fc50b163ceca4276c90f300a44f8b5f37bdb8d4d SHA256 4ad91c2f2ecc24688a0f38b54a4291ddd4448e5772c0c25a7883e96ff98fa3d1
+AUX osirismd-4.2.3 592 RMD160 7a80e99bdaa725ea123de69125ff9c4c7d36e3d1 SHA1 31ae2903933ff2e1ca8c26fcf83c6e3fdbf5c47e SHA256 aaf460d5406679bf09c5f63a04d6216f412b8144ae7f51681de9e7ebc90e1b5f
+AUX osirismd_confd-4.2.3 195 RMD160 b8192932e349e4ad621c293e8e2e4446c747dbda SHA1 8feb8e0b18ccae9a0d48a54ef2979c3dc79a3310 SHA256 d756880bbf685a3678ad354e3c77263c965ff1f999af30c5f3dbc7d5fb4be027
 DIST mod_dns.tar.gz 1835 RMD160 83a96b7854fa3f8802663f82759bc77ca7c41fb0 SHA1 37f64ca8fb7862837c48f8ec82964770a668daa6 SHA256 c0bf154d310dd39ac3ba3f3d8215b52a01d120831cec77a8c22fc6de66a7750b
 DIST mod_nvram.tar.gz 2065 RMD160 6f5beab396bd2011b0db386999c19da9d83c3881 SHA1 59d8c31713f6f4fb59e7244907b87ff5f303ba00 SHA256 ab3b78b853ea4ce6b06ed4a143e61267076d1aa9255c87786ebd9861da85a189
+DIST mod_ports.tar.gz 3730 RMD160 63ee90b2cf074be67d4d9a0e0a5fec02a57971c1 SHA1 6a94f32643486c010f41736c374aa0f60c70a77f SHA256 29918056c92802666ef80b7e997edb732045584e4d7f05841dab8e240bf0d71c
 DIST mod_uptime.tar.gz 2143 RMD160 7a626a37825a867a88eed2223f737dd5e521c69c SHA1 c18135c52a4a26178046a7c57beb9eb7e7e307e9 SHA256 9538ce2a41f55f9ea629a08f643e2ca9d1130428dc25b2cee006108fc087dc78
-DIST osiris-1.5.2.tar.gz 337298 RMD160 879cd382b7641b54fb7033d56e448bad8b68c038 SHA1 b9bd841934f23fc544fc8cbb745cb79fd07c89bb SHA256 bfd3b1f2de5dc524005216d45c1eb56f71323643577996b9091dd7a23e70db2d
-DIST osiris-4.2.2.tar.gz 1923249 RMD160 238296ab6a513ec43f570a3d5ecc3bc2e4189b57 SHA1 38fee7398de9157a57b41ea53e9c561bd449028e SHA256 5b0ccf24ad6e96618f23998d82b12f0e33df4c2bd8d9ae4cbf0eab8dd1e49920
-EBUILD osiris-1.5.2-r1.ebuild 1337 RMD160 0b704adb7d10fdc447d69e98594ff402ed8c9f18 SHA1 954886364fe0048946f765f9102332c1782843a1 SHA256 196a72023f88b91285b1ca4919375dee4e0bfa8d8c2e17aa6eacbfc227b15087
-EBUILD osiris-1.5.2.ebuild 1206 RMD160 b14e8cf348ace54e007b0071da712954b8d3f116 SHA1 6d5be04bf03eb3445b5b3bf94a983aeba213221e SHA256 2d0beb2bdf27c2252baaab0859b20fb82131c28cad3d46419c6a83d715a2cea4
-EBUILD osiris-4.2.2.ebuild 3646 RMD160 2b6fe8cc1dc02af0cb2507a5aab0c6efb7cf5d0d SHA1 05fad04b638853ad34daacdd2c2c8fe184cc13ee SHA256 319d1b08f91321d1cfb2fe667b3a6176aa04372a506b0f6ec0f92e94a5b9cfeb
-MISC ChangeLog 2188 RMD160 03c0ca91de64f7cb33e214e599e01a995f1aabff SHA1 515491a5351cf5b3b3fd8383df9b35e9292f5cb4 SHA256 ebe8e927c570b77ad430f1fa6c1bcb7d5cd465ad3ebd25165bb74c35767d6d74
+DIST osiris-4.2.3.tar.gz 1924149 RMD160 2254aed0ec5d7c2d617311d469599575269757ff SHA1 128ebdeec31ff86aecbff6150ef6d0c7dcb4820f SHA256 94e1f28a6dc24e85efb47383126cf3bad35db8a7d47a8025e77bb6f0730c3b04
+EBUILD osiris-4.2.3.ebuild 2967 RMD160 b073cdc8651c1b0dfaac360f51548da7b87e063a SHA1 a2aee5d7f5faa1f083b44b28eb773de40bd7bb47 SHA256 6e8389c036f334b5d968aecc20b95645da5f8ebae72848178d6140cba6a85e14
+MISC ChangeLog 2665 RMD160 3d5a648ecfd09d94eb65225b2c5929f941f5df85 SHA1 1ae48ac7d7433c4d23090599f7e1a65b5a348d8f SHA256 00abcab7d6ee88ee91905a113906680d1355e61c106cc4eabc196cc981f05755
 MISC metadata.xml 417 RMD160 41979d47436ed19c0fcaa1790a1cdac349f96c55 SHA1 dfa2566a981d0ddb4764f0650a1ab05d188203fe SHA256 3e2715f17a6ef91fd0ac3589cfa72f19ec911bd7fc513826a638440f212bc22d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhGyEUACgkQAiZjviIA2XjpRwCff3qjB/69Iex8vj4Zsrb0A5Rj
-4zUAnjmijH5Z0Kx6tFCgLUY7b+5oErGq
-=OF0q
------END PGP SIGNATURE-----
diff --git a/app-admin/osiris/files/osiris-4.2.2-externaldb.patch b/app-admin/osiris/files/osiris-4.2.2-externaldb.patch
deleted file mode 100644
index b9b1947d687e..000000000000
--- a/app-admin/osiris/files/osiris-4.2.2-externaldb.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- ./osiris-4.2.2/src/osirismd/Makefile.am.orig	2006-12-12 06:38:09.000000000 +1100
-+++ ./osiris-4.2.2/src/osirismd/Makefile.am	2006-12-12 06:39:25.000000000 +1100
-@@ -25,14 +25,14 @@
-                           -I$(top_srcdir)/src/libosirisctl \
-                           -I$(top_srcdir)/src/libosirisdb \
-                           -I$(top_srcdir)/src/libosirism \
--                          -I$(top_srcdir)/src/db-4.2.52/build_unix
-+                          -I/usr/include/db4.2
- 
- osirismd_LDADD 		= -L$(top_srcdir)/src/libfileapi -lfileapi \
-                           -L$(top_srcdir)/src/libosirisctl -losirisctl \
-                           -L$(top_srcdir)/src/libosirisdb -losirisdb \
-                           -L$(top_srcdir)/src/libosirism -losirism \
-                           -L$(top_srcdir)/src/libosiris -losiris \
--                          -L$(top_srcdir)/src/db-4.2.52/build_unix -ldb
-+                          -ldb-4.2
- 
- osirismd_DEPENDENCIES	= $(top_srcdir)/src/libosiris/libosiris.a \
-                           $(top_srcdir)/src/libfileapi/libfileapi.a \
---- ./osiris-4.2.2/src/tools/Makefile.am.orig	2006-12-12 06:34:27.000000000 +1100
-+++ ./osiris-4.2.2/src/tools/Makefile.am	2006-12-12 06:35:55.000000000 +1100
-@@ -6,7 +6,7 @@
-                                   -I$(top_srcdir)/src/libosiris \
-                                   -I$(top_srcdir)/src/libosirisctl \
-                                   -I$(top_srcdir)/src/libosirism \
--                                  -I$(top_srcdir)/src/db-4.2.52/build_unix
-+                                  -I/usr/include/db4.2/
- 
- printdb_SOURCES			= printdb.c 
- 
-@@ -14,7 +14,7 @@
-                                   -L$(top_srcdir)/src/libfileapi -lfileapi \
-                                   -L$(top_srcdir)/src/libosirism -losirism \
-                                   -L$(top_srcdir)/src/libosiris -losiris \
--                                  -L$(top_srcdir)/src/db-4.2.52/build_unix -ldb
-+                                  -ldb-4.2
- 
- printdb_DEPENDENCIES            = $(top_srcdir)/src/libosiris/libosiris.a \
-                                   $(top_srcdir)/src/libfileapi/libfileapi.a \
---- ./osiris-4.2.2/src/libosirisdb/Makefile.am.orig	2006-12-12 06:38:37.000000000 +1100
-+++ ./osiris-4.2.2/src/libosirisdb/Makefile.am	2006-12-12 06:39:37.000000000 +1100
-@@ -7,5 +7,5 @@
-                           -I$(top_srcdir)/src/libosirisctl \
-                           -I$(top_srcdir)/src/libosirism \
-                           -I$(top_srcdir)/src/libfileapi \
--                          -I$(top_srcdir)/src/db-4.2.52/build_unix
-+                          -I/usr/include/db4.2
- 
---- ./osiris-4.2.2/src/cli/Makefile.am.orig	2006-12-12 06:36:13.000000000 +1100
-+++ ./osiris-4.2.2/src/cli/Makefile.am	2006-12-12 06:36:45.000000000 +1100
-@@ -7,7 +7,7 @@
-                       -I$(top_srcdir)/src/libosirism \
-                       -I$(top_srcdir)/src/libosiris \
-                       -I$(top_srcdir)/src/libosirisdb \
--                      -I$(top_srcdir)/src/db-4.2.52/build_unix
-+                      -I/usr/include/db4.2/
- 
- 
- osiris_SOURCES			= osiris.c osiris.h get_user_input.c
-@@ -17,7 +17,7 @@
-                                   -L$(top_srcdir)/src/libfileapi -lfileapi \
-                                   -L$(top_srcdir)/src/libosiris -losiris \
-                                   -L$(top_srcdir)/src/libosirisdb -losirisdb \
--                                  -L$(top_srcdir)/src/db-4.2.52/build_unix -ldb @LIBREADLINE@
-+                                  -ldb-4.2 @LIBREADLINE@
- 
- 
- osiris_DEPENDENCIES             = $(top_srcdir)/src/libosiris/libosiris.a \
---- ./osiris-4.2.2/src/Makefile.am.orig	2006-12-12 06:37:06.000000000 +1100
-+++ ./osiris-4.2.2/src/Makefile.am	2006-12-12 06:37:17.000000000 +1100
-@@ -6,7 +6,6 @@
-                       libosirisdb \
-                       libosirisctl \
-                       libosirism \
--                      db-4.2.52 \
-                       osirisd \
-                       osirismd \
-              		  cli 
diff --git a/app-admin/osiris/files/osirisd-4.2.2 b/app-admin/osiris/files/osirisd-4.2.3
index cfacae252a52..cfacae252a52 100644
--- a/app-admin/osiris/files/osirisd-4.2.2
+++ b/app-admin/osiris/files/osirisd-4.2.3
diff --git a/app-admin/osiris/files/osirisd_confd-4.2.2 b/app-admin/osiris/files/osirisd_confd-4.2.3
index 87bc2c6b0266..87bc2c6b0266 100644
--- a/app-admin/osiris/files/osirisd_confd-4.2.2
+++ b/app-admin/osiris/files/osirisd_confd-4.2.3
diff --git a/app-admin/osiris/files/osirismd-4.2.2 b/app-admin/osiris/files/osirismd-4.2.3
index 1136c0433554..1136c0433554 100644
--- a/app-admin/osiris/files/osirismd-4.2.2
+++ b/app-admin/osiris/files/osirismd-4.2.3
diff --git a/app-admin/osiris/files/osirismd_confd-4.2.2 b/app-admin/osiris/files/osirismd_confd-4.2.3
index 98f0bc930b00..98f0bc930b00 100644
--- a/app-admin/osiris/files/osirismd_confd-4.2.2
+++ b/app-admin/osiris/files/osirismd_confd-4.2.3
diff --git a/app-admin/osiris/osiris-1.5.2-r1.ebuild b/app-admin/osiris/osiris-1.5.2-r1.ebuild
deleted file mode 100644
index 48b64e40d2c5..000000000000
--- a/app-admin/osiris/osiris-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-1.5.2-r1.ebuild,v 1.3 2007/01/24 14:46:42 genone Exp $
-
-DESCRIPTION="File integrity verification system"
-HOMEPAGE="http://osiris.shmoo.com/"
-SRC_URI="http://osiris.shmoo.com/data/${P}.tar.gz"
-
-LICENSE="OSIRIS"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="mysql doc"
-
-DEPEND="mysql? ( virtual/mysql )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:-O3 -fomit-frame-pointer:${CFLAGS}:" \
-		src/crypto/*/Makefile || die "sed"
-}
-
-src_compile() {
-	# Osiris provides the necessary gdbm source so that gdbm does not
-	# need to be installed to use Osiris. If mysql is set as a USE
-	# variable, Osiris will use mysql instead of gdbm.
-	elog "Osiris uses gdbm by default, and will use MySQL if \"mysql\""
-	elog "is set as a USE variable; it cannot be configured to use both."
-
-	local myconf
-	use mysql \
-		&& myconf="${myconf} --enable-module=mysql" \
-		&& sed -i -e "s:mysql.h:mysql/mysql.h:" ${S}/src/modules/module_mysql.c
-	econf ${myconf} || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	if use doc
-	then
-		insinto /usr/share/doc/${PF}
-		dohtml docs/manual.html
-		dodoc docs/manual.txt
-		doins -r configs
-	fi
-}
diff --git a/app-admin/osiris/osiris-1.5.2.ebuild b/app-admin/osiris/osiris-1.5.2.ebuild
deleted file mode 100644
index 5ef7ac27d1c8..000000000000
--- a/app-admin/osiris/osiris-1.5.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-1.5.2.ebuild,v 1.13 2007/01/24 14:46:42 genone Exp $
-
-DESCRIPTION="File integrity verification system"
-HOMEPAGE="http://osiris.shmoo.com/"
-SRC_URI="http://osiris.shmoo.com/data/${P}.tar.gz"
-
-LICENSE="OSIRIS"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="mysql"
-
-DEPEND="mysql? ( virtual/mysql )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:-O3 -fomit-frame-pointer:${CFLAGS}:" \
-		src/crypto/*/Makefile || die "sed"
-}
-
-src_compile() {
-	# Osiris provides the necessary gdbm source so that gdbm does not
-	# need to be installed to use Osiris. If mysql is set as a USE
-	# variable, Osiris will use mysql instead of gdbm.
-	elog "Osiris uses gdbm by default, and will use MySQL if \"mysql\""
-	elog "is set as a USE variable; it cannot be configured to use both."
-
-	local myconf
-	use mysql \
-		&& myconf="${myconf} --enable-module=mysql" \
-		&& sed -i -e "s:mysql.h:mysql/mysql.h:" ${S}/src/modules/module_mysql.c
-	econf ${myconf} || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-}
diff --git a/app-admin/osiris/osiris-4.2.2.ebuild b/app-admin/osiris/osiris-4.2.3.ebuild
index d5ab295c7708..1a22dce1798f 100644
--- a/app-admin/osiris/osiris-4.2.2.ebuild
+++ b/app-admin/osiris/osiris-4.2.3.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-4.2.2.ebuild,v 1.5 2008/06/04 16:52:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-4.2.3.ebuild,v 1.1 2008/11/11 03:28:28 darkside Exp $
 
-inherit eutils autotools
+inherit eutils
 
 DESCRIPTION="File integrity verification system"
 HOMEPAGE="http://osiris.shmoo.com/"
 SRC_URI="http://osiris.shmoo.com/data/${P}.tar.gz
 	http://osiris.shmoo.com/data/modules/mod_uptime.tar.gz
 	http://osiris.shmoo.com/data/modules/mod_dns.tar.gz
-	http://osiris.shmoo.com/data/modules/mod_nvram.tar.gz"
-#	http://osiris.shmoo.com/data/modules/mod_ports.tar.gz"
+	http://osiris.shmoo.com/data/modules/mod_nvram.tar.gz
+	http://osiris.shmoo.com/data/modules/mod_ports.tar.gz"
 
 LICENSE="OSIRIS"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-#IUSE="noagent console"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.8c
-	=sys-libs/db-4.2*"
+	>=sys-libs/db-4.3"
 
 pkg_setup()
 {
@@ -30,27 +29,20 @@ pkg_setup()
 src_unpack()
 {
 	unpack ${P}.tar.gz
-	epatch "${FILESDIR}"/${P}-externaldb.patch
-	cd "${S}"
-	eautoreconf
 	cd "${WORKDIR}"
 	unpack mod_uptime.tar.gz
 	unpack mod_dns.tar.gz
 	unpack mod_nvram.tar.gz
-#	unpack mod_ports.tar.gz
-#	Add the above modules
+	unpack mod_ports.tar.gz
+	# Add the above modules
 	mv "${S}"/../mod_* "${S}"/src/osirisd/modules/
 }
 
 src_compile()
 {
-	econf --prefix=/var/lib --enable-fancy-cli=yes || die "configure failed."
-#	if  ! use noagent ; then
-		emake agent || die "agent build failed"
-#	fi
-#	if use console ; then
-		emake console || die "management build failed"
-#	fi
+	econf --prefix=/var/lib --enable-fancy-cli=yes
+	emake agent || die "agent build failed"
+	emake console || die "management build failed"
 }
 
 src_install() {
@@ -75,26 +67,22 @@ src_install() {
 	elog "---------------------------------------------------------------------"
 	elog ""
 
-#	if ! use noagent ; then
-		dosbin src/osirisd/osirisd
-		fowners root:0 /usr/sbin/osirisd
-		fperms 0755 /usr/sbin/osirisd
-		newinitd "${FILESDIR}"/osirisd-${PV} osirisd
-		newconfd "${FILESDIR}"/osirisd_confd-${PV} osirisd
-#	fi
+	dosbin src/osirisd/osirisd
+	fowners root:0 /usr/sbin/osirisd
+	fperms 0755 /usr/sbin/osirisd
+	newinitd "${FILESDIR}"/osirisd-${PV} osirisd
+	newconfd "${FILESDIR}"/osirisd_confd-${PV} osirisd
 
-#	if use console; then
-		dosbin src/cli/osiris
-		fowners root:0 /usr/sbin/osiris
-		fperms 0755 /usr/sbin/osiris
+	dosbin src/cli/osiris
+	fowners root:0 /usr/sbin/osiris
+	fperms 0755 /usr/sbin/osiris
 
-		dosbin src/osirismd/osirismd
-		fowners osiris:osiris /usr/sbin/osirismd
-		fperms 4755 /usr/sbin/osirismd
+	dosbin src/osirismd/osirismd
+	fowners osiris:osiris /usr/sbin/osirismd
+	fperms 4755 /usr/sbin/osirismd
 
-		newinitd "${FILESDIR}"/osirismd-${PV} osirismd
-		newconfd "${FILESDIR}"/osirismd_confd-${PV} osirismd
-#	fi
+	newinitd "${FILESDIR}"/osirismd-${PV} osirismd
+	newconfd "${FILESDIR}"/osirismd_confd-${PV} osirismd
 
 	dodir /var/run
 	dodir /var/lib
@@ -102,32 +90,16 @@ src_install() {
 	dodir /var/lib/osiris
 	dodir /var/run/osiris
 	keepdir /var/run/osiris
-#	if use console ; then
-		cp -rf "${S}"/src/configs "${D}"/var/lib/osiris/
-		chown -R osiris:osiris "${D}"/var/lib/osiris/*
-		chmod -R 0750 "${D}"/var/lib/osiris/*
-#	fi
-}
 
-#pkg_postinst()
-#{
-#	if ! use console ; then
-#		elog "By default, the osiris ebuild only installs the agent."
-#		elog "To enable installing the console, please add the 'console' flag"
-#		elog "to your USE variable and re-emerge osiris."
-#	fi
-#}
+	cp -rf "${S}"/src/configs "${D}"/var/lib/osiris/
+	chown -R osiris:osiris "${D}"/var/lib/osiris/*
+	chmod -R 0750 "${D}"/var/lib/osiris/*
+}
 
 pkg_postrm()
 {
-	# PID directory should not clutter the
-	# system
 	rm -rf /var/run/osiris
 
-	# Allow the user to decide if certs,
-	# configs, and other things should
-	# be
-	# removed.
 	elog "The directory /var/lib/osiris will not be removed. You may remove"
 	elog "it manually if you will not be reinstalling osiris at a later time."
 }