Remove old.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 7 insertions, 134 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index d97df0bc818f..7abcbac2f812 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/chrony
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.84 2011/12/18 17:32:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.85 2011/12/29 17:49:27 jer Exp $
+
+  29 Dec 2011; Jeroen Roovers <jer@gentoo.org> chrony-1.25.ebuild,
+  -chrony-1.25-r1.ebuild, -chrony-1.26_pre1.ebuild:
+  Remove old.
 
   18 Dec 2011; Raúl Porcel <armin76@gentoo.org> chrony-1.26.ebuild:
   sparc stable wrt #383687
diff --git a/net-misc/chrony/chrony-1.25-r1.ebuild b/net-misc/chrony/chrony-1.25-r1.ebuild
deleted file mode 100644
index 464263738c64..000000000000
--- a/net-misc/chrony/chrony-1.25-r1.ebuild
+++ /dev/null
@@ -1,64 +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/chrony/chrony-1.25-r1.ebuild,v 1.2 2011/06/09 15:21:01 jer Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="http://chrony.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="caps readline"
-
-RDEPEND="
-	readline? ( >=sys-libs/readline-4.1-r4 )
-	caps? ( sys-libs/libcap )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i "s:/etc/chrony\.:/etc/chrony/chrony.:g" \
-		examples/* chrony*.{1,5,8} faq.txt chrony.texi || die "sed failed"
-	epatch "${FILESDIR}"/${P}-linux3.patch
-}
-
-src_configure() {
-	tc-export CC
-	local myconf
-	use readline || myconf+=" --disable-readline"
-	#use ipv6     || myconf+=" --disable-ipv6"
-	use caps     || myconf+=" --disable-linuxcaps"
-	# selfwritten configure
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/chrony \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${PF} \
-		${myconf} ${EXTRA_ECONF} || die "configure failed"
-}
-
-src_compile() {
-	emake all || die "make failed"
-	emake docs || die "make docs failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-	dodoc examples/chrony.{conf,keys}.example || die
-	doinfo chrony.info* || die
-
-	newinitd "${FILESDIR}"/chronyd.rc chronyd || die
-	newconfd "${FILESDIR}"/chronyd.conf chronyd || die
-
-	keepdir /var/{lib,log}/chrony /etc/chrony
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony.logrotate chrony
-}
diff --git a/net-misc/chrony/chrony-1.25.ebuild b/net-misc/chrony/chrony-1.25.ebuild
index 3151b8041593..c49ebe5643ce 100644
--- a/net-misc/chrony/chrony-1.25.ebuild
+++ b/net-misc/chrony/chrony-1.25.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-misc/chrony/chrony-1.25.ebuild,v 1.7 2011/06/25 18:56:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.25.ebuild,v 1.8 2011/12/29 17:49:27 jer Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="ppc"
 IUSE="caps readline"
 
 RDEPEND="
diff --git a/net-misc/chrony/chrony-1.26_pre1.ebuild b/net-misc/chrony/chrony-1.26_pre1.ebuild
deleted file mode 100644
index d679c69eba98..000000000000
--- a/net-misc/chrony/chrony-1.26_pre1.ebuild
+++ /dev/null
@@ -1,67 +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/chrony/chrony-1.26_pre1.ebuild,v 1.1 2011/07/05 15:40:48 jer Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-MY_P=${P/_/-}
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="http://chrony.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="caps readline"
-
-RDEPEND="
-	readline? ( >=sys-libs/readline-4.1-r4 )
-	caps? ( sys-libs/libcap )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	sed -i "s:/etc/chrony\.:/etc/chrony/chrony.:g" \
-		examples/* chrony*.{1,5,8} faq.txt chrony.texi || die "sed failed"
-}
-
-src_configure() {
-	tc-export CC
-	local myconf
-	use readline || myconf+=" --disable-readline"
-	#use ipv6     || myconf+=" --disable-ipv6"
-	use caps     || myconf+=" --disable-linuxcaps"
-	# selfwritten configure
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/chrony \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${PF} \
-		${myconf} ${EXTRA_ECONF} || die "configure failed"
-}
-
-src_compile() {
-	emake all || die "make failed"
-	emake docs || die "make docs failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-	dodoc examples/chrony.{conf,keys}.example || die
-	doinfo chrony.info* || die
-
-	newinitd "${FILESDIR}"/chronyd.rc chronyd || die
-	newconfd "${FILESDIR}"/chronyd.conf chronyd || die
-
-	keepdir /var/{lib,log}/chrony /etc/chrony
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony.logrotate chrony
-}