gentoo resync : 26.11.2017

3 files changed, 52 insertions, 9 deletions

diff --git a/media-libs/adplug/Manifest b/media-libs/adplug/Manifest
index db0eac8c8d46..c6d630da0f72 100644
--- a/media-libs/adplug/Manifest
+++ b/media-libs/adplug/Manifest
@@ -1,6 +1,6 @@
 DIST adplug-2.2.1.tar.bz2 810257 SHA256 f95a015268a0dfe9ff5782f3ea7b2a69e09b8d36ccd19ebf4d979d767b6e53ef SHA512 e9b434ad58114a6677907e8f7007a325fa908f9228fbe283d72d1e2394fa27850b929309e038c84ae94f64f8db003b871775502ee8b231219caa51f6ba5d787f WHIRLPOOL 3f337b914f1779f9702014108d4cb4dc816830d1cadc0623751d979bd81213286d431225aa7d28a7aeb35fb32bc614cf581915b6e27357f3f6dc51f30ae58d19
-EBUILD adplug-2.2.1.ebuild 624 SHA256 e8c71ae6bbb876fdb3b3d724d79b21adbc2fe2c80faeab508e320213c1026516 SHA512 eaba3f130aa0a6174d2aadbbb65228beafd1ab86d6c7b08a275c33635bb86437ca3e8002e2ab26e82f06683a137a7c57d2e9ac6b7c8b80b6249776d3c4b9a090 WHIRLPOOL 1e3526fdaf1c13764e7d6c2032708df69ea18b4a75c32ffaa1a0cece183d355f84a3a69793a5f368b50faa936444d1e033f47b6cb63dc5db0532b7dd6c1f5eb3
-EBUILD adplug-9999.ebuild 817 SHA256 3a0a89742bedb8bf689db37c0e9c52e29aec293a5d2f051634dae99af64850c3 SHA512 9c8223f4f75b1e70ebcb8e2529213d19d68ba09931b964fdceeb6dede9c243793e2bd189104bb129890b5a9a1edd88a576eb06da3b36db80369db02cc9591511 WHIRLPOOL 2c7bd17f2e912252af9e665de06be82820597218a3810ff028503d28605b791acefb53d8a9d72cfd86346b365174204d9c965c35bcc89b535470b903866abde4
-MISC ChangeLog 2426 SHA256 bc4b267841a455800078486259259cf8ff55759ee0d8899f927e2aa02021ba20 SHA512 5c698142b2e96457317392f03098e5d8c14145d8c7245058c1e0bd86ab8f92111b950d85755ec5b511fdd6419385dd237ba8635130c61803f19090c99a6d1121 WHIRLPOOL a0f483589b2a74e737996470649327dc6f48c506f111063941ac522cda99db85eecb2b9d24d8bf7b09492777bf5a9c2b622ee23635d90f2f89f68ad872ecd5c7
-MISC ChangeLog-2015 5709 SHA256 663a7f595318274c9a23508136ed07bf272505a292f44a0e4f9ad21965b19baa SHA512 b38559363e72c0a914dee2e877bf5d7d2219b9db7de6ab1f521b8869f892cd39fc8b14d0f365f20d624ed9228e80a1a1e2922f55dcbde057606fac3d37c92229 WHIRLPOOL 2044dc603d2e1f5540a8fe1bdeae6c5b6d0d326dc6a04aea400122a3612eccf7f8600c2012d78b8327d7c4d8803fb1f16236d2f0add862b73c5a9d4b7a03cb15
-MISC metadata.xml 329 SHA256 cfc5475682e64822374960c3dcd2ca07acc5ff73a68026c58a417b24d3da9d28 SHA512 a865c199afa30a18b4b810b4bdd981dfd77fd5843740a43dffc59c10b2e151c66a8e39d73bea04024f544e83f24400ae10aedc9ae3e93db9a67694adf886a073 WHIRLPOOL 0ed02ed1a2ac6ee25d834fa08b00e48ed6630c43c2a01ec1e06f3d507a697812c4f4cacb4363c40b40270c1bc0ae1dcc78be32e93e929792763bf8516e04050f
+DIST adplug-2.3.tar.bz2 1462858 SHA256 f64a37f6243836bd0c9c1b7c3a563e47f4b15676d30c074e88b75b2415bfdf6a SHA512 591192032772fbedfec67924693fce3fc490e5bccb1898eea8d38b6d10f066373ebdc4868751041dd21461b5112b349f0be7ff047d7ccaa896fe4ece88ebab74 WHIRLPOOL 073898dab4bdf17a82cd0f4fd31e50381369cc7287da5aafc04932619aaaba726c0bae55aab5f0607b100a7b64b7ebfabfc35b990d261b55600da704fc94761e
+EBUILD adplug-2.2.1.ebuild 624 BLAKE2B e762d87d6b15d6dc6e6c2367db8e8b1af9c504755e2be3a547129b3a21dc64b672a16ad1b5e7d5726a87a389e831a732f331279b1141c8f195311347b55fc5a6 SHA512 eaba3f130aa0a6174d2aadbbb65228beafd1ab86d6c7b08a275c33635bb86437ca3e8002e2ab26e82f06683a137a7c57d2e9ac6b7c8b80b6249776d3c4b9a090
+EBUILD adplug-2.3.ebuild 883 BLAKE2B 3bccf749902021fb68b2654130fbe07f3c1854c7c1a319188224b711d1f84379e12c986adb22e772bed116f7fdf6b0a1065e4f1345c8e01d74ca29949bd2d842 SHA512 86f74c66bf96edd1667f6ffcbcb30e831fede37df986fe6b0a8ba5f760f65fbd1952255b1853383d4f3a1bdd4173897617af5862792464880dc7a9186ca9f358
+EBUILD adplug-9999.ebuild 883 BLAKE2B 3bccf749902021fb68b2654130fbe07f3c1854c7c1a319188224b711d1f84379e12c986adb22e772bed116f7fdf6b0a1065e4f1345c8e01d74ca29949bd2d842 SHA512 86f74c66bf96edd1667f6ffcbcb30e831fede37df986fe6b0a8ba5f760f65fbd1952255b1853383d4f3a1bdd4173897617af5862792464880dc7a9186ca9f358
+MISC metadata.xml 329 BLAKE2B 27c4b8b5676c1d5f9b3c2d38b397d2edf65dd28fbdca6ea12feb61870a6758f1cd27ab50670674bcb5561f6a70515596b170600dcdf592897edb35153a12142a SHA512 a865c199afa30a18b4b810b4bdd981dfd77fd5843740a43dffc59c10b2e151c66a8e39d73bea04024f544e83f24400ae10aedc9ae3e93db9a67694adf886a073
diff --git a/media-libs/adplug/adplug-2.3.ebuild b/media-libs/adplug/adplug-2.3.ebuild
new file mode 100644
index 000000000000..12fcc15d3f9c
--- /dev/null
+++ b/media-libs/adplug/adplug-2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit out-of-source
+
+DESCRIPTION="A free, cross-platform, hardware independent AdLib sound player library"
+HOMEPAGE="http://adplug.sourceforge.net"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/adplug/adplug.git"
+else
+	SRC_URI="https://github.com/adplug/${PN}/releases/download/${P}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug static-libs"
+
+RDEPEND=">=dev-cpp/libbinio-1.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+my_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug)
+}
+
+my_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/adplug/adplug-9999.ebuild b/media-libs/adplug/adplug-9999.ebuild
index b44d43a3eae6..12fcc15d3f9c 100644
--- a/media-libs/adplug/adplug-9999.ebuild
+++ b/media-libs/adplug/adplug-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit out-of-source
+
 DESCRIPTION="A free, cross-platform, hardware independent AdLib sound player library"
 HOMEPAGE="http://adplug.sourceforge.net"
 
@@ -10,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/adplug/adplug.git"
 else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	SRC_URI="https://github.com/adplug/${PN}/releases/download/${P}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 fi
 
@@ -27,13 +29,13 @@ src_prepare() {
 	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
-src_configure() {
+my_src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable debug)
 }
 
-src_install() {
-	default
+my_src_install_all() {
+	einstalldocs
 	find "${D}" -name '*.la' -delete || die
 }