*/*: musicpd.org http to https.

Closes: https://github.com/gentoo/gentoo/pull/2787

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

13 files changed, 39 insertions, 34 deletions

diff --git a/dev-haskell/libmpd/metadata.xml b/dev-haskell/libmpd/metadata.xml
index 1eef489eb82..6c9830eddc9 100644
--- a/dev-haskell/libmpd/metadata.xml
+++ b/dev-haskell/libmpd/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<longdescription>
 		A client library for MPD, the Music Player Daemon
-		(&lt;http://www.musicpd.org/&gt;).
+		(&lt;https://www.musicpd.org/&gt;).
 	</longdescription>
 	<upstream>
 		<remote-id type="github">vimus/libmpd-haskell#readme</remote-id>
diff --git a/media-sound/mpc/mpc-0.27.ebuild b/media-sound/mpc/mpc-0.27.ebuild
index b5ff7a55e29..050fed36650 100644
--- a/media-sound/mpc/mpc-0.27.ebuild
+++ b/media-sound/mpc/mpc-0.27.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 inherit bash-completion-r1
 
 DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/mpc/mpc-0.28.ebuild b/media-sound/mpc/mpc-0.28.ebuild
index 0d09bff211f..25c9d99602b 100644
--- a/media-sound/mpc/mpc-0.28.ebuild
+++ b/media-sound/mpc/mpc-0.28.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit bash-completion-r1
 
 DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/mpd/mpd-0.19.10.ebuild b/media-sound/mpd/mpd-0.19.10.ebuild
index f5edad372bb..e35798551a6 100644
--- a/media-sound/mpd/mpd-0.19.10.ebuild
+++ b/media-sound/mpd/mpd-0.19.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -130,6 +130,7 @@ src_prepare() {
 
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
 	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+	eapply_user
 }
 
 src_configure() {
diff --git a/media-sound/mpd/mpd-0.19.11.ebuild b/media-sound/mpd/mpd-0.19.11.ebuild
index ac380c61890..a8b8cb557df 100644
--- a/media-sound/mpd/mpd-0.19.11.ebuild
+++ b/media-sound/mpd/mpd-0.19.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -130,6 +130,7 @@ src_prepare() {
 
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
 	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+	eapply_user
 }
 
 src_configure() {
diff --git a/media-sound/mpd/mpd-0.19.12.ebuild b/media-sound/mpd/mpd-0.19.12.ebuild
index bd945c12736..b7dc1f995ef 100644
--- a/media-sound/mpd/mpd-0.19.12.ebuild
+++ b/media-sound/mpd/mpd-0.19.12.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -130,6 +130,7 @@ src_prepare() {
 
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
 	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+	eapply_user
 }
 
 src_configure() {
diff --git a/media-sound/mpd/mpd-0.19.14.ebuild b/media-sound/mpd/mpd-0.19.14.ebuild
index bd945c12736..b7dc1f995ef 100644
--- a/media-sound/mpd/mpd-0.19.14.ebuild
+++ b/media-sound/mpd/mpd-0.19.14.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -130,6 +130,7 @@ src_prepare() {
 
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
 	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+	eapply_user
 }
 
 src_configure() {
diff --git a/media-sound/mpd/mpd-0.19.15.ebuild b/media-sound/mpd/mpd-0.19.15.ebuild
index ed101036896..72790fa2e3a 100644
--- a/media-sound/mpd/mpd-0.19.15.ebuild
+++ b/media-sound/mpd/mpd-0.19.15.ebuild
@@ -7,8 +7,8 @@ EAPI=6
 inherit autotools eutils flag-o-matic linux-info multilib systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/mpd/mpd-0.19.18.ebuild b/media-sound/mpd/mpd-0.19.18.ebuild
index 71a85d59d06..c62bb114b6c 100644
--- a/media-sound/mpd/mpd-0.19.18.ebuild
+++ b/media-sound/mpd/mpd-0.19.18.ebuild
@@ -7,8 +7,8 @@ EAPI=6
 inherit autotools eutils flag-o-matic linux-info multilib systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/mpd/mpd-0.19.19.ebuild b/media-sound/mpd/mpd-0.19.19.ebuild
index 71a85d59d06..c62bb114b6c 100644
--- a/media-sound/mpd/mpd-0.19.19.ebuild
+++ b/media-sound/mpd/mpd-0.19.19.ebuild
@@ -7,8 +7,8 @@ EAPI=6
 inherit autotools eutils flag-o-matic linux-info multilib systemd user
 
 DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/ncmpc/ncmpc-0.24-r2.ebuild b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
index dd3e75d16f7..a1f18d313d2 100644
--- a/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit autotools eutils multilib
 
 DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="http://www.musicpd.org/clients/ncmpc/"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,6 +28,7 @@ src_prepare() {
 	# default ax_with_curses.m4 produces automagic dependency on ncursesw
 	# also, ncursesw is required for colors (bug #554245), so we force it here
 	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
+	eapply_user
 
 	cp "${FILESDIR}"/ax_require_defined.m4 m4/ || die
 
diff --git a/media-sound/ncmpc/ncmpc-0.24.ebuild b/media-sound/ncmpc/ncmpc-0.24.ebuild
index ca8605f51b6..d1b1f6d0391 100644
--- a/media-sound/ncmpc/ncmpc-0.24.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.24.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit multilib
 
 DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="http://www.musicpd.org/clients/ncmpc/"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,9 +16,9 @@ IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics
 
 RDEPEND=">=dev-libs/glib-2.12:2
 	>=media-libs/libmpdclient-2.3
-	sys-libs/ncurses
+	sys-libs/ncurses:*
 	lirc? ( app-misc/lirc )
-	nls? ( sys-libs/ncurses[unicode] )"
+	nls? ( sys-libs/ncurses:*[unicode] )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig"
diff --git a/www-apps/phpmp/phpmp-0.11.0-r1.ebuild b/www-apps/phpmp/phpmp-0.11.0-r1.ebuild
index 70d69f6b8fd..9b29f3bbcc2 100644
--- a/www-apps/phpmp/phpmp-0.11.0-r1.ebuild
+++ b/www-apps/phpmp/phpmp-0.11.0-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="phpMp"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="phpMp is a client program for Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org/"
+HOMEPAGE="https://www.musicpd.org/"
 SRC_URI="mirror://sourceforge/musicpd/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"