diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 10:47:13 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 10:47:13 +0100 |
| commit | 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec (patch) | |
| tree | 401ffbc2ade49ce18f6182969ec5fb697a57ce48 /x11-themes/fvwm-themes | |
| parent | d4bd6695641f6d2ec7ff8681913d304e995902f5 (diff) | |
gentoo resync : 02.06.2018
Diffstat (limited to 'x11-themes/fvwm-themes')
4 files changed, 17 insertions, 19 deletions
diff --git a/x11-themes/fvwm-themes/Manifest b/x11-themes/fvwm-themes/Manifest index e1fa267122cc..b355d621d641 100644 --- a/x11-themes/fvwm-themes/Manifest +++ b/x11-themes/fvwm-themes/Manifest @@ -1,5 +1,5 @@ -AUX fvwm-themes-0.7.0-gentoo.patch 903 BLAKE2B 86b9bef6b4dc1301e0428446e199ba467bc614336f689944b08eb7063bc748fb9a2357ef68e769aa8b1c170e6f82ea8a9df0c6dfb7c080f957f550e1c497018b SHA512 7483e79ee155c30d6fe35bb932005002d4866d0443a65138f05d41116d02f0e54decbacf6927a25b648b5fa5b90a056dff7326ad4962e0036fcee1f396239316 -AUX fvwm-themes-0.7.0-posix-sort.patch 388 BLAKE2B 24a87a4b9c6acf0e7940673baa905bd3e3d9fc238f9fbc69e6fd5bfcb2d93413b2007f70bc24ee30fa22c48d35d63473ba0c28574394820e46509c1a27c0f2b3 SHA512 ad2533581bc90b1cd54d1235f6b4f703d93f0ce7d703e1caefcd9c93d598db5bc2b722d5bbe856e2a381e0d0c43cecd0f491b8865342915c173048eb9f50724a +AUX fvwm-themes-0.7.0-gentoo.patch 906 BLAKE2B e4da518c0c0e9f2a3cf757b26c2cb1013a78cb7b6e81c0d9085cac1c68bf23c4ba4361d92b9cc5835a41a5501e330428ae6b5bc0d5689bbb28a8da6a0806f24a SHA512 cfd9281e4706962425f229cf596cd3cd898e501d2503e5e688e75541438db21f3febe54225a20df246d06d78d602ff3dfbf173e0c89a858d033247656a9af459 +AUX fvwm-themes-0.7.0-posix-sort.patch 356 BLAKE2B 42f0cccef7f54e57716d16fecd8ce195fb4b50029764778409c5e66fdd8829040fde705d637970fb423a00b958a5cd6e67891895516147b24d6a3a24a43e4ccd SHA512 e74a9aadc925c752cdc863312451d4a539f493e20a858d5cf163e518cbd068f7f6eb266dc8b42e21ff1b2e5dd156e86012b66856ad79a585a3e8182eb7db951b DIST fvwm-themes-0.7.0.tar.bz2 921517 BLAKE2B e8011b0677bd0a7bcc4f5141bc0ec17cab20f49fc2bf7932760b8a12d3ddc0a4a3324124eef02152508be40ebae20be58f485e223ce9622beaacf2c50cf8fea2 SHA512 38b14412bf3b9b59f8a001b628c384687daa8c26c8aaff258a0fcedde7fd8c5bb3fbd7cfb083dfa46b7ff1ae2ace652727a1faf96815bc5074d8134cd073e608 -EBUILD fvwm-themes-0.7.0-r1.ebuild 929 BLAKE2B 4d70df2b8f1bc1a666b9fdfb9f3eefa52acb1d1cef77e0c743e1cd3db5bd304730d0ffd59e5fd54e87170995426bd0ca02f3ab70e2897cef3495d4608d36e285 SHA512 72ec3621bf65c8b8c1f164cbaddc664ebf58aa116353d27d06101d6ee1b70c264b50da1452ec2f2d5d2fe1c99d194f8d8805bd8030abb8482c79c6e8d8f2bdf6 +EBUILD fvwm-themes-0.7.0-r1.ebuild 897 BLAKE2B 6753a7509551631d24d9488b1ef58d6126a04bbe2de98bbbe643b801f70d29279995a91d3379cda804e502f80d133c0f6e1e28ba1b0ccf1b861367a66020a2bb SHA512 0150443a7fe75bbd34b5aa85f44179f89d5e6e6487a46a48ff4270b48b9672c2cf49594a86deb04326fa2f8b4aff55dc41139e425b5b831ff9647d90f8be496a MISC metadata.xml 248 BLAKE2B 5ce55719058fa002cbd91598fa614f4bd37b06a8f2811bb1aa73484ce44a164279c64703da65bef6966d812cb9795e7947ea031ba7b05798602a6c8ed37b8d02 SHA512 ac85c9bab16790db6371569488edd94a96a8a25e74e8ec641e201a73fec9ed8845a748e6c349876c60fd9fc704e20a5dc3085d775f02c17fb013ac0885c15914 diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch index 5fdf7e5f3bb3..bb377f86f296 100644 --- a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch +++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch @@ -1,5 +1,5 @@ ---- Makefile.am~ 2002-12-06 03:01:37.000000000 +0100 -+++ Makefile.am 2003-04-15 20:14:34.000000000 +0200 +--- a/Makefile.am 2002-12-06 03:01:37.000000000 +0100 ++++ b/Makefile.am 2003-04-15 20:14:34.000000000 +0200 @@ -32,24 +32,7 @@ $(DESTDIR)$(SETTINGS_FILE) > $(DESTDIR)$(SETTINGS_FILE).tmp && \ mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE) diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch index 3974f95c5c51..a68ea6303c8b 100644 --- a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch +++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch @@ -1,5 +1,5 @@ ---- fvwm-themes-0.7.0/configure.in -+++ fvwm-themes-0.7.0/configure.in +--- a/configure.in ++++ b/configure.in @@ -195,7 +195,7 @@ # Hopefully this "sort" is portable (after many tries using awk and expr) diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild index 8ed5ccc37dce..45ae2d79b317 100644 --- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild +++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit autotools eutils +EAPI=6 +inherit autotools DESCRIPTION="A configuration framework for the fvwm window manager" HOMEPAGE="http://fvwm-themes.sourceforge.net/" @@ -17,11 +17,14 @@ RDEPEND=">=x11-wm/fvwm-2.6.2" DEPEND="${RDEPEND} gnome? ( virtual/imagemagick-tools )" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-posix-sort.patch +PATCHES=( + "${FILESDIR}/${P}-gentoo.patch" + "${FILESDIR}/${P}-posix-sort.patch" +) +src_prepare() { + default + mv configure.in configure.ac || die "moving configure.in failed" eautoreconf } @@ -29,11 +32,6 @@ src_configure() { econf $(use_enable gnome gnome-icons) } -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README TODO -} - pkg_postinst() { fvwm-themes-config --site --reset fvwm-themes-menuapp --site --build-menus --remove-popup |