From 15b53a31283d5fab8bff8cc0ae08bee7871ee941 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 8 Apr 2006 00:51:46 +0000 Subject: Fix acl/xattr configure options #129116 by Alexander Skwar. (Portage version: 2.1_pre7-r4) --- net-misc/rsync/ChangeLog | 8 +++- net-misc/rsync/files/digest-rsync-2.6.7 | 3 -- net-misc/rsync/files/digest-rsync-2.6.7-r1 | 3 ++ net-misc/rsync/rsync-2.6.7-r1.ebuild | 77 ++++++++++++++++++++++++++++++ net-misc/rsync/rsync-2.6.7.ebuild | 77 ------------------------------ 5 files changed, 87 insertions(+), 81 deletions(-) delete mode 100644 net-misc/rsync/files/digest-rsync-2.6.7 create mode 100644 net-misc/rsync/files/digest-rsync-2.6.7-r1 create mode 100644 net-misc/rsync/rsync-2.6.7-r1.ebuild delete mode 100644 net-misc/rsync/rsync-2.6.7.ebuild diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog index 991a61224b0b..7f95cc76e1e3 100644 --- a/net-misc/rsync/ChangeLog +++ b/net-misc/rsync/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/rsync # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.87 2006/03/30 15:08:23 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.88 2006/04/08 00:51:46 vapier Exp $ + +*rsync-2.6.7-r1 (08 Apr 2006) + + 08 Apr 2006; Mike Frysinger -rsync-2.6.7.ebuild, + +rsync-2.6.7-r1.ebuild: + Fix acl/xattr configure options #129116 by Alexander Skwar. 30 Mar 2006; Diego Pettenò rsync-2.6.7.ebuild: Add ~x86-fbsd keyword. diff --git a/net-misc/rsync/files/digest-rsync-2.6.7 b/net-misc/rsync/files/digest-rsync-2.6.7 deleted file mode 100644 index 43416adaf149..000000000000 --- a/net-misc/rsync/files/digest-rsync-2.6.7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fb51636c719e789244d5d4423cf157ac rsync-2.6.7.tar.gz 757572 -RMD160 455bbd64a3ccb6de620e4e746e580dde6633d322 rsync-2.6.7.tar.gz 757572 -SHA256 b70604b47cec2a5a47bcc03c652633ca2d2926445e620af19510a5784f570a99 rsync-2.6.7.tar.gz 757572 diff --git a/net-misc/rsync/files/digest-rsync-2.6.7-r1 b/net-misc/rsync/files/digest-rsync-2.6.7-r1 new file mode 100644 index 000000000000..43416adaf149 --- /dev/null +++ b/net-misc/rsync/files/digest-rsync-2.6.7-r1 @@ -0,0 +1,3 @@ +MD5 fb51636c719e789244d5d4423cf157ac rsync-2.6.7.tar.gz 757572 +RMD160 455bbd64a3ccb6de620e4e746e580dde6633d322 rsync-2.6.7.tar.gz 757572 +SHA256 b70604b47cec2a5a47bcc03c652633ca2d2926445e620af19510a5784f570a99 rsync-2.6.7.tar.gz 757572 diff --git a/net-misc/rsync/rsync-2.6.7-r1.ebuild b/net-misc/rsync/rsync-2.6.7-r1.ebuild new file mode 100644 index 000000000000..a14919023d16 --- /dev/null +++ b/net-misc/rsync/rsync-2.6.7-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.7-r1.ebuild,v 1.1 2006/04/08 00:51:46 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="http://rsync.samba.org/" +SRC_URI="http://rsync.samba.org/ftp/rsync/${P/_/}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="acl build ipv6 static xinetd" + +RDEPEND="!build? ( >=dev-libs/popt-1.5 ) + acl? ( kernel_linux? ( sys-apps/acl ) )" +DEPEND="${RDEPEND} + >=sys-apps/portage-2.0.51" + +S=${WORKDIR}/${P/_/} + +src_unpack() { + unpack ${P/_/}.tar.gz + cd "${S}" + if use acl ; then + epatch patches/{acls,xattrs}.diff + ./prepare-source || die + fi +} + +src_compile() { + [[ $(gcc-version) == "2.95" ]] && append-ldflags -lpthread + use static && append-ldflags -static + + econf \ + $(use_with build included-popt) \ + $(use_enable acl acl-support) \ + $(use_enable acl xattr-support) \ + $(use_enable ipv6) \ + --with-rsyncd-conf=/etc/rsyncd.conf \ + || die + emake || die "emake failed" +} + +pkg_preinst() { + if [[ -e ${ROOT}/etc/rsync/rsyncd.conf ]] && [[ ! -e ${ROOT}/etc/rsyncd.conf ]] ; then + mv "${ROOT}"/etc/rsync/rsyncd.conf "${ROOT}"/etc/rsyncd.conf + rm -f "${ROOT}"/etc/rsync/.keep + rmdir "${ROOT}"/etc/rsync >& /dev/null + fi +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d rsyncd + if ! use build ; then + dodoc NEWS OLDNEWS README TODO tech_report.tex + insinto /etc + doins "${FILESDIR}"/rsyncd.conf + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd rsyncd + fi + else + rm -r "${D}"/usr/share + fi +} + +pkg_postinst() { + ewarn "The rsyncd.conf file has been moved for you to /etc/rsyncd.conf" + echo + ewarn "Please make sure you do NOT disable the rsync server running" + ewarn "in a chroot. Please check /etc/rsyncd.conf and make sure" + ewarn "it says: use chroot = yes" +} diff --git a/net-misc/rsync/rsync-2.6.7.ebuild b/net-misc/rsync/rsync-2.6.7.ebuild deleted file mode 100644 index c7c67ea642fa..000000000000 --- a/net-misc/rsync/rsync-2.6.7.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.7.ebuild,v 1.2 2006/03/30 15:08:23 flameeyes Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="File transfer program to keep remote files into sync" -HOMEPAGE="http://rsync.samba.org/" -SRC_URI="http://rsync.samba.org/ftp/rsync/${P/_/}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="acl build ipv6 static xinetd" - -RDEPEND="!build? ( >=dev-libs/popt-1.5 ) - acl? ( kernel_linux? ( sys-apps/acl ) )" -DEPEND="${RDEPEND} - >=sys-apps/portage-2.0.51" - -S=${WORKDIR}/${P/_/} - -src_unpack() { - unpack ${P/_/}.tar.gz - cd "${S}" - if use acl ; then - epatch patches/{acls,xattrs}.diff - ./prepare-source || die - fi -} - -src_compile() { - [[ $(gcc-version) == "2.95" ]] && append-ldflags -lpthread - use static && append-ldflags -static - - econf \ - $(use_with build included-popt) \ - $(use_with acl acl-support) \ - $(use_with acl xattr-support) \ - $(use_enable ipv6) \ - --with-rsyncd-conf=/etc/rsyncd.conf \ - || die - emake || die "emake failed" -} - -pkg_preinst() { - if [[ -e ${ROOT}/etc/rsync/rsyncd.conf ]] && [[ ! -e ${ROOT}/etc/rsyncd.conf ]] ; then - mv "${ROOT}"/etc/rsync/rsyncd.conf "${ROOT}"/etc/rsyncd.conf - rm -f "${ROOT}"/etc/rsync/.keep - rmdir "${ROOT}"/etc/rsync >& /dev/null - fi -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd - newinitd "${FILESDIR}"/rsyncd.init.d rsyncd - if ! use build ; then - dodoc NEWS OLDNEWS README TODO tech_report.tex - insinto /etc - doins "${FILESDIR}"/rsyncd.conf - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/rsyncd.xinetd rsyncd - fi - else - rm -r "${D}"/usr/share - fi -} - -pkg_postinst() { - ewarn "The rsyncd.conf file has been moved for you to /etc/rsyncd.conf" - echo - ewarn "Please make sure you do NOT disable the rsync server running" - ewarn "in a chroot. Please check /etc/rsyncd.conf and make sure" - ewarn "it says: use chroot = yes" -} -- cgit v1.2.3-65-gdbad