gentoo resync : 14.07.2018

3 files changed, 3 insertions, 83 deletions

diff --git a/media-plugins/vdr-vdrmanager/Manifest b/media-plugins/vdr-vdrmanager/Manifest
index 510391be2d1a..cbc456b6a45c 100644
--- a/media-plugins/vdr-vdrmanager/Manifest
+++ b/media-plugins/vdr-vdrmanager/Manifest
@@ -2,8 +2,6 @@ AUX confd 600 BLAKE2B 823d55620653b8f61dcaa98924e38e236800d1d5cc1d90c6f7ec9a14b5
 AUX confd-0.12 1156 BLAKE2B 1d34b1f59c91016a9594235bfde19bebe56ea02dc8df1a8167eaaf5f247f8ccdf74e29b05f7f3c4cba10bc18c8069fc523e7659bba849920f92bbbf156727540 SHA512 a2c213ad9cc5955a7b341d710507b609c4c22db28716df4775f809c5d0c95e55f6497b122a018be395eb7fc3631c2ad4b4ebae779d912f14b7d2d9ba836c7154
 AUX rc-addon-0.12.sh 686 BLAKE2B d0cea279707ac69d8c7a02963d97d3b33ac319304d20d8008ac81e13588c02e69ee0066ce2910e7a223a2f5b2cabc602663d251aab65b926d557409cc7e77a0c SHA512 7fa21512024fa57024d37a88dc2ede422ac206e08f143c40ef13cd8692e0d9ec626cf02fb80adbf569c2edde69f147367dd9c8aeb8fb9d27ae9193c43406c2d3
 AUX rc-addon.sh 422 BLAKE2B e609e1c36cec36b678b5163f9efd4c201e6a55cbf9ecf62b0d3b9f4e7632b833c54c6477ce3d5c041cb3cb36fcdc227eea4ae1b4a276fb212abf61a02704f661 SHA512 8baddd977f0806aeb8a5c9aa9c043b22bd556aab135820afc33b98de461cbd9d1f99fdb6bedaa73476f8d2b7c61ecd4d877345fd66e708c9c7fda6018446bc48
-DIST vdr-vdrmanager-0.12.tar.gz 34404 BLAKE2B 7148a9b40a558220f9e236ca7c8c5ba110fa9d5a59ae4e80231acea0b8c14526fceafd1077716654f5a2d89667de00bf7ae6412bcb2253884f9b8d9fe85797f9 SHA512 a5b962c53c636c899f2ce62a4f20bc123fb5d4603d506c51b6450fde86348bc5192697876e03bf22952197846f7cf828d743727de0c9903420a05c0c07172265
 DIST vdr-vdrmanager-0.14.tgz 30543 BLAKE2B d2ccfbd13b811681daa67d9df841d5add7d0068a1a3f49d901c75d35c7462b50d86faeb8c710069249dd6ae2104508b5be7860bfef56162359c340b052933b1c SHA512 6b8604a5311b64fad82e3934f38524cc0f122968c707989606a5e06755a9c817ab3e7144afa4f561d8aaef8b239b758fe886ee3265410de25491243a8ef18fc3
-EBUILD vdr-vdrmanager-0.12.ebuild 2205 BLAKE2B 59c8f95259b3c49a19d2e272a05c9a5f8a2b4bec9f447f692520d35e8dabafe9270b338a3952b62d26ec06eeb3c8d9bd19458cd500668e782cba8b4e5c7e337c SHA512 eb0ad8f51de7e9b0286d9c430683701fec7a4be9d6c21e3aadfc746a5f63ea134c83157bfe83c5a18a95cd7f1eb07dc5909fa2ca4a5f4421c48596526ad678e1
-EBUILD vdr-vdrmanager-0.14.ebuild 2202 BLAKE2B 1af9c089596201108682e4f1268bdb3337045212d6aa53e9119e83d857f2d530073ff9e07b46a94e8f43eb89d0644cf323e0602dd59f1ced423446ab3d53d574 SHA512 49a108adfdfd699fe397caecd34d43cd7c9a7f2a4168bc0aaba05e0fbbf9512de09623fa5be68a3d76e3c1d716687eadca17df339b3c97bb3aadb62d3b7a6e6a
+EBUILD vdr-vdrmanager-0.14.ebuild 2203 BLAKE2B 0c93ebe00b01337c08a97ca2d734143ffc5ad2f22c75e5c53619aa9fed0fd85fbf7f6244a0f9df70a38af12ef01584bf740b51970ea9f582f6bbe617fa3a1a1b SHA512 4307791e7ca568fad6179537945fcb8c2b4e9e8ebb07fccb879f4db60d481ced7d49e0641b8b5adf2be1bab3dfd52322311fe8f193d4d2e07f5bcb2142fecf2a
 MISC metadata.xml 343 BLAKE2B 9096d9d6e70cf4fba780ebcb20a71a2e48baa8b0e119ee77a1c42f1a3b770388f69489459f8b35e5d4c929423e13e1f537f174ff25e2c94709b46fc0b0823220 SHA512 3045d1a4c69d44d576143ee396fd3f8908e4c5a6aa9f9f949b3e0a65d3120e7da9720d58ec82307ace2375c6867ae86be01eca8b83f5d7677bd6c86102a06880
