Version bump.

Package-Manager: portage-2.2_rc69/cvs/Linux i686

4 files changed, 136 insertions, 3 deletions

diff --git a/net-nds/yp-tools/ChangeLog b/net-nds/yp-tools/ChangeLog
index 8cce02ddf068..7e3a89897e8c 100644
--- a/net-nds/yp-tools/ChangeLog
+++ b/net-nds/yp-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/yp-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/ChangeLog,v 1.44 2009/12/15 19:08:59 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/ChangeLog,v 1.45 2010/08/28 00:40:57 jer Exp $
+
+*yp-tools-2.12 (28 Aug 2010)
+
+  28 Aug 2010; Jeroen Roovers <jer@gentoo.org> +yp-tools-2.12.ebuild:
+  Version bump.
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org> yp-tools-2.9-r1.ebuild:
   alpha/ia64/sparc stable wrt #293565
diff --git a/net-nds/yp-tools/yp-tools-2.12.ebuild b/net-nds/yp-tools/yp-tools-2.12.ebuild
new file mode 100644
index 000000000000..d9333fadf724
--- /dev/null
+++ b/net-nds/yp-tools/yp-tools-2.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/yp-tools-2.12.ebuild,v 1.1 2010/08/28 00:40:57 jer Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Network Information Service tools"
+HOMEPAGE="http://www.linux-nis.org/nis/"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+src_configure() {
+	local myconf="--sysconfdir=/etc/yp"
+	if ! use nls
+	then
+		myconf="${myconf} --disable-nls"
+		mkdir intl
+		touch intl/libintl.h
+		export CPPFLAGS="${CPPFLAGS} -I${S}"
+
+		for i in lib/nicknames.c src/*.c
+		do
+			cp ${i} ${i}.orig
+			sed 's:<libintl.h>:<intl/libintl.h>:' \
+				${i}.orig > ${i}
+		done
+	fi
+	econf ${myconf} || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	insinto /etc/yp ; doins etc/nicknames
+	# This messes up boot so we remove it
+	rm -f \
+		"${D}/bin/ypdomainname" \
+		"${D}/bin/nisdomainname" \
+		"${D}/bin/domainname"
+}
diff --git a/net-nds/ypserv/ChangeLog b/net-nds/ypserv/ChangeLog
index 121b4ecad264..156fb0b3836e 100644
--- a/net-nds/ypserv/ChangeLog
+++ b/net-nds/ypserv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/ypserv
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ChangeLog,v 1.46 2010/05/25 21:08:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ChangeLog,v 1.47 2010/08/28 00:38:12 jer Exp $
+
+*ypserv-2.23 (28 Aug 2010)
+
+  28 Aug 2010; Jeroen Roovers <jer@gentoo.org> +ypserv-2.23.ebuild:
+  Version bump.
 
   25 May 2010; Pacho Ramos <pacho@gentoo.org> ypserv-2.22.ebuild:
   stable amd64, bug 320325
diff --git a/net-nds/ypserv/ypserv-2.23.ebuild b/net-nds/ypserv/ypserv-2.23.ebuild
new file mode 100644
index 000000000000..ddfa5b88e6d2
--- /dev/null
+++ b/net-nds/ypserv/ypserv-2.23.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.23.ebuild,v 1.1 2010/08/28 00:38:12 jer Exp $
+
+EAPI="2"
+
+inherit autotools
+
+DESCRIPTION="Network Information Service server"
+HOMEPAGE="http://www.linux-nis.org/nis/"
+SRC_URI="mirror://kernel/linux/utils/net/NIS/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="slp"
+
+DEPEND=">=sys-libs/gdbm-1.8.0
+	 slp? ( net-libs/openslp )"
+RDEPEND="${DEPEND}
+	 || ( net-nds/rpcbind net-nds/portmap )"
+
+src_prepare() {
+	# The configure script does not provide a command-line flag to control usage
+	# of slp. Use a brutal method in case we need to disable it.
+	if ! use slp; then
+		sed -i -e 's/USE_SLP=1/USE_SLP=0/g' configure.in
+		eautoreconf
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	insinto /etc
+	doins etc/ypserv.conf etc/netgroup etc/netmasks
+	insinto /var/yp
+	newins etc/securenets securenets.default
+
+	newconfd "${FILESDIR}/ypserv.confd" ypserv
+	newconfd "${FILESDIR}/rpc.yppasswdd.confd" rpc.yppasswdd
+	newconfd "${FILESDIR}/rpc.ypxfrd.confd" rpc.ypxfrd
+
+	newinitd "${FILESDIR}/ypserv" ypserv
+	newinitd "${FILESDIR}/rpc.yppasswdd-r1" rpc.yppasswdd
+	newinitd "${FILESDIR}/rpc.ypxfrd" rpc.ypxfrd
+
+	echo "CONFIG_PROTECT=\"/var/yp/Makefile\"" > "${T}"/10ypserv
+	doenvd "${T}"/10ypserv
+}
+
+pkg_preinst() {
+	# This ebuilds installs an env file which CONFIG_PROTECTs /var/yp/Makefile,
+	# but if the user is migrating from older ypserv, this won't take effect
+	# immediately. Keep the older setup with Makefile.dist file and ask the user
+	# to migrate.
+	if [ -f "${ROOT}/var/yp/Makefile.dist" ]; then
+		mv "${D}/var/yp/Makefile" "${D}/var/yp/Makefile.dist" \
+			|| die "mv failed"
+		cp "${ROOT}/var/yp/Makefile" "${D}/var/yp/Makefile" \
+			|| die "cp failed"
+		elog "Please remove ${ROOT}/var/yp/Makefile.dist after making sure that"
+		elog "${ROOT}/var/yp/Makefile looks fine to you. It is now"
+		elog "CONFIG_PROTECTed, so further changes should be managed with"
+		elog "usual config management tools like etc-update or dispatch-conf."
+	fi
+}
+
+pkg_postinst() {
+	einfo "To complete setup, you will need to edit /var/yp/securenets,"
+	einfo "/etc/conf.d/ypserv, /etc/ypserv.conf, /etc/conf.d/rpc.yppasswdd"
+	einfo "and possibly /var/yp/Makefile."
+
+	einfo "To start the services at boot, you need to enable ypserv and optionally"
+	einfo "the rpc.yppasswdd and/or rpc.ypxfrd services"
+}