Bump to unrealircd-3.2.9_rc2 with a refactored ebuild using EAPI=4, taking advantage of a somewhat-fixed ./configure, and new initscripts.

Package-Manager: portage-2.2.0_alpha46-r1/cvs/Linux x86_64

6 files changed, 259 insertions, 16 deletions

diff --git a/net-irc/unrealircd/ChangeLog b/net-irc/unrealircd/ChangeLog
index 54b90cda81fa..9c1e99f0d55a 100644
--- a/net-irc/unrealircd/ChangeLog
+++ b/net-irc/unrealircd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/unrealircd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.86 2011/06/26 16:59:45 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.87 2011/07/27 12:41:19 binki Exp $
+
+*unrealircd-3.2.9_rc2 (27 Jul 2011)
+
+  27 Jul 2011; Nathan Phillip Brink <binki@gentoo.org>
+  +unrealircd-3.2.9_rc2.ebuild, +files/unrealircd.confd-r1,
+  +files/unrealircd.initd, metadata.xml:
+  Bump to unrealircd-3.2.9_rc2 with a refactored ebuild using EAPI=4, taking
+  advantage of a somewhat-fixed ./configure, and new initscripts.
 
   26 Jun 2011; Nathan Phillip Brink <binki@gentoo.org> metadata.xml:
   Set myself (binki) as unrealircd's maintainer.
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 9f690d03c09f..0620890a1a55 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -4,26 +4,30 @@ Hash: SHA256
 AUX unrealircd-system-cares.patch 4850 RMD160 6bd9456bda2b1dc233cf7ad97c60c0ee11c1f99b SHA1 e9086146a7031b874e514eb2a22c06b5decb8adf SHA256 e3be39af381c12349355ed44c1bfac1a205a84728d006fd3de3cff0a564ee0d9
 AUX unrealircd-system-tre.patch 2265 RMD160 16324b6639585d3c62b763f9f0f36c233ed0bbf0 SHA1 df61297ad7dd136884ff78644bd2c98b2c794578 SHA256 2a5e958a19e6b85df1a2f30cc56443f8080a0b7f2c01e6765cfe6b758c16615d
 AUX unrealircd.confd 499 RMD160 666439c6e992d3314f8694ba58e8f3e018421f1c SHA1 5cb49d7e9a79c7f8e0b2182dff47811a2f3fb885 SHA256 ae6ce779fae68c1380a7d37950c5ef3b695e434bb435dcdc0f6d3d2282f72582
+AUX unrealircd.confd-r1 1339 RMD160 deda34776d96345bddf504923490dae831f74bca SHA1 87bb56e23a08b090d332edd8c128db58e5c92fb7 SHA256 d06a0d17b12171f7b83c8e9ab5ecb84ab5a98a0310b12f3eb969a5046a26f70a
+AUX unrealircd.initd 941 RMD160 277de51768fc1bf671819e7825899eb9e24fa3a1 SHA1 cac9fe6574717b61e79391462c2a9fcce12f4289 SHA256 194a112c425bebd00cef8de0bcff707ed1a7960bc5e383b575a481566d4f60cc
 AUX unrealircd.rc 681 RMD160 a0692b5eb4bdeb8893e023b78306b55c4df1c441 SHA1 fb885a544a5c4a9e26ecb7425457d097fffb5e1f SHA256 0d9eb50d6352c6d57cb1df10f26ffd8a5204e5f5aa2ba27f441947107de655f9
 DIST Unreal3.2.8.1-notrojan.tar.gz 2866456 RMD160 c8e76239e33ba170743f2ddae6bc24782064f105 SHA1 363c3c995bb38cf601f409610ce1937a0002c419 SHA256 009add8da68b6fb66608d06302e59fa9fb994f901cbd92e6f4f10963f2077741
+DIST Unreal3.2.9-rc2.tar.gz 3063842 RMD160 594771f9ad9ee53108ecaf42e2368292b32d8f65 SHA1 de3e4b14f67ce11e54e3e79e9767e9ea8972a2b0 SHA256 d90acde15acbc2f190095aefcf8d3fc92ad340a249d26ff6d7054dac55326d6e
 EBUILD unrealircd-3.2.8.1-r1.ebuild 4803 RMD160 6d57d84c9115f478fbc394358d853d5062e2e213 SHA1 4ca9d055ee72ff9d6c0547ca104b97caf6d97484 SHA256 89e2a1ff11f5dfd9b6138d049ee314919a5c6531a285b5a680410c025ca467e3
 EBUILD unrealircd-3.2.8.1-r2.ebuild 4803 RMD160 ad6871ec34b9518d4b0725f4c9a762e0e6e9b94b SHA1 9682d4d5190822256dc7a25ec87407a3591a90df SHA256 8d599cfd2e8c302227cf51eb0a22130000a4a4cb6bb2ac28ca68dce042afd916
