Add stable x86 keyword again and cleanup

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 8122422f889573546a5fabe6e9982bc167c81ef8..36e629c4efe0ce2918d6243e58d5a0b51a5bbebb 100644 (file)
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/chrony
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.50 2010/03/23 09:09:48 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.51 2010/03/23 09:11:39 tove Exp $
+
+  23 Mar 2010; Torsten Veller <tove@gentoo.org> -chrony-1.24.ebuild,
+  chrony-1.24-r1.ebuild:
+  Add stable x86 keyword again and cleanup
 
 *chrony-1.24-r1 (23 Mar 2010)
 

diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index e156ddd4643173b4b388e7fa6d515fb87a79ed10..9bb30fd201ea6d92ead26a94ec545b281efcaadf 100644 (file)
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -11,14 +11,13 @@ AUX chronyd.rc 1744 RMD160 67f19b65a72619bf224fab034ff56438be9e3340 SHA1 9903364
 DIST chrony-1.23.tar.gz 321015 RMD160 6f92aeac15d252821ff72a02f340fc0e562eddc1 SHA1 f0c6b32099329f358dbdb4f62753d2c7cbc13c79 SHA256 889f292458ccb3f20ae4f5872110d776a639f1cda2d1df694eb88a14726832c5
 DIST chrony-1.24.tar.gz 364311 RMD160 a393c3f51d99a24a1aefd1653575de5a6c642191 SHA1 6e17d7b8cdd3508751713bd2279202b75643e268 SHA256 dd0e6c98a7e094d760d83a1681f85d84f3a5103400c49b4a9e062bbe02ceb215
 EBUILD chrony-1.23.ebuild 1856 RMD160 9d0b47e1d365290eadc462fec6dc609b4c585223 SHA1 ce67919c45e510eaca10cf5ad7a01b8631ac585a SHA256 f65036a24acf5862f97fdd25ef09445e4f09fe6126bcf6ea0b66262c85c74d1c
-EBUILD chrony-1.24-r1.ebuild 1722 RMD160 89aea4a226c7d4d0e9eabfc4255cc4cbb5beccc6 SHA1 51ec863eaf78d6b676630b02a8c4f8c06d9603db SHA256 9e8536ee2c4f401798ac0ed3cecf98bf17174d98f88be846c9b44b1ba7d943c3
-EBUILD chrony-1.24.ebuild 1719 RMD160 91d2295351be8b546858ea319cda1dc05f5620a7 SHA1 3c6ee0b2905e47addfec2ce472902064f9290b35 SHA256 bd39df29fc1df531c19f905ea0cf3e7b782bdf18ac36023059fb8fc60ce9202f
-MISC ChangeLog 6405 RMD160 9956619b68c1bb390c6e7a1d38e0e0e1c4e305d3 SHA1 6131729249c75fb54cee20473a451c60dd9b7941 SHA256 7f46c9e9b0c9a2184e0d2d6d6541fce3eecce49496e1cbf211aada933c59f368
+EBUILD chrony-1.24-r1.ebuild 1721 RMD160 8eda2ccc31360839c6e1ac276f62ab114ed3198d SHA1 8e80b16abefda86b5d7baba8c5db820ae6a747de SHA256 a46b06732d828214cfa9ad5c587b82e18834b28b0591999510182906bd76c4ae
+MISC ChangeLog 6543 RMD160 64965910691c41b1e730be86fe023b688bbe680e SHA1 0ef431199fea4b77d6407fa7cc99241146425026 SHA256 209ea88fc945a43ed707bc2c750b17b8b424c71a06e26e65163967c49e59b59a
 MISC metadata.xml 1028 RMD160 0b2a82de3f3f7f586ffba067114005b5398e78fc SHA1 68914908720affa4f5a0aa7bfc3f2e0d1474c9dd SHA256 abc23a3b826bff26c757496fbe12dc5a40bc50dffb634629c94c9dd6136ab81e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuohWIACgkQV3J2n04EauxDSgCfZtt87dflv3njl1j3t5La6MJX
-DDAAnRCsHPfZOM0LffXbmjzQYpkt1RUY
-=E/bt
+iEYEARECAAYFAkuohdEACgkQV3J2n04Eauzn6ACfQnrerWlOJA8JluLONeG25tqg
+E8EAn0AlNmCLJNWB2ASejx5+r7+ZJMwS
+=QnNj
 -----END PGP SIGNATURE-----

diff --git a/net-misc/chrony/chrony-1.24-r1.ebuild b/net-misc/chrony/chrony-1.24-r1.ebuild
index 51999f25cdffd0f9d57dfc3bad5ef2f4a018e4d4..db9562242ca21bbb1e8c7cee3df63c262b9f7a57 100644 (file)
--- a/net-misc/chrony/chrony-1.24-r1.ebuild
+++ b/net-misc/chrony/chrony-1.24-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2010/03/23 09:09:48 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.24-r1.ebuild,v 1.2 2010/03/23 09:11:39 tove 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="~amd64 ~hppa ~mips ~ppc ~sparc x86"
 IUSE="caps readline"
 
 RDEPEND="readline? ( >=sys-libs/readline-4.1-r4 )

diff --git a/net-misc/chrony/chrony-1.24.ebuild b/net-misc/chrony/chrony-1.24.ebuild
deleted file mode 100644 (file)
index 4e54cfa..0000000
--- a/net-misc/chrony/chrony-1.24.ebuild
+++ /dev/null
@@ -1,61 +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.ebuild,v 1.2 2010/03/15 18:42:49 fauli 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
-}