sci-libs/rsl: Moved to virtual/jpeg, add ~amd64

svn path=/sunrise/; revision=11978

diff --git a/sci-libs/rsl/Manifest b/sci-libs/rsl/Manifest
index f1bb0a1f0b0f8ca3e93618e3b3e3801bd5a2bb5f..9289c72be27e1f3bc20fc92b301c7d0358af0c1d 100644 (file)
--- a/sci-libs/rsl/Manifest
+++ b/sci-libs/rsl/Manifest
@@ -3,6 +3,6 @@ AUX rsl-type_str.patch 3582 RMD160 ba3bc9990021c89681eeaeceb41ad3641e86007d SHA1
 AUX rsl-valgrind.patch 4278 RMD160 5cef74fedb6cab7381d490ef185e7b4bdc0f203c SHA1 8dd5e4f2cf9560b1624b2a93c0f9f08765ea37c5 SHA256 e968f37fcb64919005754a860d59301dcc6433ec44e4b89a070c7147711adf75
 AUX rsl-warnings.patch 5991 RMD160 88e011a8778aa51dc391a9e98e004f6cc6901482 SHA1 97974cd1ab5a81b0a4e7a10e001bac150e9dd15f SHA256 a9ec0f73096b225162d7f55454b51e47419dc9847a80c42c154c2179d06d1bf7
 DIST rsl-v1.40.tar.gz 772417 RMD160 819573695a20dcef5313900d89df680ca66c3ea4 SHA1 3ef59a3556d3dbc95ec339d5a834c838c1e8aafd SHA256 94ccae61d86e8216cec8b17e50b9a7fb0fefb21cef02e0dd73ad10b0cc60acb7
-EBUILD rsl-1.40.ebuild 680 RMD160 c801596fb948f028ded5796f3c0ce6962a2ee369 SHA1 09dd43eea788c3ee6f09a174c0ec4545228d1e92 SHA256 63702afbb5b5cf2c26879069b84c2de076965ce8e48dda8ba81af5c3e58f0a0c
+EBUILD rsl-1.40.ebuild 595 RMD160 78f46e7dd3dd825122b72ff7dde7101ee8201075 SHA1 f447fbc4b4ef70f3f32bf9be769933141b4ae24d SHA256 df3d747cd94cbbb41ec41fb3e49765c453fcb79b59a737eb0ed00f658cd64173
 MISC ChangeLog 576 RMD160 5eeddc525d03f70e43eba036f562ad0c43c13160 SHA1 f6f287a09e4e073c6e96deb0d5af5f2a3f3708a3 SHA256 afff940e83010487265d57347d6de907643c13c27e83d40bb41fc94e4b98a248
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/sci-libs/rsl/rsl-1.40.ebuild b/sci-libs/rsl/rsl-1.40.ebuild
index 52b8baaaf5e30443c0c0e52659b7062fc5fa32e0..ede7e178eb143f7a679d18dba00b9542c0d36dcf 100644 (file)
--- a/sci-libs/rsl/rsl-1.40.ebuild
+++ b/sci-libs/rsl/rsl-1.40.ebuild
@@ -2,31 +2,29 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils autotools
 
+MY_P="${PN}-v${PV}"
+
 DESCRIPTION="Radar Software Library"
 HOMEPAGE="http://trmm-fc.gsfc.nasa.gov/trmm_gv/software/rsl/index.html"
-SRC_URI="ftp://trmm-fc.gsfc.nasa.gov/software/${PN}-v${PV}.tar.gz"
+SRC_URI="ftp://trmm-fc.gsfc.nasa.gov/software/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="sci-libs/hdf
-       media-libs/jpeg"
+RDEPEND="
+       sci-libs/hdf
+       virtual/jpeg"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/rsl-v${PV}"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
        epatch "${FILESDIR}/${PN}-"{warnings,automake,type_str,valgrind}".patch"
        eautoreconf
 }
-
-src_install() {
-       emake DESTDIR="${D}" install || die "install failed"
-       dodoc README CHANGES || die
-}