-MISC ChangeLog 12510 RMD160 a3758f045d118e85001e4cd14f4001995e0755cc SHA1 7e7295e28c63782be7eeb7d7fb211d4570576405 SHA256 714bf87c48e13f706e56c89673af6cd670f2a52e55f7a07762abf13b046d0545
-MISC metadata.xml 998 RMD160 891ce5a9e9c85321449d1096fab714e044c71a86 SHA1 661330ed56025987107d5249d9da4818be0f8690 SHA256 152a58a4f51003cdfb03b9649316c9c766375c10cab38ae1836cfc6b4eb65b30
+EBUILD unrealircd-3.2.9_rc2.ebuild 4734 RMD160 20d8de930f732eb74e371de7c0b3c993c54ae1c2 SHA1 85844932b6852c9e995d571a62d51aec36b559b0 SHA256 0da18d2ff1ca063ab3db332c0219002e0ff2e635502e5ee7b5493dead4d15627
+MISC ChangeLog 12847 RMD160 075bea8428ee2519a7581a9c09380a979a5e9795 SHA1 b215da77c1afc7000163262eaf986ba0ea1db8df SHA256 08f1f8152b6e1f296936752f7efc8a06250feeba8f5a4d4ea99cd8d9f205eb93
+MISC metadata.xml 1151 RMD160 92c45764e66a24ee236204e4b69885fe0d66de96 SHA1 27bea15f83c37d715c23d13559d5c04af28eb52b SHA256 766c92c8b54936b0c5fbb3a99356eee32ff52dbfd56b82f548a070199cf9ac85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOB2WyAAoJEHQ6UuhrqBBQI7AP/Aq/7lF7t60/I9jFn2GdlJif
-Zi6cA/fuf88eU5jJ2cT18JpvZ4KqXQtLsSW8EwFDu7zfxTVaq9b2Efb94+RHrHR1
-mRAkj40udc6y5CUzYT5CpskoGZwc+0jFXRaUS8XBn5cdPQx4tK85HBxXcNuAMFAT
-zojGzbDdrPp5RE9cBoaGIIKWEmHzVQvY8qoEimewuo2J4PECynM4RzgcSscvl46n
-BauPfTLJHArFStDXUXakFm68ltB2L5GDJtMZ0wVBQwut8zl2MOKoms4pTVU8Ikjn
-DE9nEMVzYP7pwlVpoJXiFcujmQCb0vf9WyVLJ5PMA9DCfTCmkcBFy5WgBolPwlBF
-3sIyF1T3+Xe5Y1j/y3zVvxf38/TElyvw+L/Xx+pAt00OZbxHzIBR1P54knEktOhD
-nEEAFCJKL5HZbHACFiSTDT/5S605aEOBjYhrRsi18WOnkWUUjfdgLc7hxuXKelza
-k7qaY5FXKHFOvi7hwWOqVwJYrjgiNb4rpBpXqCQLv6xTVHWWGtb7uUGIswJhmSmb
-3A3/OXnB+UkRohUpZvmPr1mj+nXvhrbS+FSLiNfH+GvhxRkrJcwODKJFDIAW/AgB
-kWh3ybHHx0hMzEkFmob/pIsj3jZ/rzGDaGRsx7E1ijlZ0kdQvD2EBXyDH24gqhuo
-PpaGa0eoJwFSaj8Y1ZjV
-=aq1N
+iQIcBAEBCAAGBQJOMAfiAAoJEHQ6UuhrqBBQTBcP/iQD6hE3S5zgHO/Ivgc2g2qo
+imnXnLqt/qf+u5dGrDb6qGEdcATi7zqv8euTRch/1m52YNpkc5fhZGFdGXBiMEh+
+8RL9WlyKzATLT5j+y9H28RyvYW5h5jXA7NBF40657bWWKOjaIJKXemRFFzMBEDbO
+KJZvnPqFmHXsj0JotKmpGR6Al0QHo33hF7rZ/riHooXGejJJqloZZWYGzMELC56l
+kV5rGZtR5mEr3hQEscQrMly6kXVJ+4TrdnUFRAxAgDuQbf+f5+EsE/i92UeKG5B8
+Bh5tG4wCKHcIqh5dwi9SHlDp/NzQ8A+4BTI/204XbnatyYGY/q1hpxULTNxB5sEl
+eZhZ8D+du1EyEFP3rXsiOa3aUzL3w7/NcVtWw8OuR7x3uKWXJwIU2YgWmZCo5w2g
+TErFNaKR04fSSTxzMtZIi2H1Y/hXJJaVDb2j7gR7ONGiAzCSp4K2rEwpST9/ToU1
+AGEk+yfPhDpc3Mx1e3zkQyou1lA3kxK0VVThlCyCrI1GeqwSZpYC5/CSJ6xQHwKx
+TTcp3HGSD0WlTFyciyoG9G4MN0xMbiP/ATJjZe5EyCufdcP8IduAACc+SkNrFR2U
+u2wbNrFO6gKteMuo2jQsWhnz1lU50GeLlDUHl9IMxTHIB6WZq19kRDEZmWplSuqe
+Aq/K8diYjzsRvYFi+aQ4
+=gJPY
 -----END PGP SIGNATURE-----
