Revert back to ~arch for x86 because there is no reverse dependencies. USE="static-libs" and empty dependency_libs to synchronize with current behavior of dvutil and dvnet ebuild(s).

(Portage version: 2.2.0_alpha92/cvs/Linux x86_64)

2 files changed, 30 insertions, 17 deletions

diff --git a/dev-libs/dvssl/ChangeLog b/dev-libs/dvssl/ChangeLog
index 5d3d1285d140..8a8aa2cc5763 100644
--- a/dev-libs/dvssl/ChangeLog
+++ b/dev-libs/dvssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/dvssl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvssl/ChangeLog,v 1.19 2010/04/12 19:21:01 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvssl/ChangeLog,v 1.20 2012/03/21 10:21:29 ssuominen Exp $
+
+  21 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> dvssl-0.6.1.ebuild:
+  Revert back to ~arch for x86 because there is no reverse dependencies.
+  USE="static-libs" and empty dependency_libs to synchronize with current
+  behavior of dvutil and dvnet ebuild(s).
 
   12 Apr 2010; Markus Meier <maekke@gentoo.org> dvssl-0.6.1.ebuild:
   x86 stable, bug #309169
diff --git a/dev-libs/dvssl/dvssl-0.6.1.ebuild b/dev-libs/dvssl/dvssl-0.6.1.ebuild
index b45fd8d90621..9cadabaa6064 100644
--- a/dev-libs/dvssl/dvssl-0.6.1.ebuild
+++ b/dev-libs/dvssl/dvssl-0.6.1.ebuild
@@ -1,34 +1,42 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvssl/dvssl-0.6.1.ebuild,v 1.2 2010/04/12 19:21:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvssl/dvssl-0.6.1.ebuild,v 1.3 2012/03/21 10:21:29 ssuominen Exp $
+
+EAPI=4
 
 DESCRIPTION="Provides a simple interface to OpenSSL"
 HOMEPAGE="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvssl/html/"
 SRC_URI="http://tinf2.vub.ac.be/~dvermeir/software/dv/${PN}/download/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="doc"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc static-libs"
 
-DEPEND="dev-libs/openssl
-	dev-libs/dvnet
-	dev-libs/dvutil"
+DEPEND="dev-libs/openssl:0
+	>=dev-libs/dvnet-0.9.24
+	>=dev-libs/dvutil-1.0.10-r2"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+DOCS="AUTHORS ChangeLog" # NEWS and README are useless
 
-	sed -i 's|^\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
-		die "sed Makefile.in failed"
+src_prepare() {
+	sed -e 's:libcrypto.a:libcrypto.so:' -e 's:libssl.a:libssl.so:' -i configure || die
+	sed -e 's|^\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' -i Makefile.in || die
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
+	default
 
-	if use doc ; then
+	if use doc; then
 		doman doc/man/*/*.[1-9]
 		dohtml -r doc/html/*
 	fi
+
+	# Keeping .la files in purpose, see: http://bugs.gentoo.org/409125
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
 }