Fixed installation into /opt, version bump, added to ~amd64. Closes bug #121278.

(Portage version: 2.1_pre7-r3)

6 files changed, 76 insertions, 14 deletions

diff --git a/net-im/simpserver-bin/ChangeLog b/net-im/simpserver-bin/ChangeLog
index 9fa5c415203f..5e32b9ced3f9 100644
--- a/net-im/simpserver-bin/ChangeLog
+++ b/net-im/simpserver-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/simpserver-bin
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/ChangeLog,v 1.2 2004/06/24 23:00:12 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/ChangeLog,v 1.3 2006/04/01 05:03:16 eradicator Exp $
+
+*simpserver-bin-2.1.0 (01 Apr 2006)
+
+  01 Apr 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  files/simpserver.rc, simpserver-bin-0.9.ebuild,
+  +simpserver-bin-2.1.0.ebuild:
+  Fixed installation into /opt, version bump, added to ~amd64. Closes bug
+  #121278.
 
 *simpserver-bin-0.9 (13 Mar 2004)
 
diff --git a/net-im/simpserver-bin/Manifest b/net-im/simpserver-bin/Manifest
index bb3014556d9a..23625c21dfb1 100644
--- a/net-im/simpserver-bin/Manifest
+++ b/net-im/simpserver-bin/Manifest
@@ -1,5 +1,21 @@
-MD5 3b967540621091750c18da152b127955 simpserver-bin-0.9.ebuild 905
 MD5 8e73605aeb25252323ca22b990a16626 ChangeLog 451
-MD5 f2abe2a10510203f9f0b9ba9d71c3a01 metadata.xml 871
-MD5 21c2bed1c3d33663ba378ad78c469de4 files/simpserver.rc 585
+RMD160 e8a20f3aea0f816b5e632353e26d899acc350df8 ChangeLog 451
+SHA256 38448d6dd7b7cf05293e1f92d04666750637fc1b87376f3f53185afb6faab33b ChangeLog 451
 MD5 d6d8ac1f540c378a9dac6c845e44976b files/digest-simpserver-bin-0.9 73
+RMD160 d0e8bb3d26e609aeb38aeded315cf740987d214d files/digest-simpserver-bin-0.9 73
+SHA256 b3cfa06125f8644d5d5a8fffa79d21132dad1e2366014b4c273503ba5591b0c2 files/digest-simpserver-bin-0.9 73
+MD5 fcc30417edffa242dfb0131df0c75b5d files/digest-simpserver-bin-2.1.0 271
+RMD160 97541b78f9ebbe5326a315313dad3c2d7538c16f files/digest-simpserver-bin-2.1.0 271
+SHA256 e435b0f757ff642005a7a3a102345277cfb9f5a1481638fabf52d186fc0f8258 files/digest-simpserver-bin-2.1.0 271
+MD5 21c2bed1c3d33663ba378ad78c469de4 files/simpserver.rc 585
+RMD160 d6aade3036443511acafc8357c08f547e6411cc0 files/simpserver.rc 585
+SHA256 916c84dae2afdf07e29c3840b86c2c95ef20de6397c68c95448811a6f4c91d2b files/simpserver.rc 585
+MD5 f2abe2a10510203f9f0b9ba9d71c3a01 metadata.xml 871
+RMD160 0c908db75a559340e36209932ed85982d1ff8805 metadata.xml 871
+SHA256 387825af82b6610afea6ae994c26f05af1405db878af7bdd988e28d1b6a4e997 metadata.xml 871
+MD5 3b967540621091750c18da152b127955 simpserver-bin-0.9.ebuild 905
+RMD160 f30f7ff525f78ca8aac22fbf8a954551b2e901c3 simpserver-bin-0.9.ebuild 905
+SHA256 fc414a1b2be9a74797442065fa79aee475c094ccd9d00c97cd62ba8ca12b1dac simpserver-bin-0.9.ebuild 905
+MD5 d29adf1ad4404239ff76a491fe2aac9c simpserver-bin-2.1.0.ebuild 919
+RMD160 9f085c5e4163cd772809b3a8c74ed5394a84acb3 simpserver-bin-2.1.0.ebuild 919
+SHA256 5bb177a58a979abac96bd627a7e14f7a41e34b7606939a18f5ca97220f238bb7 simpserver-bin-2.1.0.ebuild 919
diff --git a/net-im/simpserver-bin/files/digest-simpserver-bin-2.1.0 b/net-im/simpserver-bin/files/digest-simpserver-bin-2.1.0
new file mode 100644
index 000000000000..55254b0c787c
--- /dev/null
+++ b/net-im/simpserver-bin/files/digest-simpserver-bin-2.1.0
@@ -0,0 +1,3 @@
+MD5 8d41923b9767925b722264e7b99fb5a6 simpserver-2.1.0-linux-x86.tgz 609317
+RMD160 44c612f3c3bc89946b41fa02ed5424120c80972b simpserver-2.1.0-linux-x86.tgz 609317
+SHA256 77a28d92f3b4bc99f6cf78574fe1d9eb4d4e983ec6632fa0ff5be3e5a353d7b8 simpserver-2.1.0-linux-x86.tgz 609317
diff --git a/net-im/simpserver-bin/files/simpserver.rc b/net-im/simpserver-bin/files/simpserver.rc
index 21bded90de3f..ee34e75f3f58 100644
--- a/net-im/simpserver-bin/files/simpserver.rc
+++ b/net-im/simpserver-bin/files/simpserver.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/files/simpserver.rc,v 1.2 2004/07/14 23:46:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/files/simpserver.rc,v 1.3 2006/04/01 05:03:16 eradicator Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting simpserver"
 	start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/simpserver.pid \
