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 --- x11-misc/imwheel/Manifest | 3 +- .../imwheel-1.0.0_pre13_p20100827-autotools.patch | 32 ++++++++++++++++++++++ .../imwheel/imwheel-1.0.0_pre13_p20100827.ebuild | 18 ++++++------ 3 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 x11-misc/imwheel/files/imwheel-1.0.0_pre13_p20100827-autotools.patch (limited to 'x11-misc/imwheel') diff --git a/x11-misc/imwheel/Manifest b/x11-misc/imwheel/Manifest index a74de258c04c..d3be4ca3e401 100644 --- a/x11-misc/imwheel/Manifest +++ b/x11-misc/imwheel/Manifest @@ -1,3 +1,4 @@ +AUX imwheel-1.0.0_pre13_p20100827-autotools.patch 993 BLAKE2B a935fabbd39ec5cfb51bacf635f1c59d01775fde305a149c4e2899219de26305f19be6dcb05fed313a5c0acf062e28322c7b2bba85483fa939851e72f3d49123 SHA512 8c632ea2a0dbc7501a10ae0e62fd38cc777b5647d321a8cf5ab53f2d351779be8656b275242dcba7d70a639f06018ab1ffc0f1dd4baebe7014f5c34b88651e2a DIST imwheel-1.0.0_pre13_p20100827.tar.bz2 125776 BLAKE2B eda41d2d3ce7f057dd71fbbfb4304064134fe37068788182880fcfc6727c12f5748bac40f3115e8be0093c027373689b7375c58487fe8c5a97d0b1e9c297431e SHA512 3b5ae23a1762122f6fe86610da6ad65118e8e743a88f370d6f6cdd084b4aa5f08d3089fccf3fca3a69b06560d7c2d7cfecfde1375154af9f519c0d4fe996080c -EBUILD imwheel-1.0.0_pre13_p20100827.ebuild 689 BLAKE2B d534d2384f4db666e061aad547007effc41c35d8ff53194f6c8ff5aef0cc02be7259832b8ae4828c7a654081773cb99004f0326e94a23f7006792d83f5a750b6 SHA512 b5cddb76ec536eaed2eb74880169295ca7eb61b7660475372d233a0e9784de48abb6adf141efa74abe4e3b3d39ddee6a6ee5bb5feb866d303a116b19de4bfda3 +EBUILD imwheel-1.0.0_pre13_p20100827.ebuild 705 BLAKE2B 74785d7bc902743aa15b6fed21122f3af9e61588c7cd0bc94bc2078d61c7991691eef5d20ce982fd595c9c66b4947e66b256281f12bf9a4f608afd9b61139777 SHA512 895e0bbfade253f5b15baa68198e7828eb1a8bd6d482c6ff1d2f7ba0ce8904bb397b95a0bcf3106f92dee7ab88b4d203d5b13cad139f83280554ef3c28852250 MISC metadata.xml 353 BLAKE2B 4d6fa01905f2aa762571614af6aa45f09e2972d06af9e6d4b09b4be4844e4ad42fa1c9010995a53f1365ec53e7fa712dc385406b8b607e5ca07a2e174af7a48f SHA512 2cf1e0e8cf35f3aa5b0e543a694ab9869f28ed457dbd7294463bdbe96960cbd63709fc8557f7e1c8ef0d2c77e1a6ffebf4d39ed6a5e52a3683d8d6f336d76ef5 diff --git a/x11-misc/imwheel/files/imwheel-1.0.0_pre13_p20100827-autotools.patch b/x11-misc/imwheel/files/imwheel-1.0.0_pre13_p20100827-autotools.patch new file mode 100644 index 000000000000..e889f2a694ae --- /dev/null +++ b/x11-misc/imwheel/files/imwheel-1.0.0_pre13_p20100827-autotools.patch @@ -0,0 +1,32 @@ +--- a/configure.in ++++ b/configure.in +@@ -15,6 +15,7 @@ + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++AM_PROG_AR + AC_PROG_MAKE_SET + dnl AC_PREFIX_PROGRAM(bin/imwheel) + AM_CONFIG_HEADER(config.h) +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,7 @@ + find $(distdir) -name CVS -exec rm -rvf '{}' ';' ; \ + done + +-ETCDIR=/etc/X11/imwheel ++ETCDIR=$(DESTDIR)/etc/X11/imwheel + + install-exec-hook: + if SUID +@@ -31,8 +31,8 @@ + chmod u+s $$progname + endif + $(mkinstalldirs) $(ETCDIR) +- -[ -f /etc/imwheelrc ] && mv /etc/imwheelrc $(ETCDIR)/imwheelrc || true +- -[ -f /etc/X11/imwheelrc ] && mv /etc/X11/imwheelrc $(ETCDIR)/imwheelrc || true ++ -[ -f $(DESTDIR)/etc/imwheelrc ] && mv $(DESTDIR)/etc/imwheelrc $(ETCDIR)/imwheelrc || true ++ -[ -f $(DESTDIR)/etc/X11/imwheelrc ] && mv $(DESTDIR)/etc/X11/imwheelrc $(ETCDIR)/imwheelrc || true + -[ -f $(ETCDIR)/imwheelrc ] && install -m 644 imwheelrc $(ETCDIR)/imwheelrc.new || install -m 644 imwheelrc $(ETCDIR)/imwheelrc + + extras: $(EXTRA_PROGRAMS) diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild index 0898ec96384e..b2028583345f 100644 --- a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild +++ b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -12,21 +12,23 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ppc x86" -IUSE="" -RDEPEND="x11-libs/libXtst +RDEPEND=" + x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext" - DEPEND="${RDEPEND} - x11-base/xorg-proto - >=sys-apps/sed-4" + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${P}-autotools.patch # bug 726140 +) src_prepare() { default - sed -i -e "s:/etc:${D}/etc:g" Makefile.am || die + mv configure.{in,ac} || die eautoreconf } -- cgit v1.2.3