Fix configure logic with regard to readline/libedit (bug #538190 by Brian Evans).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 116 insertions, 6 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 32ce74c2813d..d1654213f13d 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/chrony
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.148 2014/11/05 11:24:29 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.149 2015/01/30 11:26:16 jer Exp $
+
+*chrony-1.31-r1 (30 Jan 2015)
+
+  30 Jan 2015; Jeroen Roovers <jer@gentoo.org> +chrony-1.31-r1.ebuild:
+  Fix configure logic with regard to readline/libedit (bug #538190 by Brian
+  Evans).
 
   05 Nov 2014; Jeroen Roovers <jer@gentoo.org> -chrony-1.30-r1.ebuild,
   -files/chronyd.service, -files/chronyd.service-r1:
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index f704036ff3f5..a9c5d3a079a9 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -6,13 +6,14 @@ AUX chronyd.conf 378 SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2
 AUX chronyd.init 1739 SHA256 82a49a66f8d6db492ca14cc685535a395b8018230aedb09ee3ad3a476fe752d5 SHA512 7c56c55a741a9a7f4d4562418a143fd0f7108d4821641ccc536c20f9878d6c0e246ef7af33c4aa404d696dbb3d75dfcd3279def1e650c3e7f16ec0b7f69b71e4 WHIRLPOOL 761b3405a0308a61999a25c2a1a0d57bf718a5d23a1ca86e25ac3b663df79c27597a3969d7dbeeed3cba9f657c44fa42cedf59394b79a9a0f37e83308fe58089
 AUX chronyd.service-r2 261 SHA256 d5996c6b8596e137b36099d0ce7974bfd8e36411d999712d2f0393ac738f3754 SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe WHIRLPOOL f95d9472ad30fb06e3d0014ddc2be492dd1a6d2b5590bed27214ba1b0566d83e89e108a8df3de9dade939a9feff005bfff431d796f9e813388830e3f3dfc437b
 DIST chrony-1.31.tar.gz 395742 SHA256 a35e1cae46ecbe14af2023bb47a72a03d79591b2ff65f0072b3400153224996d SHA512 fcac8f61525b0c9aee83ec6c5fc4a948f6ee838ffa302661922d273ce0a9f03735fcbcd798bb1f1221d581da7601663bc4f16996dc948bd0ba10ac90caaa09a4 WHIRLPOOL 6bc01cf1ad7f2c4bf26f4ebcd4244e2e0f8aec3257f09e57ab6d419ecf52de4a78ecb41394c3f492ec0982d20156e191923cc1a8789e33d7a87dc1c9a72ef5c6
+EBUILD chrony-1.31-r1.ebuild 2577 SHA256 a1384937e7407f63d8a4099fffaea34328cb924612772803fa73a30db8be13cd SHA512 7035761a7be96010bb7fe8e37b734f1f7211c0269c2d4ee8f7e293c353d9639ba83d4b15451d15d67c6d8c8969fc6af83ee51b65d8b272f93a7d27de29f419a6 WHIRLPOOL 47de296ecc66bac3b21e3769d0b7a492aea1c325840b40775cad61a08a003afc26fd354067133417efb2faf824541b5f327bc1595df1e736ee5c25a6662ecf1d
 EBUILD chrony-1.31.ebuild 1920 SHA256 0e7370fdb6e5f63e1639ef69d85e9f9e3a3bc697320aef80f4832aba0ac9c996 SHA512 0c5c58ddb71acc360f8fa47ee547ea49f97297c1bf0124acc522c2a0a8cae38741133fb6d21ceb448eb69356394d167dfe47bdf396cae3392c8ddf49123892c2 WHIRLPOOL 7db8a60a44131a85d578e3fb324e7cd2ab54ae76bbc9ee0a843a34bd1a6200e4ac032b9301f491b2de8d7a01e4e87d2f245d6a8890ee34df79f96861c679ab08
-MISC ChangeLog 18507 SHA256 ea3b036763fbfef553586a2ce7b74098b31eec20becd384afb10f96960bb372e SHA512 63efa701a29a78c11614a876f1eaae75cbe61044b7e82f2187d0d046efd6daba231bdb815dba7b038e9f0e8572bc5610b4dcffa92c8e29de87d412cfc3960514 WHIRLPOOL 229eafad93fcd1114b4a11caf04b86c16ffd24230f6f8b4f9bad2404e5bd4b5302db9009e23a02a1147ba80934de2287a334fbeca8c10ba94be9b39b6ead62f3
+MISC ChangeLog 18696 SHA256 40995fedbbc9fb727fb5c7a4bf70541b5c86ae44a1c36e38be66403d6d0045ed SHA512 f015eb70e98cfb64633ce0a83157c88198c003cdcc242caf42d40af6a6d4aa02672fedd9380583fd41afd47e589b147c1be5d11756a9964743ee7025167fa5b7 WHIRLPOOL 20db7bc0eaafc988d63ae0f609017392e2e389b0ceefb48ffb56e99717fb6c69ea325c802132b6d572d4c46ef109353ea573f2eb27e81c581c2951d5f97192e8
 MISC metadata.xml 1086 SHA256 18d59935890367a9bbe405207a32ba70aa57304075efc6814bda5128ec226d8d SHA512 2674fcc6a9d454544dcfea5002a93ec6ad9b107651d11f2d75d6d187fffa4502cb9ea1bcd3fc2a6e7dbf07b9b18e928534c0c442fbb01abff1660d726f3cd0c2 WHIRLPOOL e21367e6d4fd6a02a8bc56546c90b80fee2d5c5c9160a0f9ff6b6896babc3e7e956a0ad525adaf6fc22b16e12f1570f0f5528bdc47ee8913031b70e2757b3797
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRaCO4ACgkQVWmRsqeSphNTVwCfUT+RPSd3FWLk5+kkgALo416p
-Al8An2Llwwf561XJYtDprh0p/Ekgn8Sw
-=j3RY
+iEYEAREIAAYFAlTLaloACgkQVWmRsqeSphOsEQCfTF3CnK3JXsaH2gB0Fa2MyKvh
+erIAnRzcSexaHrlh5eysmewpEU3bj9pe
+=xNqp
 -----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.31-r1.ebuild b/net-misc/chrony/chrony-1.31-r1.ebuild
new file mode 100644
index 000000000000..f2017ef8779d
--- /dev/null
+++ b/net-misc/chrony/chrony-1.31-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.31-r1.ebuild,v 1.1 2015/01/30 11:26:16 jer Exp $
+
+EAPI=5
+inherit eutils systemd 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 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="caps ipv6 libedit readline +rtc selinux"
+REQUIRED_USE="?? ( libedit readline )"
+
+CDEPEND="
+	caps? ( sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	readline? ( >=sys-libs/readline-4.1-r4 )
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/texinfo
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+		-e 's:/var/run:/run:g' \
+		conf.c chrony.texi.in chrony.txt examples/* FAQ || die
+}
+
+src_configure() {
+	tc-export CC
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# not an autotools generated script
+	local CHRONY_CONFIGURE="
+	./configure \
+		$(usex caps '' --disable-linuxcaps) \
+		$(usex ipv6 '' --disable-ipv6) \
+		$(usex rtc '' --disable-rtc) \
+		${CHRONY_EDITLINE} \
+		${EXTRA_ECONF} \
+		--docdir=/usr/share/doc/${PF} \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--without-nss \
+		--without-tomcrypt
+	"
+
+	# print the ./configure call to aid in future debugging
+	einfo ${CHRONY_CONFIGURE}
+	sh ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+	emake all docs
+}
+
+src_install() {
+	default
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
+	doinfo chrony.info*
+
+	newinitd "${FILESDIR}"/chronyd.init chronyd
+	newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example chrony.conf
+	newins examples/chrony.keys.example chrony.keys
+
+	keepdir /var/{lib,log}/chrony
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony.logrotate chrony
+
+	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}