-		--exec /usr/sbin/simpserver -- /etc/simp.conf
+		--exec /opt/bin/simpserver -- /etc/simp.conf
 	eend $?
 }
 
diff --git a/net-im/simpserver-bin/simpserver-bin-0.9.ebuild b/net-im/simpserver-bin/simpserver-bin-0.9.ebuild
index 92c236c9db8e..a01d99a7bcfc 100644
--- a/net-im/simpserver-bin/simpserver-bin-0.9.ebuild
+++ b/net-im/simpserver-bin/simpserver-bin-0.9.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/simpserver-bin-0.9.ebuild,v 1.3 2004/07/15 00:26:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/simpserver-bin-0.9.ebuild,v 1.4 2006/04/01 05:03:16 eradicator Exp $
 
 MY_PN=${PN/-bin/}
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="SimpServer for Unix: IM instant security transparent proxy"
 SRC_URI="http://www.secway.fr/resources/setup/simpserver/${MY_P}-linux-x86.tgz"
-HOMEPAGE="http://www.secway.fr/"
+HOMEPAGE="http://www.secway.com/"
 LICENSE="simpserver-test"
 
 KEYWORDS="-* ~x86"
@@ -20,16 +20,15 @@ src_compile() {
 }
 
 src_install () {
-	dodoc LICENSE README VERSION doc/CONFIG doc/TODO
+	dodoc LICENSE README doc/CONFIG doc/TODO
 
-	exeinto /usr/sbin
+	exeinto /opt/bin
 	doexe bin/${MY_PN}
 
 	insinto /etc
 	doins etc/simp.conf
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${MY_PN}.rc ${MY_PN}
+	newinitd ${FILESDIR}/${MY_PN}.rc ${MY_PN}
 }
 
 pkg_postinst() {
diff --git a/net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild b/net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild
new file mode 100644
index 000000000000..dceafd501a8b
--- /dev/null
+++ b/net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild,v 1.1 2006/04/01 05:03:16 eradicator Exp $
+
+MY_PN=${PN/-bin/}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SimpServer for Unix: IM instant security transparent proxy"
+SRC_URI="http://download.secway.com/public/products/simpserver/${MY_P}-linux-x86.tgz"
+HOMEPAGE="http://www.secway.com/"
+LICENSE="simpserver-test"
+
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+SLOT="0"
+S=${WORKDIR}/simp
+
+src_compile() {
+	einfo "Binary distribution.  No compilation required."
+}
+
+src_install () {
+	dodoc README VERSION doc/CONFIG doc/TODO
+
+	exeinto /opt/bin
+	doexe bin/${MY_PN}
+
+	insinto /etc
+	doins etc/simp.conf
+
+	newinitd ${FILESDIR}/${MY_PN}.rc ${MY_PN}
+}
+
+pkg_postinst() {
+	einfo "Please edit the configuration file: /etc/simp.conf."
+}