From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- media-sound/gom/Manifest | 3 +- .../gom/files/gom-0.29.103-fno-common.patch | 11 +++++++ media-sound/gom/gom-0.29.103-r1.ebuild | 34 +++++++++------------- 3 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 media-sound/gom/files/gom-0.29.103-fno-common.patch (limited to 'media-sound/gom') diff --git a/media-sound/gom/Manifest b/media-sound/gom/Manifest index da02cc93c450..4a34b77ce4e4 100644 --- a/media-sound/gom/Manifest +++ b/media-sound/gom/Manifest @@ -1,4 +1,5 @@ +AUX gom-0.29.103-fno-common.patch 278 BLAKE2B c62c575a621cf029aa3385df6b83046051ecddffba43da4f54ba7a9093d77c561faf0011d53561748b003e1eb6e3781e24c2f60b33f0892121066e2a0d2134aa SHA512 d74eed4a5ef72567144c9496894ccf640e5d0576e1ac03e39d565f26970826e2d706e3aab387e78e3c25753540448a516175ac771528c70e6aad5cb7bb8f4be0 AUX gom-0.29.103-tinfo.patch 632 BLAKE2B 29e8857c9e63b4d415c747bd80ef42d50fc3fe6c3aa20f3274a0ae1fddd37d0a67ed5256fca9d833c8ce86fe58c136fe5d6cd2d2d42e249bab2aff0738e11ec5 SHA512 b02dd7751d5614532b2409161c196e11fe34dd9c5c99c7734cc1d72afc0338093d221d38c2b02da237e1be75e815b22a0479b04125670aa4f1bac0580486e419 DIST gom-0.29.103.tar.gz 88269 BLAKE2B 2ec8f767276d61dc5e16c511e62de3fdecff82de686627327ab10bfbd4bd8eb7bc3ac8a44627a8d465a4a4f4e42ec4c4b0f9f1e2affd75d8916c6435764a6c94 SHA512 2b386aab0e1fad55e39dbd902ec50db5faac39268cd7e79c0e10d252e9633d777f43b861bcf079191e0d41a3414ccc05d70b8fddb4bff0bb54e72e0606eed28b -EBUILD gom-0.29.103-r1.ebuild 856 BLAKE2B 78bd8f7ff56e0023a047657eae8d66eec17f7cae0b405597e15ab529ff305c10ca257a4c51169a5a546fd5ff50c108df83a92864b3f01973458ac00508b805b9 SHA512 3b7b7f3ca2770a2b8c65a5ca5ef880f3410c75f8ff537d263a8a9af0bfa197258016e71adb6b30c597138098d1958aa99daf5e83ac6c55a5dcf85f148bdcd441 +EBUILD gom-0.29.103-r1.ebuild 706 BLAKE2B f51bd19696a38cb5e921d2214cd7ead33ab255f5e7e6dffe188256a7e5d2bceb4c236558daf5b20e2e8d21b936207ec71c3373670361eeb3ceac3d70341a548b SHA512 eacdb96d311a6d9ceb05aab52ebdf7cf199720f55dcd963187e8b6c4c5bd07cd7bbe2253b1735bfceec27dd057c4a631a3b47e44f95b849f0064c589a2393ecc MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/gom/files/gom-0.29.103-fno-common.patch b/media-sound/gom/files/gom-0.29.103-fno-common.patch new file mode 100644 index 000000000000..b1ee6a1930bf --- /dev/null +++ b/media-sound/gom/files/gom-0.29.103-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/gom_info.h ++++ b/src/gom_info.h +@@ -52,7 +52,7 @@ + enum gom_info_types {GOM_INFO_ERROR=-1, GOM_INFO_QUIET, GOM_INFO_NORMAL, GOM_INFO_VERBOSE, GOM_INFO_DEBUG}; + + /* shown errors count */ +-int gom_info_errors; ++extern int gom_info_errors; + + /* + * FUNCTION PROTOTYPES diff --git a/media-sound/gom/gom-0.29.103-r1.ebuild b/media-sound/gom/gom-0.29.103-r1.ebuild index b49d71e781ed..241883a1f654 100644 --- a/media-sound/gom/gom-0.29.103-r1.ebuild +++ b/media-sound/gom/gom-0.29.103-r1.ebuild @@ -1,45 +1,37 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools toolchain-funcs +inherit autotools DESCRIPTION="Console Mixer Program for OSS" HOMEPAGE="http://www.fh-worms.de/~inf222" SRC_URI="http://www.Fh-Worms.DE./~inf222/code/c/gom/released/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 ~ppc sparc x86" -IUSE="examples" -DEPEND=">=sys-libs/ncurses-5.2:0=" +RDEPEND="sys-libs/ncurses:0=" +DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-tinfo.patch" + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-fno-common.patch ) src_prepare() { default + rmdir examples/standard || die + mv configure.{in,ac} || die eautoreconf } -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS ChangeLog README - - if use examples; then - docinto examples - dodoc README - docinto examples/default - dodoc examples/default/* - docinto examples/two-mixers - dodoc examples/two-mixers/* - fi + default + + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples } -- cgit v1.2.3