net-irc/inspircd: Version bump. Rename patches / init files.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

6 files changed, 151 insertions, 13 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index e3c40031c505..7ba5fa0ce392 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-irc/inspircd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.37 2011/05/11 11:51:29 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.38 2011/06/20 16:55:57 c1pher Exp $
+
+*inspircd-2.0.4 (20 Jun 2011)
+
+  20 Jun 2011; Dane Smith <c1pher@gentoo.org> inspircd-2.0.3.ebuild,
+  -files/inspircd-2.0.3-fix-config.patch, -files/inspircd-2.0.3-init.d,
+  +inspircd-2.0.4.ebuild, +files/inspircd-fix-config.patch,
+  +files/inspircd-init.d:
+  Version bump. Move -2.0.3-fix-config patch and -2.0.3-init.d to
+  ${PN}-fix-config.patch and ${PN}-init.d. Change 2.0.3.ebuild to
+  use new patch and init file.
 
   11 May 2011; Dane Smith <c1pher@gentoo.org> inspircd-2.0.3.ebuild:
   Fix use of || die in subshell in ebuild. No revbump.
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 671c503eabed..2ec193ac6bea 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,19 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX init.d_inspircd 835 RMD160 df90290dbbf1aba7e9b24cc8467798b20c571899 SHA1 83d5e24da808993f264481945c2c37911853b6d4 SHA256 9342982271398f3572305b8bd83007d9f0aab3ee374c19044153dd5b16cf5780
-AUX inspircd-2.0.3-fix-config.patch 2656 RMD160 988ba38a32cc8da5c566326a02f362eaf7dc02f1 SHA1 3f94c4ea95ac5c11d717f02b82d64a398f212377 SHA256 ab88c2ef4b4670283a2e3f4c32d4fd212b508ab53899ee1694bb71df5f9d96a1
-AUX inspircd-2.0.3-init.d 760 RMD160 7a23d6f2d63aff134a52ce2356d737622e4d2ced SHA1 ddfb9c97697bbc9f44aabec058293666f21db848 SHA256 4b400675a2a3094dd03b4885413dbf7fefc80327aab80e40d180693a85cd3353
+AUX inspircd-fix-config.patch 2656 RMD160 988ba38a32cc8da5c566326a02f362eaf7dc02f1 SHA1 3f94c4ea95ac5c11d717f02b82d64a398f212377 SHA256 ab88c2ef4b4670283a2e3f4c32d4fd212b508ab53899ee1694bb71df5f9d96a1
+AUX inspircd-init.d 754 RMD160 6bb390cf0bdcc10892886be7dbc7b1c40aecbe14 SHA1 fa4faa440dd85c0225ef343f12ba4e63f364bf4c SHA256 041986c91a218c1cdc4d88f78da915990dd4de565c9b3cca3cf2fb15ef38db8f
 DIST InspIRCd-1.2.8.tar.bz2 637194 RMD160 e2581b194419add2fe2918263a6d1d545cf8a4d0 SHA1 201d83459eddc899143b10c768378059c2669ae1 SHA256 fa856ddb6d7ab2b4dc6aa6b0f58bbb2360823ce296d4e9dd0f18d630d8c7cee5
 DIST InspIRCd-2.0.3.tar.bz2 579960 RMD160 1ebe6b060b7db6be0697a71bbba59a48772aa9b9 SHA1 fc68d8322110fd882d0ffc426a5ff3b81677bd12 SHA256 f3d89a2a37137948c7f4e5b40f6670a0129327b66a3442d233c1026151d06182
+DIST InspIRCd-2.0.4.tar.bz2 579791 RMD160 896736403fd7a219438c94e1b519d6d854b977aa SHA1 8160b229c3ec18f4d496067e9134db1f44a21c26 SHA256 19c5ff6b52b4b5f9f18ec63de28618dee31c634b0bcecedadcd6a5c6e310fb1e
 EBUILD inspircd-1.2.8.ebuild 3372 RMD160 c11629cadbd2454297cbb24de8a24f6933f9692c SHA1 abbda33b957474fe66a17bd799e3cfea840d5ad0 SHA256 221f5ec40bf3b23bfffd85059509aa8819ad6c332dd18b4148035caeebc0063b
