Old.

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

4 files changed, 9 insertions, 93 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index a5652146a31f..0930691e042a 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.79 2011/07/15 04:05:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.80 2011/07/15 04:06:59 jer Exp $
+
+  15 Jul 2011; Jeroen Roovers <jer@gentoo.org> -files/chrony-1.21-hppa.patch,
+  -chrony-1.24-r2.ebuild:
+  ^
 
 *chrony-1.26 (15 Jul 2011)
 
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 92246c531383..f9dd3cac272a 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,26 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX chrony-1.21-hppa.patch 572 RMD160 527c9dff58563168e34efbcc3da15b329cc6009f SHA1 159abdea72e63268ae87655859908404d4d179ed SHA256 b755684e28aea7da4276c540a51eb33016f3dbf8b5cd2e3228f2a2915dbc5c1c
 AUX chrony-1.25-linux3.patch 634 RMD160 8754d8f0b05caac3c468f82aea6c16ce198359a3 SHA1 48aa2d88f5ede64b032d307dc52710f99cd90443 SHA256 dfa32cc7b55631d54a06f3d1290099e2342478ae7d5a73c4546379b43915a9e0
 AUX chrony.logrotate 287 RMD160 5b8c63460f4d751f8d9ca54c9ba61a9c9c5f86df SHA1 4aa2a401fd7aaad6b2934cb0a3180ef5bb63e223 SHA256 abe2e7177d5041e9b3d0d939db72e208bccef23405c190fdd951a8560f3a621c
 AUX chronyd.conf 378 RMD160 929862983d9ac346506d074fd4d8d14452ce451a SHA1 4efc8a4259e54df7df3be8a1c848891c7bfd11bf SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99
 AUX chronyd.rc 1744 RMD160 67f19b65a72619bf224fab034ff56438be9e3340 SHA1 9903364e1c3c5b30e14373b3b0387b925a5a7580 SHA256 3c15c635e656c1f83846270813754863033e996bed144f82bdbf65a2e5dd3aa5
-DIST chrony-1.24.tar.gz 364311 RMD160 a393c3f51d99a24a1aefd1653575de5a6c642191 SHA1 6e17d7b8cdd3508751713bd2279202b75643e268 SHA256 dd0e6c98a7e094d760d83a1681f85d84f3a5103400c49b4a9e062bbe02ceb215
 DIST chrony-1.25.tar.gz 380908 RMD160 61dae1c44e4fdb78c21288699203772bc16aafd2 SHA1 0ae69043c6d8a875e33d9c9a671c8de6adb9ec87 SHA256 9c49a8ee0991937566fe26e0ab1eca4d53a5ae7f0dbfcd9b95d174e1aa653d70
 DIST chrony-1.26-pre1.tar.gz 381479 RMD160 afcb687a8b2d21a4bd38c93b1e05d094d8dd7d50 SHA1 4a7237eeb827791b676d724fa85dbacd2620069a SHA256 f91ceffd8b619e73e6543b30971dec789b82ef55c89a55fe69e577580c020da4
 DIST chrony-1.26.tar.gz 381475 RMD160 e34a1d2fbaa8e4d60c0c64f0a71a942e4ad0ad32 SHA1 9b5a5391a1dccc04c78277adfd0ec094bef91e70 SHA256 fb191ca4ba59e192c96d022618ca3eaee49f3c11f9af8dd7297020b27bf3e05b
