Added pre-version without KEYWORDS. Removed old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 20 insertions, 144 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 8b62a64abf85..8a975c241c29 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rsync
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.251 2014/04/15 11:48:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.252 2014/05/27 07:25:22 polynomial-c Exp $
+
+*rsync-3.1.1_pre2 (27 May 2014)
+
+  27 May 2014; Lars Wendler <polynomial-c@gentoo.org> -rsync-3.0.8.ebuild,
+  -rsync-3.0.9.ebuild, -rsync-3.0.9-r2.ebuild, +rsync-3.1.1_pre2.ebuild:
+  Added pre-version without KEYWORDS. Removed old.
 
 *rsync-3.1.0-r1 (15 Apr 2014)
 
diff --git a/net-misc/rsync/rsync-3.0.8.ebuild b/net-misc/rsync/rsync-3.0.8.ebuild
deleted file mode 100644
index f9725b70614d..000000000000
--- a/net-misc/rsync/rsync-3.0.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.8.ebuild,v 1.6 2011/04/02 14:29:43 armin76 Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="http://rsync.samba.org/"
-SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P/_/}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl iconv ipv6 static xattr"
-
-DEPEND=">=dev-libs/popt-1.5
-	acl? ( virtual/acl )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	iconv? ( virtual/libiconv )"
-
-S=${WORKDIR}/${P/_/}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch_user
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	econf \
-		--without-included-popt \
-		$(use_enable acl acl-support) \
-		$(use_enable xattr xattr-support) \
-		$(use_enable ipv6) \
-		$(use_enable iconv) \
-		--with-rsyncd-conf=/etc/rsyncd.conf \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d rsyncd || die
-	dodoc NEWS OLDNEWS README TODO tech_report.tex
-	insinto /etc
-	doins "${FILESDIR}"/rsyncd.conf || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd rsyncd
-
-	# Install the useful contrib scripts
-	exeinto /usr/share/rsync
-	doexe support/* || die
-	rm -f "${D}"/usr/share/rsync/{Makefile*,*.c}
-}
-
-pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${ROOT}"/etc/rsyncd.conf "${ROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.0.9.ebuild b/net-misc/rsync/rsync-3.0.9.ebuild
deleted file mode 100644
index 0438fc77992d..000000000000
--- a/net-misc/rsync/rsync-3.0.9.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.9.ebuild,v 1.11 2012/08/18 15:38:05 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="http://rsync.samba.org/"
-SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P/_/}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl iconv ipv6 static xattr"
-
-RDEPEND=">=dev-libs/popt-1.5
-	acl? ( virtual/acl )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/_/}
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		--without-included-popt \
-		$(use_enable acl acl-support) \
-		$(use_enable xattr xattr-support) \
-		$(use_enable ipv6) \
-		$(use_enable iconv) \
-		--with-rsyncd-conf=/etc/rsyncd.conf
-	touch proto.h-tstamp #421625
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d rsyncd || die
-	dodoc NEWS OLDNEWS README TODO tech_report.tex
-	insinto /etc
-	doins "${FILESDIR}"/rsyncd.conf || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd rsyncd
-
-	# Install the useful contrib scripts
-	exeinto /usr/share/rsync
-	doexe support/* || die
-	rm -f "${D}"/usr/share/rsync/{Makefile*,*.c}
-}
-
-pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${ROOT}"/etc/rsyncd.conf "${ROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.0.9-r2.ebuild b/net-misc/rsync/rsync-3.1.1_pre2.ebuild
index a880f108eb90..4482b500b7ca 100644
--- a/net-misc/rsync/rsync-3.0.9-r2.ebuild
+++ b/net-misc/rsync/rsync-3.1.1_pre2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.9-r2.ebuild,v 1.13 2013/02/19 05:05:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.1.1_pre2.ebuild,v 1.1 2014/05/27 07:25:22 polynomial-c Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit eutils flag-o-matic prefix
+inherit eutils flag-o-matic prefix systemd
 
 DESCRIPTION="File transfer program to keep remote files into sync"
 HOMEPAGE="http://rsync.samba.org/"
@@ -12,9 +12,14 @@ SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P/_/}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl iconv ipv6 static xattr"
 
+if [[ ${PV} = *pre* ]] ; then
+	SRC_URI="http://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
+	KEYWORDS=""
+fi
+
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
 	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
 	>=dev-libs/popt-1.5[static-libs(+)]"
@@ -26,6 +31,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P/_/}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.1_pre1-avoid_infinite_wait_reading_secrets_file.patch
 	epatch_user
 }
 
@@ -61,6 +67,8 @@ src_install() {
 	rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
 
 	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_dounit "${FILESDIR}/rsyncd.service"
 }
 
 pkg_postinst() {