Change the installation process and layout.

(Portage version: 2.1_pre7-r5)

5 files changed, 94 insertions, 41 deletions

diff --git a/net-irc/atheme/ChangeLog b/net-irc/atheme/ChangeLog
index 6bdbe974fad2..4d04eddb185a 100644
--- a/net-irc/atheme/ChangeLog
+++ b/net-irc/atheme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/atheme
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/ChangeLog,v 1.2 2005/11/10 18:19:09 gustavoz Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/ChangeLog,v 1.3 2006/04/11 21:09:53 swegener Exp $
+
+  11 Apr 2006; Sven Wegener <swegener@gentoo.org> +files/atheme.initd,
+  atheme-0.2.2.ebuild:
+  Change the installation process and layout.
 
   10 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> atheme-0.2.2.ebuild:
   Keyworded ~sparc wrt #111971
diff --git a/net-irc/atheme/Manifest b/net-irc/atheme/Manifest
index 173c5e1a1359..151d1bc01732 100644
--- a/net-irc/atheme/Manifest
+++ b/net-irc/atheme/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5c4924ed1f8ebb6ff0ecafb78eaf5e7f ChangeLog 531
 RMD160 8581db4db2cc6f0ba05bd166484b9d2faf075ba7 ChangeLog 531
 SHA256 955d61d4201f7e23c2fb89f12249d91e107ed99bbfbb2368633a795ada62dc8e ChangeLog 531
-MD5 670bd500d34608227819c18a9092e610 atheme-0.2.2.ebuild 1443
-RMD160 17bb134bdf797d60aadeb13e6ec2c2d90baa8733 atheme-0.2.2.ebuild 1443
-SHA256 c364353ac8cabe49eb12ba2e3891072e0aee0fe7b56396f522175a42af404171 atheme-0.2.2.ebuild 1443
-MD5 d9426639feac91a74b80c4f246c53f31 files/digest-atheme-0.2.2 61
-RMD160 267ea84528fe44c5cd13c52af4247c428d8c9bf9 files/digest-atheme-0.2.2 61
-SHA256 97491e27beb8bd9d9395d5da8be85b5f4bd0a093c33646db4c82725247881ef6 files/digest-atheme-0.2.2 61
+MD5 bc9d45e536a4dd7d4aaef38901642007 atheme-0.2.2.ebuild 2154
+RMD160 7184e88756c598467b30ffb8581dad6a0f3d0003 atheme-0.2.2.ebuild 2154
+SHA256 da702294e7d9c6d0734978a9cf8ef04849a3c7cc7b2764d2c0ae7012523a00a5 atheme-0.2.2.ebuild 2154
+MD5 1261bdc03e9d82e061a7a6592217ffc2 files/atheme.initd 466
+RMD160 0f8e2c1da6e9257cbd1397b387fc2ae84cbf9164 files/atheme.initd 466
+SHA256 d2b3ca9a134a7d551619c17372d8f67b5b2065fe0af934590d3a7086986fe13f files/atheme.initd 466
+MD5 32977e7658dc4bde7449f16b29f379de files/digest-atheme-0.2.2 229
+RMD160 92977b8b83e9a1eb782ea4da4946e44970c1ce0e files/digest-atheme-0.2.2 229
+SHA256 cea5b5721a9d318cf40f0f410fe1338127499ba640e5290680f27d8feec1f0bd files/digest-atheme-0.2.2 229
 MD5 fe5c707d98c7536cfde95e9fcbe5117e files/make-postgresql-support-optional.patch 3008
 RMD160 6cb50e3b3a817e0305654068b13a8e5863a755f4 files/make-postgresql-support-optional.patch 3008
 SHA256 2ae5171ba545cceeb5f35305cc06a6bdf17d9faa8fb95464cee2a76a81f5ec37 files/make-postgresql-support-optional.patch 3008
@@ -19,10 +19,3 @@ SHA256 30592c5c5482a9d4223f1ca9027169dc3502e7d927098ab4809cb4fc56b0e4c8 files/ma
 MD5 dadd013c1aa820e498a4ea28a4615ffd metadata.xml 163
 RMD160 49f2e0fedf2809839482dd53834531bbfb2ed48b metadata.xml 163
 SHA256 723ed38b6537174bee7ee28ce30a61dd5f5f66a1c966da088a9008f20fd9700d metadata.xml 163
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHI8JV3J2n04EauwRAlWiAKDIUycyG2Q3K2n5crFHqS4ZEUIWmgCg3cld
-dC0XrMsHv6k6VdLImeqUI6k=
-=4qif
------END PGP SIGNATURE-----
diff --git a/net-irc/atheme/atheme-0.2.2.ebuild b/net-irc/atheme/atheme-0.2.2.ebuild
index 813cf252b541..dbe1318fd377 100644
--- a/net-irc/atheme/atheme-0.2.2.ebuild
+++ b/net-irc/atheme/atheme-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/atheme-0.2.2.ebuild,v 1.2 2005/11/10 18:19:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/atheme-0.2.2.ebuild,v 1.3 2006/04/11 21:09:53 swegener Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="A portable, secure set of open source, and modular IRC services"
 HOMEPAGE="http://atheme.org/"
