amd64 stable wrt #391597

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/media-sound/adplay/ChangeLog b/media-sound/adplay/ChangeLog
index 83a2a71bd56383fbd3fe54912e388509e14ff5b2..c4cb6a27b594b055ecb9bb4bdf51b19d23342222 100644 (file)
--- a/media-sound/adplay/ChangeLog
+++ b/media-sound/adplay/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/adplay
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/ChangeLog,v 1.21 2011/12/22 22:01:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/ChangeLog,v 1.22 2011/12/23 00:36:46 ssuominen Exp $
+
+  23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> adplay-1.7.ebuild:
+  amd64 stable wrt #391597
 
   22 Dec 2011; Markus Meier <maekke@gentoo.org> adplay-1.7.ebuild:
   x86 stable, bug #391597

diff --git a/media-sound/adplay/Manifest b/media-sound/adplay/Manifest
index e254bfd57754a87ea54678a1ae3f6e7dcae93599..1e40e067f092c796816effd33f470f8a80b6641c 100644 (file)
--- a/media-sound/adplay/Manifest
+++ b/media-sound/adplay/Manifest
@@ -4,13 +4,17 @@ Hash: SHA1
 DIST adplay-1.6.tar.bz2 247123 RMD160 4d9371182ec143574b512c3abc87a79db4f2a0d6 SHA1 2e7636f560142163a316fa0a4b4fe966884cedbf SHA256 e31379b000f3b9f181aa572119dd9cfae12b9e6e79cf099bc056e21a0ac33ab0
 DIST adplay-1.7.tar.bz2 264340 RMD160 9e4f954e9d2783e5bde8d28380b7637fd0dd35af SHA1 0076527c7714198de18d209255b2b64450017980 SHA256 2c62cf763de301a05d446655380465743c5b81fb027d9791996e5eac5bf6fdc6
 EBUILD adplay-1.6.ebuild 1019 RMD160 4df13c93bfe589411e43b5df04e2f0fde926cf94 SHA1 0d7ada98bb6440ca0806838efec95834c772c796 SHA256 9b2347f73c52175d0cc9db2e8ad40de751d3e32560a282c705dc678bcf80c028
-EBUILD adplay-1.7.ebuild 1022 RMD160 dd0c151cef30ed80961498b7418802a9ee581ca6 SHA1 2d5cff69424c53a921421cee4263a5c3b15c3335 SHA256 631b2c1ed52b0bf719dbbc6f609dac3432040557e3f417a4ef1354f7a3628bdf
-MISC ChangeLog 2758 RMD160 9f02df86e0e95a56de50bd688c0db9e5779a711f SHA1 8f56dcaee082fe9eb8cb6e4afe8f75ce9b64958f SHA256 0f0a5c9f2db3cd2bc13ee468392ec808e094d138bcb5d0c67be6b649147c2b1b
+EBUILD adplay-1.7.ebuild 905 RMD160 7f8d5a2c901113d44bcab26e4ec949a33ea21c77 SHA1 2633527822be33fa504ac614f5d4f3a7288a8e4e SHA256 a173df21f26391de015cf17027b9d4d7bcf13c6d1cbe2c1c4925a92ad8c75117
+MISC ChangeLog 2862 RMD160 26232752fa3673b24bb627590bed64caf1b21f95 SHA1 7b5d1a430dddd775bd88a17018165acaff08e5fc SHA256 763cb144e16d72435b3b3de195a04c8871db963fe642aa2c51d0f6eb63ad4144
 MISC metadata.xml 219 RMD160 adf9425714d416c5d3a617022a7f329b3028d7e1 SHA1 58176182db443c822f2bad772e2649eab15c336c SHA256 daa9d68ed73b1674688e969febaa6645c856c9334ea454e7bee99d56fcdda106
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7zqSkACgkQkKaRLQcq0GJNvQCgnmFTKFvIG2WOGk60pvJp5Cab
-ZYQAn1euvzq4yGuXIEaouA9+WXlphy+W
-=iL7s
+iQEcBAEBAgAGBQJO88zpAAoJEEdUh39IaPFNRloH/3qUavXtm6ybQxltP77HyIeB
+eVONAiOo3O6emJBdhJWiuXEusdTseeZPy6pyb2PLtBs8E1bjF8buJxB/F93IE0UK
+aUrj3YpEMRHdln9b9b+KCHjtIJA7dDOS+cT/joT2TXUmvYYiVXa20vGu1KMZ8qhH
+ynr4tbPKgZ3jLg6j1Vpw533auPOg3qXzR1pgNJiXTnjfcPiz5kE5uOPxfddJpdpa
+1Leu4szqyM90Uan9TkX1SzT5rNrznPRdKhkp8IUy5hoU80IlGDCW0YNRQkKFOo9h
+0k/CP31NmIhCA4xXpxBAMpz8kAq9EeGWVan2/MuDsQkIztqIto425tjc7ot4E8A=
+=uVlU
 -----END PGP SIGNATURE-----

diff --git a/media-sound/adplay/adplay-1.7.ebuild b/media-sound/adplay/adplay-1.7.ebuild
index 9bc067efe255829bb48f67a95797e1985db11252..bd3b625aaaf6e8c25d6bfdfaff9991c8f23ec45e 100644 (file)
--- a/media-sound/adplay/adplay-1.7.ebuild
+++ b/media-sound/adplay/adplay-1.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/adplay-1.7.ebuild,v 1.2 2011/12/22 22:01:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/adplay/adplay-1.7.ebuild,v 1.3 2011/12/23 00:36:46 ssuominen Exp $
+
+EAPI=4
 
 DESCRIPTION="A console player for AdLib music"
 HOMEPAGE="http://adplug.sourceforge.net"
@@ -8,10 +10,10 @@ SRC_URI="mirror://sourceforge/adplug/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="alsa ao esd oss sdl"
 
-RDEPEND="media-libs/adplug
+RDEPEND=">=media-libs/adplug-2.2.1
        dev-cpp/libbinio
        alsa? ( media-libs/alsa-lib )
        ao? ( media-libs/libao )
@@ -20,17 +22,13 @@ RDEPEND="media-libs/adplug
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
-src_compile() {
-       econf --disable-dependency-tracking \
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+       econf \
                $(use_enable alsa output-alsa) \
                $(use_enable ao output-ao) \
                $(use_enable esd output-esound) \
                $(use_enable oss output-oss) \
                $(use_enable sdl output-sdl)
-       emake || die "emake failed."
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed."
-       dodoc AUTHORS ChangeLog NEWS README TODO
 }