diff --git a/net-irc/unrealircd/files/unrealircd.confd-r1 b/net-irc/unrealircd/files/unrealircd.confd-r1
new file mode 100644
index 000000000000..24e940c4e622
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.confd-r1
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.confd-r1,v 1.1 2011/07/27 12:41:19 binki Exp $
+
+# user to run unrealircd as
+UNREALIRCD_USER="unrealircd"
+
+# Which configuration file to load instead of unrealircd.conf. If you
+# want to run multiple instances of unrealircd, you must edit
+# files::pidfile to match UNREALIRCD_PIDFILE. You should also ensure
+# that files::tunefile is different for each unrealircd instance. See
+# http://unrealircd.org/docs.php#filesblock.
+#
+# To support multiple instances of unrealircd, you may create symlinks
+# in /etc/init.d pointing to /etc/init.d/unrealircd. It is recommended
+# that the scheme unrealircd.${instance_name} be used. For each
+# instance, you may make a copy of this file with the appropriate name
+# to override default options specific to that instance.
+UNREALIRCD_CONF="/etc/unrealircd/${SVCNAME}.conf"
+
+# The path where unrealircd is configured to create its pidfile.
+UNREALIRCD_PIDFILE="/var/run/unrealircd/${SVCNAME#unreal}.pid"
+
+# extra options to pass to unrealircd ...
+# You should not specify the -f option here; use
+# UNREALIRCD_CONF instead.
+#
+# [-h servername]
+# [-p portnumber]
+# [-x loglevel]
+# [-t] (to enable debug output)
+UNREALIRCD_OPTS=""
diff --git a/net-irc/unrealircd/files/unrealircd.initd b/net-irc/unrealircd/files/unrealircd.initd
new file mode 100644
index 000000000000..28bb7bcd5bb1
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.initd
@@ -0,0 +1,35 @@
+#!/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/unrealircd/files/unrealircd.initd,v 1.1 2011/07/27 12:41:19 binki Exp $
+
+opts="${opts} reload"
+
+# Defaults
+: ${UNREALIRCD_USER:=unrealircd}
+: ${UNREALIRCD_CONF:=/etc/unrealircd/${SVCNAME}.conf}
+: ${UNREALIRCD_PIDFILE:=/var/run/unrealircd/${SVCNAME#unreal}.pid}
+
+depend() {
+	use dns net
+	provide ircd
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet --exec /usr/bin/unrealircd \
+		--user ${UNREALIRCD_USER} --pidfile "${UNREALIRCD_PIDFILE}" -- -f "${UNREALIRCD_CONF}" ${UNREALIRCD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile "${UNREALIRCD_PIDFILE}"
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --quiet --pidfile "${UNREALIRCD_PIDFILE}"
+	eend $?
+}
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index 09597cc3d78a..97d1a548145b 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -7,6 +7,7 @@
     <name>Nathan Phillip Brink</name>
   </maintainer>
 <use>
+  <flag name='extban-stacking'>Enable extended channel bans (such as +b ~c: and +b ~n:) to contain other extended bans instead of just hostmasks.</flag>
 	<flag name='hub'>Enable hub support</flag>
 	<flag name='spoof'>Enable the spoof protection</flag>
 	<flag name='prefixaq'>Enable chanadmin and chanowner prefixes</flag>
diff --git a/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild b/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild
new file mode 100644
index 000000000000..ed80ed6b5e20
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild,v 1.1 2011/07/27 12:41:19 binki Exp $
+
+EAPI=4
+
+inherit eutils autotools ssl-cert versionator multilib
+
+MY_P=Unreal${PV/_/-}
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="http://www.unrealircd.com/"
+SRC_URI="http://www.unrealircd.com/downloads/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="curl ipv6 +extban-stacking +operoverride +spoof operoverride-verify +prefixaq
+	showlistmodes shunnotices ssl topicisnuhost +usermod zlib"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )
+	curl? ( net-misc/curl[ares] )
+	dev-libs/tre
+	>=net-dns/c-ares-1.7"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=dev-util/pkgconfig-0.25"
+
+S=${WORKDIR}/Unreal$(get_version_component_range 1-2)
+
+pkg_setup() {
+	enewuser unrealircd
+}
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm extras/*.gz || die
+
+	sed -i \
+		-e "s:ircd\.pid:${EPREFIX}/var/run/unrealircd/ircd.pid:" \
+		-e "s:ircd\.log:${EPREFIX}/var/log/unrealircd/ircd.log:" \
+		-e "s:debug\.log:${EPREFIX}/var/log/unrealircd/debug.log:" \
+		-e "s:ircd\.tune:${EPREFIX}/var/lib/unrealircd/ircd.tune:" \
+		include/config.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	econf \
+		--with-listen=5 \
+		--with-dpath="${EPREFRIX}"/etc/unrealircd \
+		--with-spath="${EPREFIX}"/usr/bin/unrealircd \
+		--with-nick-history=2000 \
+		--with-sendq=3000000 \
+		--with-bufferpool=18 \
+		--with-permissions=0600 \
+		--with-fd-setsize=1024 \
+		--with-system-cares \
+		--with-system-tre \
+		--enable-dynamic-linking \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable ipv6 inet6) \
+		$(use_enable prefixaq) \
+		$(use_enable spoof nospoof) \
+		$(use_enable ssl ssl "${EPREFIX}"/usr) \
+		$(use_enable zlib ziplinks "${EPREFIX}"/usr) \
+		$(use_with showlistmodes) \
+		$(use_with topicisnuhost) \
+		$(use_with shunnotices) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify) \
+		$(use_with !usermod disableusermod) \
+		$(use_with !extban-stacking disable-extendedban-stacking)
+}
+
+src_install() {
+	keepdir /var/{lib,log,run}/unrealircd
+
+	newbin src/ircd unrealircd
+
+	exeinto /usr/$(get_libdir)/unrealircd/modules
+	doexe src/modules/*.so
+
+	dodir /etc/unrealircd
+	dosym /var/lib/unrealircd /etc/unrealircd/tmp
+
+	insinto /etc/unrealircd
+	doins {badwords.*,help,spamfilter,dccallow}.conf
+	newins doc/example.conf unrealircd.conf
+
+	insinto /etc/unrealircd/aliases
+	doins aliases/*.conf
+	insinto /etc/unrealircd/networks
+	doins networks/*.network
+
+	local so_suffix=so
+	[[ ${CHOST} == -*mingw* ]] && so_suffix=dll
+	sed -i \
+		-e s:src/modules:"${EPREFIX}"/usr/$(get_libdir)/unrealircd/modules: \
+		-e '/loadmodule.*\.'${so_suffix}'/s;^//;;' \
+		-e s:ircd\\.log:"${EPREFIX}"/var/log/unrealircd/ircd.log: \
+		"${ED}"/etc/unrealircd/unrealircd.conf \
+		|| die
+
+	dodoc \
+		Changes Donation Unreal.nfo networks/makenet \
+		ircdcron/{ircd.cron,ircdchk} \
+		|| die "dodoc failed"
+	dohtml doc/*.html
+
+	newinitd "${FILESDIR}"/unrealircd.initd unrealircd
+	newconfd "${FILESDIR}"/unrealircd.confd-r1 unrealircd
+
+	fperms 700 /etc/unrealircd
+	fowners -R unrealircd /{etc,var/{lib,log,run}}/unrealircd
+}
+
+pkg_postinst() {
+	# Move docert call from scr_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if use ssl ; then
+		if [[ ! -f "${EROOT}"/etc/unrealircd/server.cert.key ]]; then
+			install_cert /etc/unrealircd/server.cert
+			chown unrealircd "${EROOT}"/etc/unrealircd/server.cert.*
+			ln -snf server.cert.key "${EROOT}"/etc/unrealircd/server.key.pem
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"/etc/unrealircd/unrealircd.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			"$(unrealircd -k 2>&1 | sed -n -e 2p)"
+			"$(unrealircd -k 2>&1 | sed -n -e 2p)"
+			"$(unrealircd -k 2>&1 | sed -n -e 2p)"
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can find example cron scripts here:"
+	elog "   /usr/share/doc/${PF}/ircd.cron.gz"
+	elog "   /usr/share/doc/${PF}/ircdchk.gz"
+	elog
+	elog "You can also use /etc/init.d/unrealircd to start at boot"
+}