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/xrootconsole/Manifest | 4 ++-- x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch | 8 ++++---- x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild | 8 +++++--- 3 files changed, 11 insertions(+), 9 deletions(-) (limited to 'x11-misc/xrootconsole') diff --git a/x11-misc/xrootconsole/Manifest b/x11-misc/xrootconsole/Manifest index 7234b9e731fe..95705a523159 100644 --- a/x11-misc/xrootconsole/Manifest +++ b/x11-misc/xrootconsole/Manifest @@ -1,6 +1,6 @@ -AUX xrootconsole-0.6.makefile.patch 915 BLAKE2B a3c3972128397f2a0d3a96464b310329c6f92a8c241704c648b54b3bda5b44c93e44b0273678d0c8da0b9c9f7c1c0a1ff7bc79e4083a1810f37229afd1d761d6 SHA512 766577d406d0f0442910edd701456958d3d5a2dd3aea5324f9bf3901e2dbc0a7376ceeb39990248bc8a66342b1cdc5ce3805011c918dac84e7605ba022f73ef5 +AUX xrootconsole-0.6.makefile.patch 845 BLAKE2B 40017d83fcba9abe2d225f879e1394da05ed19dbea5ab7928d902171e0e50d83eedc3627b80631faeca2c52bd6a95d4e6d6c2c5f9751b2a5f297e8e27d0d0ef4 SHA512 3a2e32c4db4d3787f08ef714a25a26cd09981ee4e770c7fd32436120cb2edfa406046de09ad350260de78fc425ae144684c58bf83197257909939f5afabf2ebf AUX xrootconsole-0.6.manpage.patch 1038 BLAKE2B df8fdc45f1167ce4e8dd948bba549e88908552282ab1d9b41c0a3faeb465c047a7add98b9620a67e86b4646e148b2fa88541a6c1d67407eb651fd137c067b816 SHA512 88b8f68892646f3ca375ee0166336bb3972c5addbe1e515bdd9d7c4fc47517472051d59ac81fb0ec95a8852ab385e0544ec54fe0f9eefe39946dcbe1c222a33f AUX xrootconsole-0.6.noversion.patch 1780 BLAKE2B 203dca249d2dd8d6ac675cd617615ba551ab3bc6e14dfede9b133840bf9779be186b423f03a1ca04b262ac31593511d34c8a82c05b06cc1f6d68ed5390fa08c1 SHA512 d75228770d31deb969e1f05f99eb0df2839564d9f9db7d5cb9efb00737e1df5632e14c0d5071ef0a5ff57054e62e1c112bd27074b60ac47220ec50f02a170c45 DIST xrootconsole-0.6.tar.gz 15951 BLAKE2B b11035742c08d7f989b131a22e64338874fa609fe09852ada76779c7d850c9cc16a86baf29785fb86edb9fa9aad2d33fd90392f50e134c74dd1ab4765776a8e8 SHA512 9e773eac96f9bb0103880cce8a3bc24211c50b369c4c389bd020c774a4f643947b634ebc5e7b266b28f75f57887d8edc72d8d582e8535c7320f56292194ed7f9 -EBUILD xrootconsole-0.6-r1.ebuild 772 BLAKE2B 6281345cf7abc6250acab20f288b151c9e2dd4f756b08ad3674b91cdc4c26b50688629c4a60b9bab5c93f470d75ae87c2ec36856f4b465cbdd461dda88fa8306 SHA512 bd933e5811847cb90be5f1223674b468134ee961c890bd05b35b50aadbdbdeb7528f27a681df3318078f20fa5db5c08cc72b85c15ebf6dac74bf194cbc16d6f2 +EBUILD xrootconsole-0.6-r1.ebuild 800 BLAKE2B 059ada1faf3114995b8f417402f17a4a3c73f8af7072d2fa71fd4b25f83626df6f37e80721dc45822a90737eb8e821cf5d80746e52d17c67cb377b76660d45ef SHA512 401945e5727b23e424c8aadbb123817df192f354b956973c781f1602cb448c5489d3eb6a26efe52a818d14d2a00e848a88a943879c909cbf6ca3c6a2b98cbfdc MISC metadata.xml 358 BLAKE2B 8df043b8124f8b3f28ce0d015d7f4fccb026cab47d6d7ed940281932aecd7879196c740ea9e53b806e266a58eae5b280069ee210ca3ae9b4dac35f7e38af9b43 SHA512 9e5d37dff356a43145f02067c1e587bdd55bd02573cfab81205ffff49ccc3c32c0a969ecdf7a356eebbb91008291a06c4935295005d376af08c4a6669db74400 diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch b/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch index 4b3aee406733..e5efe6541e11 100644 --- a/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch +++ b/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch @@ -1,5 +1,5 @@ ---- a/Makefile.org 2004-02-20 22:53:28.000000000 +0100 -+++ b/Makefile 2010-02-08 12:01:11.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -43,20 +43,16 @@ else echo Bleeding Edge Version; \ fi;) @@ -12,7 +12,7 @@ - -I /usr/X11R6/include -LDFLAGS = -s +CFLAGS += -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \ -+ $(shell pkg-config --cflags x11) ++ $(shell ${PKG_CONFIG} --cflags x11) # for testing #CFLAGS = -g -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION) (debug build)\"" \ @@ -20,7 +20,7 @@ #LDFLAGS = -LIBS = -L/usr/X11R6/lib -lX11 -lutil -+LIBS = $(shell pkg-config --libs x11) -lutil ++LIBS = $(shell ${PKG_CONFIG} --libs x11) -lutil OBJS = main.o util.o diff --git a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild index 58f43f33c854..9eb3c8efffbc 100644 --- a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild +++ b/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,9 @@ RDEPEND=" DEPEND=" ${RDEPEND} - x11-base/xorg-proto" + x11-base/xorg-proto + virtual/pkgconfig +" PATCHES=( "${FILESDIR}/${P}.noversion.patch" @@ -29,7 +31,7 @@ PATCHES=( DOCS=( TODO NEWS CREDITS ) src_compile() { - tc-export CC + tc-export CC PKG_CONFIG emake } -- cgit v1.2.3