From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- x11-misc/gbase/Manifest | 4 ++-- x11-misc/gbase/files/gbase-0.5-gtk.patch | 9 ++++----- x11-misc/gbase/gbase-0.5-r1.ebuild | 9 +++++---- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'x11-misc/gbase') diff --git a/x11-misc/gbase/Manifest b/x11-misc/gbase/Manifest index f0eb69abe515..af76aff1d5ed 100644 --- a/x11-misc/gbase/Manifest +++ b/x11-misc/gbase/Manifest @@ -1,4 +1,4 @@ -AUX gbase-0.5-gtk.patch 645 BLAKE2B 0b94d00e89f692a06c7d8195abea18da71b026d6f3eb7eb0b225b5256397b5e6afb2969e7f2318bd2ee20e237931190b6fb512f48117fc9d4dc9f0a16d98e586 SHA512 9fc205cbd7f572568fe46f6c236e17f5bdd5b24497a3b8aac82a8969fe1e10c9f19750ca2d292855e59016215de8bc4bbe061ad461e1e9bac10c981d75e22623 +AUX gbase-0.5-gtk.patch 506 BLAKE2B 882ca6e7bdecf7003c5d1aea091d569ffe5e1d7bf0e20de8e448baf780dfbcf4fad6fc6dd63e070fabd3acef5a1947ca349a609fb7181f22a415e0aeefe7e2a8 SHA512 b10aa59b6a5b3a58145cae9d7483eb5c3c468c89ba602fe1cc6621250145a6a722ff362bdc552489a9dcf6abd8ec4e773e63422274505cf0112fec6938b0dc56 DIST gbase-0.5.tar.gz 6427 BLAKE2B 0bd534b5435b93c986456db9fcace10536ab9742d1ff35fc38fe3834f81e60694006914db96511515febb76a8093774f412a40c32f626a4a86f947c5d792a0c8 SHA512 2c873317f192c0886d131ac32ef38d6371880a50ca5296ee290232dcb1ad985f90dce9678178e23e4be0d4f962f9f1a3ab2ab870810b645186f309be912abb3c -EBUILD gbase-0.5-r1.ebuild 587 BLAKE2B ac243dfda46734b00679b6adcd30e1e3c38652ef186ed90d5163e031b6cf7a7850b80ff105f2d90426ad93cd54020d721aa5c6095cf774202e12cf94b0a07ac5 SHA512 8796cf73551f675b9b5651d49eca685f367aec575c60f0918f858b430f485ad0f2bfdcbd5595dfa23347dfc7a351c2271d41efe657e433a68526db94ef3d108e +EBUILD gbase-0.5-r1.ebuild 589 BLAKE2B 87bd3900129f7133640ae34bb6b4bff31a1340dc3b126d662cfd767ab0dc292e85ea28ad6e2c9d983f80294db8a6615aeb515b8209fc3ed625cb2fe9f3500b02 SHA512 1158b782e4f32591d1ff7c0425208146485ff194beb3a333cd87b02c6f00c4fd28f611848d40f5ae041c42bba489d5c6fd283a10111d8f92b8a1a8aa313753dc MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab diff --git a/x11-misc/gbase/files/gbase-0.5-gtk.patch b/x11-misc/gbase/files/gbase-0.5-gtk.patch index 38936e79738c..4763839624af 100644 --- a/x11-misc/gbase/files/gbase-0.5-gtk.patch +++ b/x11-misc/gbase/files/gbase-0.5-gtk.patch @@ -1,13 +1,12 @@ -diff -ur gbase-0.5.orig/Makefile gbase-0.5/Makefile ---- gbase-0.5.orig/Makefile 1999-10-28 00:23:51.000000000 +0300 -+++ gbase-0.5/Makefile 2008-01-16 14:24:55.000000000 +0200 +--- a/Makefile ++++ b/Makefile @@ -1,15 +1,15 @@ -CC = gcc -CCFLAGS = `gtk-config --cflags` -LDFLAGS = `gtk-config --libs` +CC ?= gcc -+CFLAGS += `pkg-config --cflags gtk+-2.0` -+LIBS = `pkg-config --libs gtk+-2.0` ++CFLAGS += `${PKG_CONFIG} --cflags gtk+-2.0` ++LIBS = `${PKG_CONFIG} --libs gtk+-2.0` gbase: gbase.o - $(CC) gbase.o $(LDFLAGS) -o gbase diff --git a/x11-misc/gbase/gbase-0.5-r1.ebuild b/x11-misc/gbase/gbase-0.5-r1.ebuild index 2a57e0d299c5..e40430eebba8 100644 --- a/x11-misc/gbase/gbase-0.5-r1.ebuild +++ b/x11-misc/gbase/gbase-0.5-r1.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit toolchain-funcs -DESCRIPTION="a convert program for decimal, hexadecimal, octal and binary values" +DESCRIPTION="A convert program for decimal, hexadecimal, octal and binary values" HOMEPAGE="http://www.fluxcode.net" SRC_URI="http://www.fluxcode.net/files/${P}.tar.gz" LICENSE="Artistic" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" + RESTRICT="test" #424671 RDEPEND="x11-libs/gtk+:2" @@ -21,7 +22,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-gtk.patch ) src_compile() { - tc-export CC + tc-export CC PKG_CONFIG default } -- cgit v1.2.3