From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9495138331 for ; Tue, 13 Feb 2018 23:39:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECB97E0AF0; Tue, 13 Feb 2018 23:39:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0D58E0AF0 for ; Tue, 13 Feb 2018 23:39:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A13E8335C4E for ; Tue, 13 Feb 2018 23:39:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F180215 for ; Tue, 13 Feb 2018 23:39:04 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1518565101.38d31a9754e26f7db69cd86383d0db30caf583c5.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/vlc-3.0.0-r1.ebuild media-video/vlc/vlc-3.0.9999.ebuild media-video/vlc/vlc-9999.ebuild X-VCS-Directories: media-video/vlc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 38d31a9754e26f7db69cd86383d0db30caf583c5 X-VCS-Branch: master Date: Tue, 13 Feb 2018 23:39:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5b71eddb-1fa7-401d-8492-605483a6c38d X-Archives-Hash: 712a3fd59d02c61241c0857f73111e60 commit: 38d31a9754e26f7db69cd86383d0db30caf583c5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 13 23:31:41 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 13 23:38:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d31a97 media-video/vlc: Compact lines Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-video/vlc/vlc-3.0.0-r1.ebuild | 7 ++++--- media-video/vlc/vlc-3.0.9999.ebuild | 7 ++++--- media-video/vlc/vlc-9999.ebuild | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/media-video/vlc/vlc-3.0.0-r1.ebuild b/media-video/vlc/vlc-3.0.0-r1.ebuild index db7fcef6308..2690e5572c6 100644 --- a/media-video/vlc/vlc-3.0.0-r1.ebuild +++ b/media-video/vlc/vlc-3.0.0-r1.ebuild @@ -254,7 +254,8 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + has_version '>=net-libs/libupnp-1.8.0' && \ + eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch # Bootstrap when we are on a git checkout. if [[ ${PV} = *9999 ]] ; then @@ -458,8 +459,8 @@ src_configure() { econf ${myeconfargs[@]} # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file + # Other values may break the build (bug 523144), so definition should not be removed. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h sed -i '1i#undef _FORTIFY_SOURCE' config.h || die } diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index db7fcef6308..2690e5572c6 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -254,7 +254,8 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + has_version '>=net-libs/libupnp-1.8.0' && \ + eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch # Bootstrap when we are on a git checkout. if [[ ${PV} = *9999 ]] ; then @@ -458,8 +459,8 @@ src_configure() { econf ${myeconfargs[@]} # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file + # Other values may break the build (bug 523144), so definition should not be removed. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h sed -i '1i#undef _FORTIFY_SOURCE' config.h || die } diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 000f28b2d09..20e11569243 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -254,7 +254,8 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch + has_version '>=net-libs/libupnp-1.8.0' && \ + eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch # Bootstrap when we are on a git checkout. if [[ ${PV} = *9999 ]] ; then @@ -458,8 +459,8 @@ src_configure() { econf ${myeconfargs[@]} # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file + # Other values may break the build (bug 523144), so definition should not be removed. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h sed -i '1i#undef _FORTIFY_SOURCE' config.h || die }