commit: d4b345fdf52a3c2251b72ccdc3b31402ded6db82 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> AuthorDate: Mon Sep 3 11:13:40 2018 +0000 Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> CommitDate: Mon Sep 3 11:13:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b345fd
media-plugins/vdr-satip: cleanup old; eapi 7; fixed bug 637620 Package-Manager: Portage-2.3.48, Repoman-2.3.10 media-plugins/vdr-satip/Manifest | 2 -- .../files/vdr-satip-2.2.3_missinginclude.patch | 15 +++++++++++ media-plugins/vdr-satip/vdr-satip-1.0.2-r1.ebuild | 30 ---------------------- media-plugins/vdr-satip/vdr-satip-2.2.0.ebuild | 30 ---------------------- ...p-2.2.3-r1.ebuild => vdr-satip-2.2.3-r2.ebuild} | 7 +++-- media-plugins/vdr-satip/vdr-satip-2.2.3.ebuild | 30 ---------------------- 6 files changed, 20 insertions(+), 94 deletions(-) diff --git a/media-plugins/vdr-satip/Manifest b/media-plugins/vdr-satip/Manifest index 22208e5bd3e..b6076d3a73d 100644 --- a/media-plugins/vdr-satip/Manifest +++ b/media-plugins/vdr-satip/Manifest @@ -1,3 +1 @@ -DIST vdr-satip-1.0.2.tgz 59480 BLAKE2B 9f7c1ee20c32df348cea5e004b792db05814c79d79d4ef8d7aaa55067c65f3d70057a31cd679ec148282d55382f7cf90534cff904da1aee55715d27aa7dd3a7a SHA512 a8630c1ebfbbe74eb7f78d350bd487bf67256d2d01ee05c631351d5a0891fd0ea5dcd1bbf8a2c26be806ee6dfbb1415bf8616914a6bb9a46a3fac213a6c60c94 -DIST vdr-satip-2.2.0.tgz 60496 BLAKE2B 453cd4748b7c5c98ed9b977af6ce069be20fd3367074777d99e02b0231c987ccfe49b2f23af5dc932b5eda69f15ab3b2e6f405b297e2ad39c02fc2b7bbd1814b SHA512 9a32297c48650ee6ce22aebc0e6f59774a39aba7b1c75942833bba6e65b518c0bc6b50d3deba95fecec34dbfcb092e905a04eade92ce7658f2ca452131e9210e DIST vdr-satip-2.2.3.tgz 62722 BLAKE2B 408fe520b4210fa24667d4244560d5132260ce08067d482a50b12446c42c0c34fd922b3429d00c4e3550a7b1dc1d21bfac534cae9de478594751b9cf0f558d52 SHA512 451606b52831c009aaec894f0547c59a9447279d7f96a4b2291614eab09a3539849abcb6974b7c2c4b34e7b43a2f9c782ab1ea6bfd4e35f9747349065fb6a5e7 diff --git a/media-plugins/vdr-satip/files/vdr-satip-2.2.3_missinginclude.patch b/media-plugins/vdr-satip/files/vdr-satip-2.2.3_missinginclude.patch new file mode 100644 index 00000000000..4d0b32329e2 --- /dev/null +++ b/media-plugins/vdr-satip/files/vdr-satip-2.2.3_missinginclude.patch @@ -0,0 +1,15 @@ +fix: isspace was not declared in this scope +https://github.com/rofafor/vdr-plugin-satip/commit/c10372bb4f1 + +Signed-of by: Joerg Bornkessel <[email protected]> (03/Sep/2018) +diff -Naur satip-2.2.3.orig/satip.c satip-2.2.3/satip.c +--- satip-2.2.3.orig/satip.c 2018-09-03 13:00:20.000000000 +0200 ++++ satip-2.2.3/satip.c 2018-09-03 13:00:54.000000000 +0200 +@@ -5,6 +5,7 @@ + * + */ + ++#include <ctype.h> + #include <getopt.h> + #include <vdr/plugin.h> + #include "common.h" diff --git a/media-plugins/vdr-satip/vdr-satip-1.0.2-r1.ebuild b/media-plugins/vdr-satip/vdr-satip-1.0.2-r1.ebuild deleted file mode 100644 index 8e3078d571c..00000000000 --- a/media-plugins/vdr-satip/vdr-satip-1.0.2-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit vdr-plugin-2 - -DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR" -HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"; -SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${P}.tgz"; - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=">=media-video/vdr-2 - >=net-misc/curl-7.36 - || ( dev-libs/tinyxml - dev-libs/pugixml )" -RDEPEND="${DEPEND}" - -src_prepare() { - vdr-plugin-2_src_prepare - - if has_version "dev-libs/tinyxml" ; then - sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile - #BUILD_PARAMS+=" SATIP_USE_TINYXML = 1 " - fi -} diff --git a/media-plugins/vdr-satip/vdr-satip-2.2.0.ebuild b/media-plugins/vdr-satip/vdr-satip-2.2.0.ebuild deleted file mode 100644 index 8214e2462b1..00000000000 --- a/media-plugins/vdr-satip/vdr-satip-2.2.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit vdr-plugin-2 - -DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR" -HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"; -SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${P}.tgz"; - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=">=media-video/vdr-2.2.0 - >=net-misc/curl-7.36 - || ( dev-libs/tinyxml - dev-libs/pugixml )" -RDEPEND="${DEPEND}" - -src_prepare() { - vdr-plugin-2_src_prepare - - if has_version "dev-libs/tinyxml" ; then - sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile - #BUILD_PARAMS+=" SATIP_USE_TINYXML = 1 " - fi -} diff --git a/media-plugins/vdr-satip/vdr-satip-2.2.3-r1.ebuild b/media-plugins/vdr-satip/vdr-satip-2.2.3-r2.ebuild similarity index 85% rename from media-plugins/vdr-satip/vdr-satip-2.2.3-r1.ebuild rename to media-plugins/vdr-satip/vdr-satip-2.2.3-r2.ebuild index 75160254218..805adb773dd 100644 --- a/media-plugins/vdr-satip/vdr-satip-2.2.3-r1.ebuild +++ b/media-plugins/vdr-satip/vdr-satip-2.2.3-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit vdr-plugin-2 @@ -26,6 +26,9 @@ src_prepare() { # c++11 compile fix eapply "${FILESDIR}/${P}_c++11.patch" + #gcc 7 compile fix + eapply "${FILESDIR}/${P}_missinginclude.patch" + if has_version "dev-libs/tinyxml" ; then sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile fi diff --git a/media-plugins/vdr-satip/vdr-satip-2.2.3.ebuild b/media-plugins/vdr-satip/vdr-satip-2.2.3.ebuild deleted file mode 100644 index 8214e2462b1..00000000000 --- a/media-plugins/vdr-satip/vdr-satip-2.2.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit vdr-plugin-2 - -DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR" -HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"; -SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${P}.tgz"; - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=">=media-video/vdr-2.2.0 - >=net-misc/curl-7.36 - || ( dev-libs/tinyxml - dev-libs/pugixml )" -RDEPEND="${DEPEND}" - -src_prepare() { - vdr-plugin-2_src_prepare - - if has_version "dev-libs/tinyxml" ; then - sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile - #BUILD_PARAMS+=" SATIP_USE_TINYXML = 1 " - fi -}