-EBUILD inspircd-2.0.3.ebuild 3515 RMD160 0ce61acbf6700d7c59b2e92fb1bdaf36b0190674 SHA1 64a8c099f9c27a9eecb11779bd6b1e332db968ef SHA256 8ebd6e7c6be4c5f1bd51b5d05a4c8cccce75f44f1d75eac56f1a6d7d7dd756cc
-MISC ChangeLog 6788 RMD160 dad33f655b2d13c64d14bd822ef7c8ac7930eaf0 SHA1 b6b0d6298b82a244ce1f46ae946907d6a835f7f6 SHA256 b17858b3541add2c10e9ebb0194011fef825323e901360f5421aa43037f89252
+EBUILD inspircd-2.0.3.ebuild 3517 RMD160 15739f4de675339089e81bb1b7867e9ce6a982fd SHA1 b73bf1e6e573a3a7123c8df33a27fd2758f64d31 SHA256 7a8c434d8e354fceb267ac22adc5ca233d591abda4afccadb387b47c2d612ecb
+EBUILD inspircd-2.0.4.ebuild 3519 RMD160 35b40543a80778065c47e3fa51a6a9ebfcd0f5d9 SHA1 b08bb223aa8e3b531f4164b2104788060322dbc6 SHA256 839d9e6f120d1bf33fb29dddd5b654b95f9a8295c4a2211e14cdc1077b167ccb
+MISC ChangeLog 7210 RMD160 d6a65e52aa385b37b62c2a8017a4343891d9465b SHA1 099fc9eac185837a0c97dfa6357f69646b7b3b5a SHA256 05a08c58035c2baaedc5d0fcbbb9faf6db34302f8b541c278fd530323b1f2331
 MISC metadata.xml 779 RMD160 bd8095badcbde765b4cc27e98c5b62e892d9e5cb SHA1 5b59ddf682dcc6d7595b60a117e0449a2c98ee61 SHA256 8814b6795c8a15010ed66e4cd3129c903ac3bf2c15e4ec61fe7acb613b547588
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3Kg50ACgkQXkR9YqOcLPFAQQD/bIFyEQMXDrr+adwrlES4P3V1
-evpBBi4fXIgYNBRof9wBAIpiV9jMgaF8kENkLqR+UawiBlg+0YORNP/ehKw8+ZnR
-=fM0p
+iQIcBAEBAgAGBQJN/3pnAAoJEEsurZwMLhUxUnkQAKtA0v/xMONiBZSfJRajzCTB
+fgyArhYk9C6oVWbAGzChDWEwOz4i1upkKqew8/79gjIy4655fqfSTJTn5lxMmvah
++k9fsxEWrKWpq10SiUiWw8d3plxeeh56iL0g4vDaW6n9XWpuDM4H54zz12ibeWV5
+0LkbjScdbyQDmQdNDmmUP/BY2Vl5uVSN3oDbNQ8RyQYnTNZM3+Ffqp+T8QVR88rr
+bwCeYJfK5Tc09y2uA04Uob2B+EH4/LE22ZmdZpxdQkee7Mtf5WymSn0ah1qapekY
+sZ4gLVhEdsfk7YJcqdJt+w6iif1EiV6Vr3UN7LJyhTNouusEzhd5luE9AMV1MpDv
+2ENcAYPhHA8lV437wGXcx4sGN8RSJv0wKLRvICnXNGuxE788dZySUDVFiuquRzpW
+qqfQymhA77zQVG/dDGSzTaKNOkKUIUUewXRdfHfFM6nVugwHnneIb8uCn33DuNDw
+CrKULwsatGG9hPz3JZyPQgYOmn9w4Kjkp4HD0h8gPrXvHTqaQodtxDCZURyLbbY9
+qWzhcKEDJ0wDVTUA0l1PozCT/EyX0I2ESQOjBlImylEBKPT7W5QrfRNOcEB02OPF
+5VyDwKF+6qd1D4XA6Tq9yWaZ3rRglDKdS3Qc6QZQ6PpoUsPjx1TI5WnOfavhHrqv
+ZcZ3Ie86//5iWgD/NL3W
+=KkTH
 -----END PGP SIGNATURE-----
diff --git a/net-irc/inspircd/files/inspircd-2.0.3-fix-config.patch b/net-irc/inspircd/files/inspircd-fix-config.patch
index 5ca12fa4d56f..5ca12fa4d56f 100644
--- a/net-irc/inspircd/files/inspircd-2.0.3-fix-config.patch
+++ b/net-irc/inspircd/files/inspircd-fix-config.patch
diff --git a/net-irc/inspircd/files/inspircd-2.0.3-init.d b/net-irc/inspircd/files/inspircd-init.d
index 75eb54b8e088..e766cce697f0 100644
--- a/net-irc/inspircd/files/inspircd-2.0.3-init.d
+++ b/net-irc/inspircd/files/inspircd-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.3-init.d,v 1.1 2011/04/26 14:22:31 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/files/inspircd-init.d,v 1.1 2011/06/20 16:55:57 c1pher Exp $
 
 opts="${opts} rehash"
 
diff --git a/net-irc/inspircd/inspircd-2.0.3.ebuild b/net-irc/inspircd/inspircd-2.0.3.ebuild
index a6b19de943e5..a1c6076cd1b8 100644
--- a/net-irc/inspircd/inspircd-2.0.3.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.3.ebuild,v 1.6 2011/05/11 11:51:29 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.3.ebuild,v 1.7 2011/06/20 16:55:57 c1pher Exp $
 
 EAPI=2
 inherit eutils multilib flag-o-matic
