Remove obsolete strip-flags and replace FEATURES testing by UID testing wrt #277450, thanks to Jack Lloyd for reporting.

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

3 files changed, 25 insertions, 28 deletions

diff --git a/dev-util/monotone/ChangeLog b/dev-util/monotone/ChangeLog
index 3d9f2557e28e..ae48a79f2378 100644
--- a/dev-util/monotone/ChangeLog
+++ b/dev-util/monotone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/monotone
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/ChangeLog,v 1.61 2009/06/28 11:41:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/ChangeLog,v 1.62 2009/07/16 09:44:31 ssuominen Exp $
+
+  16 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> monotone-0.44.ebuild:
+  Remove obsolete strip-flags and replace FEATURES testing by UID testing
+  wrt #277450, thanks to Jack Lloyd for reporting.
 
 *monotone-0.44 (28 Jun 2009)
 
diff --git a/dev-util/monotone/Manifest b/dev-util/monotone/Manifest
index 0864a802c3ec..f8cca86e2aef 100644
--- a/dev-util/monotone/Manifest
+++ b/dev-util/monotone/Manifest
@@ -16,6 +16,6 @@ EBUILD monotone-0.35.ebuild 3307 RMD160 036583d39b5190b43db2f0a1daa83605ce47a508
 EBUILD monotone-0.39.ebuild 3663 RMD160 ba41cd92d18c3f762627120db3bac5883af4b34d SHA1 f741512aaad525478bf8acb0af47c0d97cfad4a4 SHA256 598bf688da1791222e2271ca60fd4fd24b74f12ca7d81c8d5bb2ff7d07a61e38
 EBUILD monotone-0.40.ebuild 3655 RMD160 4029e92637da57cdbf619a4ed5f9e098fb842ce9 SHA1 d168b9f34161fef032855e532a0c6fef789f5bfc SHA256 4b7c6dba5c0ecb8c1dcce4471a49bd77e67b86038c1785fafd4ad42c19998733
 EBUILD monotone-0.43.ebuild 3742 RMD160 ac8bcc4d114c843e980303cb43ab028084f28521 SHA1 1ac2a969d5f0aca19bbd5a90a0d5d8a45ec17ac4 SHA256 ae0d62e6afbf6ca09b432ae2fbd4e6bfd5aa0e5cb1ca439b1f0a87c51390033d
-EBUILD monotone-0.44.ebuild 3742 RMD160 93920b3e848eccba437ac105cf274934c78d2294 SHA1 de3ee59abab003f1041c98458c07f6eedcaf4920 SHA256 e0dbef4b8ab04186fbc1210d49b14f0d5d39646572bd6a7ca2239dd24aff05c4
-MISC ChangeLog 9975 RMD160 fc1d730157e7254f496d04f94ef7bbffdd199300 SHA1 c937f5128bb996a038a438adf16fbb9c7d9c674d SHA256 5f982d7841299e6d0f4377ce58b8cf7a26d344f47534c1689025da80e3865da5
+EBUILD monotone-0.44.ebuild 3306 RMD160 1a56b07b6938b7ed24b1d71dd8a5f409ec054162 SHA1 858b93dce6ee5f1efbf34e661d247417e127cb44 SHA256 c582eab246605ac445ff3733d26aa63855fe7fe925e00ab4c5d4a489b3eca1be
+MISC ChangeLog 10179 RMD160 737463a4b3f1389ae29bbe0e14d90b623f2b71aa SHA1 23dc1e671f48033f6e54ab22b4c7e3c4da18498e SHA256 772a4189b93062bfec6e5997972df0f470dd4efa7e15560036e6fecb80087d5d
 MISC metadata.xml 1024 RMD160 85108ed2778629efe1db730bcca17511c1df0acf SHA1 f51b9fba062d2a7011df881c8c907b7bfa30373c SHA256 e55ef6758ed6927c8412a7514e43e869c1304b503b7ca3e6d8311558c2413c7c
diff --git a/dev-util/monotone/monotone-0.44.ebuild b/dev-util/monotone/monotone-0.44.ebuild
index 3e399c9f61da..5d14f2b6cb6a 100644
--- a/dev-util/monotone/monotone-0.44.ebuild
+++ b/dev-util/monotone/monotone-0.44.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.44.ebuild,v 1.1 2009/06/28 11:41:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.44.ebuild,v 1.2 2009/07/16 09:44:31 ssuominen Exp $
 
-inherit elisp-common flag-o-matic bash-completion eutils
+EAPI=2
+inherit bash-completion elisp-common eutils
 
 DESCRIPTION="Monotone Distributed Version Control System"
 HOMEPAGE="http://monotone.ca"
@@ -11,18 +12,15 @@ SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-
 IUSE="doc emacs ipv6 nls"
 
-RDEPEND="
-	sys-libs/zlib
+RDEPEND="sys-libs/zlib
 	emacs? ( virtual/emacs )
 	>=dev-libs/libpcre-7.6
 	>=dev-libs/botan-1.8.0
 	>=dev-db/sqlite-3.3.8
 	>=dev-lang/lua-5.1
 	net-dns/libidn"
-
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.33.1
 	nls? ( >=sys-devel/gettext-0.11.5 )
@@ -34,25 +32,20 @@ pkg_setup() {
 	if [[ "$(gcc-version)" == "3.3" ]]; then
 		die 'requires >=gcc-3.4'
 	fi
-	# https://bugs.gentoo.org/show_bug.cgi?id=202371#c2
-	if ! has userpriv ${FEATURES} && has test ${FEATURES}; then
-		ewarn "No test will be performed due to lack of FEATURES=userpriv"
-	fi
 }
 
-src_compile() {
-	# more aggressive optimizations cause trouble with the crypto library
-	strip-flags
-	append-flags $(test-flags -fno-stack-protector-all -fno-stack-protector)
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	econf $(use_enable nls) \
+src_configure() {
+	econf \
+		$(use_enable nls) \
 		$(use_enable ipv6) \
-		--with-system-pcre || die "configure failed"
-	emake || die "Compilation failed"
+		--with-system-pcre
+}
+
+src_compile() {
+	emake || die "emake failed"
 
 	if use doc; then
-		emake html || die 'html compilation failed'
+		emake html || die "emake html failed"
 	fi
 
 	if use emacs; then
@@ -62,17 +55,17 @@ src_compile() {
 }
 
 src_test() {
-	if has userpriv ${FEATURES}; then
-		emake check || die "self test failed"
+	if [ $UID != 0 ]; then
+		emake check || die "emake check failed"
 	else
-		ewarn 'not tested - requires FEATURES=userpriv'
+		ewarn "Tests will fail if ran as root, skipping."
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
-	mv "${D}"/usr/share/doc/"${PN}" "${D}"/usr/share/doc/"${PF}"
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF}
 
 	dobashcompletion contrib/monotone.bash_completion