better ssl cert re/creation, will create now by pkg_config call

Package-Manager: portage-2.1.10.11/cvs/Linux i686

3 files changed, 37 insertions, 27 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index 376c50cbb690..692302f12bd7 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.29 2012/03/09 00:35:58 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.30 2012/03/09 23:25:19 hd_brummy Exp $
+
+  09 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-live-0.2.0.20120114.ebuild:
+  better ssl cert re/creation, will create now by pkg_config call
 
 *vdr-live-0.2.0.20120114 (09 Mar 2012)
 
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 2e73d7264373..c4731d6a724f 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -9,15 +9,15 @@ DIST vdr-live-0.2.0.20110419.tar.gz 1987984 RMD160 7740af3b6fb91e5b9fdde30509456
 DIST vdr-live-0.2.0.20120114.tar.gz 1993095 RMD160 3b982ba64171a458e530cfd388185ce20959f129 SHA1 28d1a3669d24a9ed3cbb41e4c21900dd96936fbd SHA256 fb1a931f282aa8282d6fa1a5ebac6a97cdfd59574b29b9413e7f498ea2723449
 DIST vdr-live-0.2.0.tar.gz 560582 RMD160 10f7196ecaaa99280a6032f5d8d80a6c73a1f8d6 SHA1 b9687db0c913026ae4d29d99cbc6f031f4f32d34 SHA256 30ac64040be4defb75beb9d3a5b0218694fc5b10486926acd989e6eb6c72ca55
 EBUILD vdr-live-0.2.0.20110419-r1.ebuild 2752 RMD160 0a042ddca4740d94dea35003ada80e167407a84a SHA1 cbfd214a6fd15733e6cc5d78c2c2197732beb193 SHA256 c3e5b37ffd3f4b7c92dac9cad9b633c779e4688cec9fa1284143085da5c30cbb
-EBUILD vdr-live-0.2.0.20120114.ebuild 2676 RMD160 802ed0a0dcbbf4a2d1a58d967189986a8d143000 SHA1 08bb29b980bea44a81495cd104e669e491705bf4 SHA256 eaaf7fcc6fa47b8f4d156acc5a3f7a9b99ca1a446c6be41209c1f3b1b44db233
+EBUILD vdr-live-0.2.0.20120114.ebuild 2710 RMD160 cdfd8eeef2b594d6cc11f99fb2d63aa7598a93e8 SHA1 e65953f4d16574bc01a50163ef17dbd71b965d6a SHA256 14769d64f272c756666eafe875e344daed317013ce0a0fa9d94617f5bc88f9ba
 EBUILD vdr-live-0.2.0.ebuild 1222 RMD160 cd71347d9e29a14b82aad793f52d71529ed3030a SHA1 3696794eafbf52282a7a9a4f80ea4e872268d0c2 SHA256 25f86271282802d7a92f13cdf91b728b74d1d4a04f6344a103422fd968246d41
-MISC ChangeLog 5592 RMD160 f368bd1c0ae64a224e1d13ca8d35d6cdcc03a9b6 SHA1 73fedb18b16f7f086704a48223aa1d4cd5d5e75f SHA256 a4933f9a08599bd362ed0fc070ec79e6bb889357b3b7cd4af118fdffce4c90b4
+MISC ChangeLog 5748 RMD160 d9474518110e85743131e5a654ace1365553db44 SHA1 421678c0f5249cd8c1034cc6cb13bc0083df7f84 SHA256 328bf25f68966bae59dd5ca666abac5954d8d2e1246b18bbe2ec1e5d38940653
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPWVF6dn07HTTCgIoRAm91AJ9mLUqFSZOqKbQtbXZ+XgdXweSw2ACfegoD
-/zpNOXNlJX0HlQVs2ZVq27E=
-=FdvN
+iD8DBQFPWpKZdn07HTTCgIoRAhr3AJ9j5nL+cuOVcV7KWRb8Wq6PXojXTgCgp4Mp
+RMdRbCDHdS7hjLcTJ9HXwP4=
+=ZXBB
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild
index b27fbc159f48..10c07ebbd400 100644
--- a/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild,v 1.1 2012/03/09 00:35:58 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild,v 1.2 2012/03/09 23:25:19 hd_brummy Exp $
 
 EAPI="4"
 
@@ -68,25 +68,7 @@ src_install() {
 }
 
 pkg_postinst() {
-
-	if use ssl ; then
-		if path_exists -a "${ROOT}"/etc/vdr/plugins/live/live.key; then
-			einfo "SSL cert exists"
-			einfo ""
-			einfo "simply to create a new SSL cert remove:"
-			einfo "/etc/vdr/plugins/live/{live.key,live.crt}"
-			einfo "and reinstall ${P}"
-		else
-			einfo "Create SSL cert"
-			make_live_cert
-			local base=$(get_base 1)
-			local keydir="/etc/vdr/plugins/live"
-			install -d "${ROOT}${keydir}"
-			install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
-			install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
-			chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
-		fi
-	fi
+	vdr-plugin_pkg_postinst
 
 	elog "To be able to use all functions of vdr-live"
 	elog "you should emerge and enable"
@@ -101,5 +83,29 @@ pkg_postinst() {
 	einfo "On problems, use the stable amd64, x86 versions of"
 	einfo "dev-libs/tntnet dev-libs/cxxtools media-plugins/vdr-live"
 
-	vdr-plugin_pkg_postinst
+	if use ssl ; then
+		if path_exists -a "${ROOT}"/etc/vdr/plugins/live/live.key; then
+			einfo "found SSL cert"
+			einfo ""
+			einfo "to create a new SSL cert, run:"
+			einfo ""
+			einfo "emerge --config ${PN}"
+		else
+			einfo "NO SSL cert found"
+			einfo ""
+			einfo "Create SSL cert, now ..."
+			pkg_config
+		fi
+	fi
+}
+
+pkg_config() {
+
+			make_live_cert
+			local base=$(get_base 1)
+			local keydir="/etc/vdr/plugins/live"
+			install -d "${ROOT}${keydir}"
+			install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
+			install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
+			chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
 }