diff --git a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild
deleted file mode 100644
index 0427b6c21a46..000000000000
--- a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2 ssl-cert
-
-VERSION="1747" # every bump, new version
-
-DESCRIPTION="VDR Plugin: remote programming VDR using VDR-Manager running on Android devices"
-HOMEPAGE="http://projects.vdr-developer.org/projects/vdr-manager/wiki"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="gzip +ssl -stream zlib"
-
-DEPEND=">=media-video/vdr-2
-		ssl? ( dev-libs/openssl )"
-RDEPEND="stream? ( media-plugins/vdr-streamdev[server] )
-		zlib? ( sys-libs/zlib )"
-
-S="${WORKDIR}/${P}"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.12.sh"
-VDR_CONFD_FILE="${FILESDIR}/confd-0.12"
-
-VDRMANAGER_SSL_KEY_DIR="/etc/vdr/plugins/vdrmanager"
-VDRMANAGER_SSL_KEY_FILE="${VDRMANAGER_SSL_KEY_DIR}/vdrmanager"
-
-make_vdrmanager_cert() {
-	SSL_COUNTRY="${SSL_COUNTRY:-}"
-	SSL_STATE="${SSL_STATE:-Unknown}"
-	SSL_LOCALITY="${VDRMANAGER_SSL_LOCALITY:-Unkown}"
-	SSL_ORGANIZATION="${VDRMNAGER_SSL_ORGANIZATION:-VDR-Manager Plugin}"
-	SSL_UNIT="${VDRMANAGER_SSL_UNIT:-VDR Server}"
-	SSL_COMMONNAME="${VDRMANAGER_SSL_COMMONNAME:-`hostname -f`}"
-	SSL_EMAIL="${VDRMANAGER_SSL_EMAIL:-Unknown}"
-	SSL_BITS="${VDRMANAGER_SSL_BITS:-1024}"
-	SSL_DAYS="${VDRMANAGER_SSL_DAYS:-720}"
-
-	rm -f "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.*
-
-	install_cert ${VDRMANAGER_SSL_KEY_FILE}
-
-	rm -f "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.{crt,csr,key}
-	chown vdr:vdr "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.pem
-	chmod 0400 "${ROOT}"${VDRMANAGER_SSL_KEY_FILE}.pem
-}
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	BUILD_PARAMS+=" VDRMANAGER_USE_GZIP=$(usex gzip 1 0)"
-	BUILD_PARAMS+=" VDRMANAGER_USE_SSL=$(usex ssl 1 0)"
-	BUILD_PARAMS+=" VDRMANAGER_USE_ZLIB=$(usex zlib 1 0)"
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	einfo "Add a password to /etc/conf.d/vdr.vdrmanager"
-
-	if use ssl ; then
-		if path_exists -a "${ROOT}${VDRMANAGER_SSL_KEY_FILE}.pem"; then
-			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
-			einfo "emerge --config ${PN}"
-		else
-			einfo "No SSL cert found, creating a default one now"
-			make_vdrmanager_cert
-		fi
-	fi
-}
-
-pkg_config() {
-	make_vdrmanager_cert
-}
diff --git a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild
index 80757050530c..8639a6df48d1 100644
--- a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild
+++ b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit vdr-plugin-2 ssl-cert
 VERSION="1971" # every bump, new version
 
 DESCRIPTION="VDR Plugin: remote programming VDR using VDR-Manager running on Android devices"
-HOMEPAGE="http://projects.vdr-developer.org/projects/vdr-manager/wiki"
+HOMEPAGE="https://projects.vdr-developer.org/projects/vdr-manager/wiki"
 SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
 KEYWORDS="~x86 ~amd64"