-EBUILD chrony-1.24-r2.ebuild 1795 RMD160 e07ce245c4520768dfbffcae13d36d18def28705 SHA1 759001d4d40448177f298aea8c5e80894f672f99 SHA256 3107dc18dad73febb45b9477b48c683869b329925cd529c8cdf8a257f6c4c7e7
 EBUILD chrony-1.25-r1.ebuild 1683 RMD160 ae77545825b57f2ad371a23ccad5bc7b8268517b SHA1 7b650003f6976d9be9d6246d0f52885d06c3089f SHA256 c93963e43b3f6dfa97954e25e7edc12a6cda44cba0449efdaf22dede87041621
 EBUILD chrony-1.25.ebuild 1749 RMD160 47f5b917e0f87becec9c7eb88bc267cdcb84cce8 SHA1 4eab919b809c7f4a6b72b60b8d290776036596f3 SHA256 4cbf6703eb721fb2a690ffc9af0c795b22f284520dc486f9abcec211fbd877fc
 EBUILD chrony-1.26.ebuild 1640 RMD160 8ca3aa186b07aab5ccf0af601140294ec56721a1 SHA1 83a17071c24cc85989c69241a74f04f29be18bfc SHA256 bf9ddf34212c4966b3352c913f1d969088fc4258169fe04df8bc6b56c0cc0eaf
 EBUILD chrony-1.26_pre1.ebuild 1687 RMD160 7b05ed802eb6620ae9827cb0401514645ae9d58c SHA1 4ba1da35b47fb1071920ce3d35c6ee6b964fa7c3 SHA256 9ca452706e66a8e1b80ede340d865c1eefd1890bd2510661298943bfbea4344e
-MISC ChangeLog 9950 RMD160 96ad63d22493c697c668bb2220f15baa2f586fd5 SHA1 de672fa28152b10df24b7064a7b24975ced5df64 SHA256 90d4c5ef024ac22b6e1a8f6b35c55a494246e31a6b92a00fdefa2e5d137e6cb8
+MISC ChangeLog 10059 RMD160 02fcaa3ee41ce82d6972010ffc12a7cdf01acaef SHA1 63efb822170468645475fdd42350750ea635d55b SHA256 7ae8f940e43369e8ac0cee6e81e4ba9821891b2250fa6393251ca3ee4e7cbbb9
 MISC metadata.xml 1014 RMD160 f46472683e7ec16a3bf736e0baeb7948f489cbed SHA1 fe8a55544286c7788ab58e8caa55b7f8b8cbd451 SHA256 10f827a848beb64f26a7fd9660a3692572dcfb20862dcae3fa44f47ed806bcff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4fvIkACgkQVWmRsqeSphOprACeNNeQL8E3CRu8OEJEqct4WHV+
-j9MAn2yeJxsP1coL6fnV1Rq2uqJ+pPGi
-=M1ki
+iEYEARECAAYFAk4fvOgACgkQVWmRsqeSphOLKwCfSEpRPXbGJJpclDR2FSFpTK0f
+UTgAn1LvKmV4WzBdH6qFebrWnVnPT/Xm
+=p1nN
 -----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.24-r2.ebuild b/net-misc/chrony/chrony-1.24-r2.ebuild
deleted file mode 100644
index cacffd4526ac..000000000000
--- a/net-misc/chrony/chrony-1.24-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.24-r2.ebuild,v 1.7 2010/10/14 16:35:47 ranger 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() {
-	epatch "${FILESDIR}"/${PN}-1.21-hppa.patch
-	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
-	dosed "s:the documentation directory:/usr/share/doc/${PF}/:" \
-		/etc/init.d/chronyd || die "doc sed failed"
-	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/files/chrony-1.21-hppa.patch b/net-misc/chrony/files/chrony-1.21-hppa.patch
deleted file mode 100644
index 2195f083fa63..000000000000
--- a/net-misc/chrony/files/chrony-1.21-hppa.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- io_linux.h_old	2006-08-28 20:45:52.000000000 +0200
-+++ io_linux.h	2006-08-28 21:04:59.000000000 +0200
-@@ -35,6 +35,16 @@
- #define CHRONY_IOC_READ         2U
- #define CHRONY_IOC_WRITE        4U
- 
-+#elif defined(__hppa__)
-+#define CHRONY_IOC_NRBITS       8
-+#define CHRONY_IOC_TYPEBITS     8
-+#define CHRONY_IOC_SIZEBITS     14
-+#define CHRONY_IOC_DIRBITS      2
-+
-+#define CHRONY_IOC_NONE         0U
-+#define CHRONY_IOC_WRITE        2U
-+#define CHRONY_IOC_READ         1U
-+
- #else
- #error "I don't know the values of the _IOC_* constants for your architecture"
- #endif