@@ -42,7 +42,7 @@ src_prepare() {
 	sed -i 's/\$(D)/\$(DEBUGLEVEL)/' ${makefiletpl} || die "sed failed"
 	sed -i 's/\$(T)/\$(TGT)/' ${makefiletpl} || die "sed failed"
 
-	epatch "${FILESDIR}"/${P}-fix-config.patch
+	epatch "${FILESDIR}"/${PN}-fix-config.patch
 }
 
 src_configure() {
@@ -101,7 +101,7 @@ src_install() {
 	diropts -oinspircd -ginspircd
 	dodir "/var/run/inspircd" || die "Creating run directory failed"
 
-	newinitd "${FILESDIR}"/${P}-init.d inspircd \
+	newinitd "${FILESDIR}"/${PN}-init.d inspircd \
 	         || die "Installing inspircd init script failed"
 	keepdir "/var/log/inspircd/"
 }
diff --git a/net-irc/inspircd/inspircd-2.0.4.ebuild b/net-irc/inspircd/inspircd-2.0.4.ebuild
new file mode 100644
index 000000000000..e4a08be50944
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.4.ebuild,v 1.1 2011/06/20 16:55:57 c1pher Exp $
+
+EAPI=2
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="http://www.inspircd.org/"
+SRC_URI="http://www.inspircd.org/downloads/InspIRCd-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openssl gnutls ipv6 mysql postgres sqlite ldap"
+
+RDEPEND="
+	dev-lang/perl
+	openssl? ( dev-libs/openssl )
+	gnutls? ( net-libs/gnutls )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-server )
+	sqlite? ( >=dev-db/sqlite-3.0 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/inspircd"
+
+pkg_setup() {
+	enewgroup inspircd
+	enewuser inspircd -1 -1 -1 inspircd
+}
+
+src_prepare() {
+	# The makefile template defines variables (D and T) used by the
+	# ebuild system. Changing them to safe names.
+	local makefiletpl="${S}/make/template/main.mk"
+
+	sed -i 's/IFNDEF D/IFNDEF DEBUGLEVEL/' ${makefiletpl} || die "sed failed"
+	sed -i 's/IFDEF T/IFDEF TGT/' ${makefiletpl} || die "sed failed"
+	sed -i 's/D=0/DEBUGLEVEL=0/' ${makefiletpl} || die "sed failed"
+	sed -i 's/\$(D)/\$(DEBUGLEVEL)/' ${makefiletpl} || die "sed failed"
+	sed -i 's/\$(T)/\$(TGT)/' ${makefiletpl} || die "sed failed"
+
+	epatch "${FILESDIR}"/${PN}-fix-config.patch
+}
+
+src_configure() {
+	local extras=""
+	local dipv6="--disable-ipv6"
+
+	use openssl && extras="${extras}m_ssl_openssl.cpp,"
+	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
+	use ldap && extras="${extras}m_ldapauth.cpp,"
+	use mysql && extras="${extras}m_mysql.cpp,"
+	use postgres && extras="${extras}m_pgsql.cpp,"
+	use sqlite && extras="${extras}m_sqlite3.cpp,"
+
+	use ipv6 && dipv6=""
+
+	# allow inspircd to be built by root
+	touch .force-root-ok || die
+
+	if [ -n "${extras}" ]; then
+		./configure --disable-interactive \
+			--enable-extras=${extras} || die "configure failed"
+	fi
+
+	./configure \
+		$(use_enable openssl) \
+		$(use_enable gnutls) \
+	    --disable-interactive \
+		--prefix="/usr/$(get_libdir)/inspircd" \
+		--config-dir="/etc/inspircd" \
+		--binary-dir="/usr/bin" \
+		--module-dir="/usr/$(get_libdir)/inspircd/modules" \
+		${dipv6} || die "configure failed"
+}
+
+src_compile() {
+	append-flags -Iinclude -fPIC
+	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake INSTUID=inspircd \
+		BINPATH="${D}/usr/bin" \
+		BASE="${D}/usr/$(get_libdir)/inspircd/inspircd.launcher" \
+		MODPATH="${D}/usr/$(get_libdir)/inspircd/modules/" \
+		CONPATH="${D}/etc/inspircd" install || die "emake install failed"
+
+	insinto /etc/inspircd/modules
+	doins docs/modules/* || die "Installing inspircd modules failed"
+
+	insinto /etc/inspircd/aliases
+	doins docs/aliases/* || die "Installing inspircd aliases failed"
+
+	insinto /usr/include/inspircd/
+	doins include/* || die "Installing inspircd include files failed"
+
+	diropts -oinspircd -ginspircd
+	dodir "/var/run/inspircd" || die "Creating run directory failed"
+
+	newinitd "${FILESDIR}"/${PN}-init.d inspircd \
+	         || die "Installing inspircd init script failed"
+	keepdir "/var/log/inspircd/"
+}
+
+pkg_postinst() {
+	elog "Before starting inspircd the first time you should create"
+	elog "the /etc/inspircd/inspircd.conf file."
+	elog "You can find example configuration files under /etc/inspircd."
+	elog "Read the inspircd.conf.example file carefully before starting "
+	elog "the service."
+	elog
+}