Force at least openssl 0.9.8 in order to remove ugly has_version and epatch combination

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

2 files changed, 22 insertions, 10 deletions

diff --git a/app-crypt/sign/Manifest b/app-crypt/sign/Manifest
index 19cb2adc1872..663f6217b2de 100644
--- a/app-crypt/sign/Manifest
+++ b/app-crypt/sign/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.0.7-as-needed.patch 383 RMD160 63b4767fee112f5b9e19bf24072e7e616e231fcd SHA1 4906e4685f209daa7d94c2a7e7c4cc4437ca556d SHA256 ed9a3234ef12aac2c4b5cb546784946eff5d357fb2b274bfb2715ad2c997bf3d
 AUX 1.0.7-openssl-0.9.8.patch 503 RMD160 936901a8e7e4bb7b06a629e0f7ea86aa3de74d1b SHA1 71cabd9de28e56663a5894ba32a8b4cfa3216ee4 SHA256 6acaabb6086e836d4a53121f6caeedd426fded7e25284cf0e536fbacd463b692
 DIST sign-1.0.7.tar.gz 28535 RMD160 cebad14a3c68bd103bf790ae054c1497c2ce3853 SHA1 dc828892a987982a48fdb95a0ba965bd3f03821e SHA256 c5f005eff29880807af37a128724f064cccb166fc9f49acab5f1403c9b72d4b9
-EBUILD sign-1.0.7.ebuild 1070 RMD160 3bed730bd7dc21f3ec1f9fac00c1e9b0fa780153 SHA1 5cc5b3453f459ac52f4dcc3d58588ec42550afd3 SHA256 8dcd243d986292678b62d822d1a4a710000ac7ee6b9105136c29e71e58501e37
+EBUILD sign-1.0.7.ebuild 977 RMD160 85598e1c14d26989ffad4e52975861cb8f18a7b7 SHA1 5fcdd7a67fd20f2bdec24465e14c37a32a4b4f50 SHA256 ee09e38d70afe0e24d8e632b8a13cc249f46b339e87b7d79506b3aee244187cc
 MISC ChangeLog 2039 RMD160 5419f2e12306eea77ec0a74714a3381b28dec63d SHA1 71470ddfd7e7ea53d029dfdd209fbec089dabf6f SHA256 e24b18ecf59fbe195f5e65049f35d72ba05a99ea492ae545af2c06c2c6e0bae1
 MISC metadata.xml 609 RMD160 b16d4b6bb3f4321cd7a0b93c04897f55182c860e SHA1 a3804e4531a27e862e2a01e843a48cf268d49eea SHA256 5fa1227cfeeb70219636972c46b92dfc4ba6f0b5f94c303268b1bd0cdf26b09b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2pG34ACgkQXkR9YqOcLPEO5wD/eTn30PSfX5RdrTWmJdrANqeT
+lgoQRAdHUyTMIDW5iFIA/1KFJYgfil8xYPSBufYL3vhvob38woEpD6GyqMjPXe40
+=uPEq
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/sign/sign-1.0.7.ebuild b/app-crypt/sign/sign-1.0.7.ebuild
index e6e9f264cc4a..b0c5f0128e77 100644
--- a/app-crypt/sign/sign-1.0.7.ebuild
+++ b/app-crypt/sign/sign-1.0.7.ebuild
@@ -1,36 +1,38 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/sign/sign-1.0.7.ebuild,v 1.11 2010/10/25 18:20:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/sign/sign-1.0.7.ebuild,v 1.12 2011/04/16 04:30:25 ssuominen Exp $
 
 inherit toolchain-funcs eutils
 
 DESCRIPTION="File signing and signature verification utility"
 HOMEPAGE="http://swapped.cc/sign/"
 SRC_URI="http://swapped.cc/${PN}/files/${P}.tar.gz"
+
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND=">=dev-libs/openssl-0.9.6"
+RDEPEND=">=dev-libs/openssl-0.9.8"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	has_version ">=dev-libs/openssl-0.9.8" && epatch "${FILESDIR}"/${PV}-openssl-0.9.8.patch
+	epatch "${FILESDIR}"/${PV}-openssl-0.9.8.patch
 	epatch "${FILESDIR}"/${PV}-as-needed.patch
 	# remove -g from CFLAGS, it happens to break the build on ppc-macos
 	sed -i -e 's/-g//' src/Makefile || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
-	dobin sign || die "dobin failed"
-	doman man/sign.1 || die "doman failed"
-	dodoc README || die "dodoc failed"
-	dosym sign /usr/bin/unsign || die "dosym failed"
+	dobin sign || die
+	doman man/sign.1 || die
+	dodoc README || die
+	dosym sign /usr/bin/unsign || die
 }