From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- x11-misc/lineakd/Manifest | 6 +- .../lineakd-0.9.0-automake-linking-libdl.patch | 58 +++++++++++++++++++ x11-misc/lineakd/lineakd-0.9.0-r3.ebuild | 2 +- x11-misc/lineakd/lineakd-0.9.0-r4.ebuild | 65 ++++++++++++++++++++++ x11-misc/lineakd/metadata.xml | 5 +- 5 files changed, 129 insertions(+), 7 deletions(-) create mode 100644 x11-misc/lineakd/files/lineakd-0.9.0-automake-linking-libdl.patch create mode 100644 x11-misc/lineakd/lineakd-0.9.0-r4.ebuild (limited to 'x11-misc/lineakd') diff --git a/x11-misc/lineakd/Manifest b/x11-misc/lineakd/Manifest index 8031cfe72213..a2bda19659cf 100644 --- a/x11-misc/lineakd/Manifest +++ b/x11-misc/lineakd/Manifest @@ -1,5 +1,7 @@ AUX lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch 795 BLAKE2B ebf8e451208c38cd77ba39c3241ef3f9957946c6e1b7c91e29a1cfb346721a2b59d8e2b87e58dd52bde6fe4c6d3fbc70d8c5b02d62bb96f6d82c64f11aac3e5b SHA512 d38a7bc6ddb05eda357ffd487a494302cb08746389e65a7f7b30aaa3ebbbf5206f60cb59b07a6cea285976604b91328a002e893ef0833dfc67e9639b260da0ee +AUX lineakd-0.9.0-automake-linking-libdl.patch 2528 BLAKE2B 22066b410bb0df5a6f85baeb8be71cdeacf19358e79b46a88e7a52ba058235fc5460878fb4ac8e7ec949f20b1c2d3b02cc165d27f03369f77bcd1b866c4d1175 SHA512 9046e65d050f6b97e2b6a2e26f043ed2e628867e3f65536cdf2369cf9bc36124239e2467cabbfdc5a72fb9d775eeedf70144d596fe893bee04a18211d02bd8cb AUX lineakd-0.9.0-gcc43.patch 772 BLAKE2B 48346e5d1a3978be0964dd6844991c58da30a036fdb12bec9b1970c3aac9d130f81891e69ed59ef772ca4b6dbfbd71effdc2556b800f6008505322c8aaa67c91 SHA512 0ade361637b26db613c5a3915d8b364cf14eda14eb744618c03440ead5f0774f853dba7c0518432ae4f872e201d5bb0503fa7e4b5eadd71d049adf5b654c8407 DIST lineakd-0.9.tar.gz 991376 BLAKE2B 70c19d446b814562a4d9efa90b4492cc5a3fa63c8d252e6e2bcd418c1fee177924e61ec7ebfb0471fdd18eee5f7f3e4ed0fda17bff5b216cad9caffd06d68783 SHA512 e30a2e111832e3f08bbff858647536aaeb75d20008618b8c7555836104fd5a66d8e3173d0f9da76906caf13e9c9753c9140cd22dbb96fde464ed5d5f254d721e -EBUILD lineakd-0.9.0-r3.ebuild 1165 BLAKE2B 1cc57465ad3a65a99f3ecb543eddf186b31c58bd9d7a054e9544b370b46396ddd407410046756a3625c5ed38d4a46dab2400f3cddea4476d161bebc60bed6c4a SHA512 38c1e4a18b73ebcf39cbbc939e057ea1d6227d7499044445269a35d87ea4b488941c50cc5029e226d9f938fbbe9f836bd757fdcf63c2c10752aa588f7669e2c4 -MISC metadata.xml 353 BLAKE2B 4c6428635ab148daa40eff21b99f78e85df0aecf939b39fbaff66ad38979a72881e6afe1a3dc3bd9964b86eb730e4e3d203cbfb3ca23520a24d27ac9ef9fa8ed SHA512 0a06f6b9efa92629b348d297d2517896ea79f0cfd1d550eb10a45a1e839308e371375eb85877cfcb4118d3777703771261df6ae7442cfef723c417272a6619c2 +EBUILD lineakd-0.9.0-r3.ebuild 1165 BLAKE2B 89fa3e619a9cd8e6ad3990f398b657e93b4a04c56af109487c344adc1e2cb8af04f485322fafed4fc3e72eb32f08740ff6b9beae58a6bb8bf175bd9277709dda SHA512 40957e01586bc8af528a0d9d73ed3bcc750672459f88c7c2d5797204bdecb82896c45cbcf6a486841e2753e236f4c858f2a2b60b0ba00161c8c98f822b51c420 +EBUILD lineakd-0.9.0-r4.ebuild 1417 BLAKE2B 50ece72139d677b899f7a12a940ad2cf020d437ed9cb87e1f6d3a81e648ea35bfecc28f11c2ab1376b59a4c9ce664459a6ab34164cd4b7c15dfd21165a3bd556 SHA512 9a6005f8c49f07165f681732e37c83f4bace088a03d5546c013808dc3b5b9bbaf4b033accc3b774940e18fbc2c61f2bf62971d83be37e89c7b7b77d54332b022 +MISC metadata.xml 243 BLAKE2B 9c79a08b6e5bc0bb60d2eac0233329c82aa0ca321be75f43d04b502a33c6fde02d70a291718e6bf1cbcc6406cc551bdcbd0828ab3c766a98a24dcff3ccc930ba SHA512 76cda410a67395f007758e0d6789494e21482becd036d73784f07f70cae68df6abcdbae335dcb79598fc5df18d06e77589e814d2c857b50f17f2a7bbd3aa9302 diff --git a/x11-misc/lineakd/files/lineakd-0.9.0-automake-linking-libdl.patch b/x11-misc/lineakd/files/lineakd-0.9.0-automake-linking-libdl.patch new file mode 100644 index 000000000000..a3587e42426f --- /dev/null +++ b/x11-misc/lineakd/files/lineakd-0.9.0-automake-linking-libdl.patch @@ -0,0 +1,58 @@ +* configure.in change from Debian to fix autoreconf: https://sources.debian.org/src/lineakd/1%253A0.9-6/debian/patches/005_configure_in.diff/#L19 +* Rest is to fix libdl linkage (and general LDFLAGS issues): https://bugs.gentoo.org/722372 +--- a/configure.in ++++ b/configure.in +@@ -28,10 +28,12 @@ + + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(acinclude.m4) dnl a source file from your sub dir +- ++AC_INIT + dnl This is so we can use kde-common + AC_CONFIG_AUX_DIR(admin) ++AC_CONFIG_MACRO_DIR([m4]) ++ ++LT_INIT + + dnl This ksh/zsh feature conflicts with `cd blah ; pwd` + unset CDPATH + +--- a/configure.in ++++ b/configure.in +@@ -81,7 +81,7 @@ KDE_PROG_LIBTOOL + + dnl activate the next macro call for DLOPEN tests and setting LIBDL + dnl (n.b. KDE_MISC_TESTS does the same to you, so use either this or the next one) +-dnl KDE_CHECK_DLOPEN ++KDE_CHECK_DLOPEN + + dnl activate the next macro call for some additional tests + dnl (compat, crypt, socket, nsl, dlopen, ...) + +--- a/lineak/Makefile.am ++++ b/lineak/Makefile.am +@@ -19,8 +19,8 @@ liblineak_la_SOURCES = pluginmanager.cpp globals.cpp displayctrl.cpp xmgr.cpp cd + # liblineak_la_LDFLAGS = -version-info 8:0:8 $(all_libraries); \ + #fi; + +-liblineak_la_LIBADD = -lX11 -lXext $(X_LIBS) -lXt -lSM -lICE -L/usr/X11R6/lib +-liblineak_la_LDFLAGS = -version-info 8:0:8 $(all_libraries) -L/usr/X11R6/lib @X_LIBS@ @X_PRE_LIBS@ -lpthread ++liblineak_la_LIBADD = -lX11 -lXext $(X_LIBS) -lXt -lSM -lICE -L/usr/X11R6/lib $(all_libraries) @X_LIBS@ @X_PRE_LIBS@ $(PTHREAD_LIBS) @LIBDL@ ++liblineak_la_LDFLAGS = -version-info 8:0:8 + + lineak_HEADERS = configdirectives.h configloader.h definitions.h defloader.h lconfig.h lconfigdata.h ldef.h lobject.h lkbd.h lkey.h lbutton.h loader.h msgpasser.h saver.h lcommand.h lockctrl.h lineak_util_functions.h lineak_core_functions.h cdromctrl.h xmgr.h displayctrl.h plugin_definitions.h commandexec.h pluginmanager.h + +--- a/lineakd/Makefile.am ++++ b/lineakd/Makefile.am +@@ -1,8 +1,8 @@ + bin_PROGRAMS = lineakd + + lineakd_SOURCES = lineakd_core_functions.cpp cmdprefs.cpp main.cpp +-lineakd_LDADD = -lpthread -llineak -lXext -lX11 -ldl +-lineakd_LDFLAGS = -rdynamic -L../lineak $(all_libraries) @X_LIBS@ @X_PRE_LIBS@ ++lineakd_LDADD = -llineak -lXext -lX11 $(PTHREAD_LIBS) @LIBDL@ $(all_libraries) @X_LIBS@ @X_PRE_LIBS@ ++lineakd_LDFLAGS = -rdynamic -L../lineak + + EXTRA_DIST = main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def lineakd.1.bz2 OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp + diff --git a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild index 00a75e407fb0..8b2026bc430b 100644 --- a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild +++ b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild new file mode 100644 index 000000000000..8f2fca9f6c7c --- /dev/null +++ b/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_P=${P/.0/} +DESCRIPTION="Linux support for Easy Access and Internet Keyboards" +HOMEPAGE="http://lineak.sourceforge.net" +SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="debug" + +RDEPEND="x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/libxkbfile + x11-libs/libXt + x11-libs/libXtst" + +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-DELL-XPS-M1330-XOrg-1_5.patch + "${FILESDIR}"/${P}-automake-linking-libdl.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # admin/lineakd.m4.in contains Bashisms but fixes it causes a confusing + # autotools avalanche, so workaround it with CONFIG_SHELL as bash. + CONFIG_SHELL="${BROOT}/bin/bash" econf \ + $(use_enable debug) \ + --with-x +} + +src_install() { + sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' lineakd/Makefile || die + + dodir /usr/share/man/man8 + + emake -j1 DESTDIR="${D}" install + + dodoc AUTHORS README TODO + + keepdir /usr/$(get_libdir)/lineakd/plugins + + insinto /etc/lineak + doins lineakd.conf.example lineakd.conf.kde.example + + find "${ED}"/usr/share/man -name '*.bz2' -exec bunzip2 {} \; || die + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-misc/lineakd/metadata.xml b/x11-misc/lineakd/metadata.xml index 70081a0cac61..c2ee77af29e1 100644 --- a/x11-misc/lineakd/metadata.xml +++ b/x11-misc/lineakd/metadata.xml @@ -1,10 +1,7 @@ - - desktop-misc@gentoo.org - Gentoo Desktop Miscellaneous Project - + lineak -- cgit v1.2.3