@@ -13,41 +13,75 @@ SLOT="0"
 KEYWORDS="~sparc ~x86"
 IUSE="largenet postgres"
 
-DEPEND=">=sys-devel/autoconf-2.59"
 RDEPEND="postgres? ( dev-db/postgresql )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.59"
 
 src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd '${S}' failed"
+	unpack ${A}
+	cd ${S}
 
-	epatch ${FILESDIR}/make-postgresql-support-optional.patch \
-		|| die "epacth failed"
-	epatch ${FILESDIR}/makefile-DESTDIR-support.patch \
-		|| die "epatch failed"
+	epatch ${FILESDIR}/make-postgresql-support-optional.patch || die "epacth failed"
+	epatch ${FILESDIR}/makefile-DESTDIR-support.patch || die "epatch failed"
+
+	eautoreconf
 }
 
 src_compile() {
-	autoreconf -i || die "autoreconf failed"
-	./configure \
+	econf \
 		--prefix=/var/lib/atheme \
-		`use_with postgresql` \
-		`use_with largenet large-net` \
-		|| die "configure failed"
-
-	make DESTDIR="${D}" || die "make failed"
+		$(use_with postgresql) \
+		$(use_with largenet large-net) \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "emake install failed"
-	cp "${D}"/var/lib/atheme/etc/{example,atheme}.conf || die "cp failed"
-	dodoc ChangeLog INSTALL README || die "dodoc failed"
-	dodoc doc/{example_module.c,LICENSE,POSTGRESQL,RELEASE,ROADMAP} \
+	local dir
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodir /{etc,usr/{lib,share}}/atheme
+	keepdir /var/lib/atheme/var
+	fowners atheme:atheme /etc/atheme /var/lib/atheme/var
+	fperms 750 /etc/atheme /var/lib/atheme/var
+
+	for dir in backend contrib modules protocol
+	do
+		mv "${D}"/var/lib/atheme/${dir} "${D}"/usr/lib/atheme
+		dosym /usr/lib/atheme/${dir} /var/lib/atheme
+	done
+
+	mv "${D}"/var/lib/atheme/help "${D}"/usr/share/atheme
+	dosym /usr/share/atheme/help /var/lib/atheme
+
+	mv "${D}"/var/lib/atheme/etc/example.conf ${D}/etc/atheme/atheme.conf
+	fowners root:atheme /etc/atheme/atheme.conf
+	fperms 640 /etc/atheme/atheme.conf
+
+	rm -rf "${D}"/var/lib/atheme/etc
+	dosym /etc/atheme /var/lib/atheme/etc
+
+	dobin "${D}"/var/lib/atheme/bin/atheme || die "dobin failed"
+
+	dodoc \
+		ChangeLog INSTALL README \
+		doc/{example_module.c,LICENSE,POSTGRESQL,RELEASE,ROADMAP} \
 		|| die "dodoc failed"
-	rm -rf "${D}"/var/lib/atheme/doc
+
+	newinitd "${FILESDIR}"/atheme.initd atheme
+
+	# And remove stuff we don't need
+	rm -rf "${D}"/var/lib/atheme/{bin,doc}
+}
+
+pkg_setup() {
+	enewgroup atheme
+	enewuser atheme -1 -1 /var/lib/atheme atheme
 }
 
 pkg_postinst() {
 	einfo
-	einfo "Don't forget to edit /var/lib/atheme/etc/atheme.conf!"
+	einfo "Don't forget to edit /etc/atheme/atheme.conf!"
 	einfo
 }
diff --git a/net-irc/atheme/files/atheme.initd b/net-irc/atheme/files/atheme.initd
new file mode 100644
index 000000000000..28315f623f81
--- /dev/null
+++ b/net-irc/atheme/files/atheme.initd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/files/atheme.initd,v 1.1 2006/04/11 21:09:53 swegener Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting atheme"
+	start-stop-daemon --start --quiet --chuid atheme --exec /usr/bin/atheme &>/dev/null
+	eend $? "Failed to start atheme"
+}
+
+stop() {
+	ebegin "Stopping atheme"
+	start-stop-daemon --stop --quiet --pidfile /var/lib/atheme/var/atheme.pid
+	eend $? "Failed to stop atheme"
+}
diff --git a/net-irc/atheme/files/digest-atheme-0.2.2 b/net-irc/atheme/files/digest-atheme-0.2.2
index daeb6e502230..e12da75a1c6d 100644
--- a/net-irc/atheme/files/digest-atheme-0.2.2
+++ b/net-irc/atheme/files/digest-atheme-0.2.2
@@ -1 +1,3 @@
 MD5 3e66bd34992d0b14f7d898a9b207c430 atheme-0.2.2.tgz 297623
+RMD160 782338bd3a917b70b3e45bcb913b427e3c788d6c atheme-0.2.2.tgz 297623
+SHA256 f8021e63e15858e8b212daf908bd2a51bb72cc6352e9856ade5149a3bdb8e382 atheme-0.2.2.tgz 297623