commit: 62bf811e3a63501fc48e45534e5c1c54ff150c96 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Sep 18 09:40:16 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Sep 18 09:45:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62bf811e
xfce-base/exo: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> xfce-base/exo/Manifest | 1 - xfce-base/exo/exo-4.15.1.ebuild | 43 ---- xfce-base/exo/files/exo-4.15.1-parallel-make.patch | 219 --------------------- 3 files changed, 263 deletions(-) diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest index 8955709d541..38593801750 100644 --- a/xfce-base/exo/Manifest +++ b/xfce-base/exo/Manifest @@ -1,3 +1,2 @@ DIST exo-0.12.11.tar.bz2 1333227 BLAKE2B 4e95809c58b6db26ecdf524663c06df9cd70007726091e381a1f0dd58be52efee85ad9721c421c0df6438073bb9de97d56cd039f520e2f7c0f5722a1839ba167 SHA512 ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533 -DIST exo-4.15.1.tar.bz2 1049760 BLAKE2B 365a51a6be44b36290d1bbe7100bc4e9a164436b2111997c969bdcc2f46306c0532fa41bedc231c5640992910e44acc8d072f5c070fc8d56f02b561002985224 SHA512 46b60bfde133969a25e72a5a80644454b06543888e554e8473145486d1b1952c4e508f2303045f183c49b053969189f50316ce7d18a0be2c404daa691e26d276 DIST exo-4.15.2.tar.bz2 1010181 BLAKE2B 02b6cee68de61b1580e1676f7206f8f48f8c7c1a17050bf44e0ff922675ebd1a0eeceae2adc9f004e7e73a7e878af21867d7ca61c2fde9f10b2f80e917d1a318 SHA512 9b5838d2a69876164e5a89bd474428ace39bfb8f651bbe6c0873b52359893e40e156c862fb8a9f9ac3138ff2fa153e10085326e41045a41771e8961d3c0823f3 diff --git a/xfce-base/exo/exo-4.15.1.ebuild b/xfce-base/exo/exo-4.15.1.ebuild deleted file mode 100644 index 1f9eb2e523e..00000000000 --- a/xfce-base/exo/exo-4.15.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils - -DESCRIPTION="Extensions, widgets and framework library with session support for Xfce" -HOMEPAGE="https://www.xfce.org/projects/"; -SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"; - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" - -RDEPEND=">=dev-lang/perl-5.6 - >=dev-libs/glib-2.42 - dev-perl/URI - >=x11-libs/gtk+-3.22:3 - >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] - >=xfce-base/libxfce4util-4.12:=" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/exo-4.15.1-parallel-make.patch -) - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/xfce-base/exo/files/exo-4.15.1-parallel-make.patch b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch deleted file mode 100644 index 34bc669655c..00000000000 --- a/xfce-base/exo/files/exo-4.15.1-parallel-make.patch +++ /dev/null @@ -1,219 +0,0 @@ -From d3f3232eb53a052711029d2fafc36e23da971b35 Mon Sep 17 00:00:00 2001 -From: Romain Bouvier <skun...@alteroot.org> -Date: Fri, 29 May 2020 11:11:41 +0200 -Subject: [PATCH] exo-29: Fix race condition in make install - -- Since the exo drop of gtk2, HEADERS are declared twice, which can lead - to race conditions when using parallel make "make -j4 install" -- Simplify Makefile to only have one HEADERS section -- This fix #29 ---- - exo/Makefile.am | 24 ++++-------------------- - 1 file changed, 4 insertions(+), 20 deletions(-) - -diff --git a/exo/Makefile.am b/exo/Makefile.am -index fc8845d4..358ae9cb 100644 ---- a/exo/Makefile.am -+++ b/exo/Makefile.am -@@ -23,30 +23,14 @@ libexo_headers = \ - exo-tree-view.h \ - exo-utils.h - --libexo_built_public_sources = \ -- exo-enum-types.h -- --libexo_built_sources = \ -- $(libexo_built_public_sources) \ -+libexo_2_built_sources = \ -+ exo-enum-types.h \ - exo-alias.h \ - exo-aliasdef.c \ - exo-enum-types.c \ - exo-marshal.c \ - exo-marshal.h - --libexoincludedir = $(includedir)/exo-2/exo -- --libexoinclude_HEADERS = \ -- $(libexo_built_public_sources) \ -- $(libexo_headers) \ -- exo.h \ -- exo-config.h -- -- --## --## GTK+ 3 support library --## -- - libexo_2_includedir = $(includedir)/exo-2/exo - - lib_LTLIBRARIES = libexo-2.la -@@ -141,10 +125,10 @@ CLEANFILES = \ - DISTCLEANFILES = \ - stamp-exo-enum-types.h \ - stamp-exo-marshal.h \ -- $(libexo_built_sources) -+ $(libexo_2_built_sources) - - BUILT_SOURCES = \ -- $(libexo_built_sources) -+ $(libexo_2_built_sources) - - exo-alias.h: make-exo-alias.pl exo.symbols - $(AM_V_GEN) $(PERL) $(srcdir)/make-exo-alias.pl < $(srcdir)/exo.symbols > exo-alias.h --- -2.26.2 - -diff --git a/exo/Makefile.in b/exo/Makefile.in -index 56abe35..ee1be62 100644 ---- a/exo/Makefile.in -+++ b/exo/Makefile.in -@@ -98,7 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - DIST_COMMON = $(srcdir)/Makefile.am $(libexo_2_include_HEADERS) \ -- $(libexoinclude_HEADERS) $(am__DIST_COMMON) -+ $(am__DIST_COMMON) - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = exo-2.pc exo-config.h -@@ -131,8 +131,7 @@ am__uninstall_files_from_dir = { \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } - am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ -- "$(DESTDIR)$(libexo_2_includedir)" \ -- "$(DESTDIR)$(libexoincludedir)" -+ "$(DESTDIR)$(libexo_2_includedir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libexo_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -@@ -224,7 +223,7 @@ am__can_run_installinfo = \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac - DATA = $(pkgconfig_DATA) --HEADERS = $(libexo_2_include_HEADERS) $(libexoinclude_HEADERS) -+HEADERS = $(libexo_2_include_HEADERS) - am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) - # Read a list of newline-separated strings from the standard input, - # and print each of them once, without duplicates. Input order is -@@ -657,24 +656,14 @@ libexo_headers = \ - exo-tree-view.h \ - exo-utils.h - --libexo_built_public_sources = \ -- exo-enum-types.h -- --libexo_built_sources = \ -- $(libexo_built_public_sources) \ -+libexo_2_built_sources = \ -+ exo-enum-types.h \ - exo-alias.h \ - exo-aliasdef.c \ - exo-enum-types.c \ - exo-marshal.c \ - exo-marshal.h - --libexoincludedir = $(includedir)/exo-2/exo --libexoinclude_HEADERS = \ -- $(libexo_built_public_sources) \ -- $(libexo_headers) \ -- exo.h \ -- exo-config.h -- - libexo_2_includedir = $(includedir)/exo-2/exo - lib_LTLIBRARIES = libexo-2.la - libexo_2_include_HEADERS = \ -@@ -756,10 +745,10 @@ pkgconfig_DATA = exo-2.pc - @MAINTAINER_MODE_TRUE@DISTCLEANFILES = \ - @MAINTAINER_MODE_TRUE@ stamp-exo-enum-types.h \ - @MAINTAINER_MODE_TRUE@ stamp-exo-marshal.h \ --@MAINTAINER_MODE_TRUE@ $(libexo_built_sources) -+@MAINTAINER_MODE_TRUE@ $(libexo_2_built_sources) - - @MAINTAINER_MODE_TRUE@BUILT_SOURCES = \ --@MAINTAINER_MODE_TRUE@ $(libexo_built_sources) -+@MAINTAINER_MODE_TRUE@ $(libexo_2_built_sources) - - EXTRA_DIST = \ - abicheck.sh \ -@@ -1091,27 +1080,6 @@ uninstall-libexo_2_includeHEADERS: - @list='$(libexo_2_include_HEADERS)'; test -n "$(libexo_2_includedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(libexo_2_includedir)'; $(am__uninstall_files_from_dir) --install-libexoincludeHEADERS: $(libexoinclude_HEADERS) -- @$(NORMAL_INSTALL) -- @list='$(libexoinclude_HEADERS)'; test -n "$(libexoincludedir)" || list=; \ -- if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(libexoincludedir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(libexoincludedir)" || exit 1; \ -- fi; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -- done | $(am__base_list) | \ -- while read files; do \ -- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libexoincludedir)'"; \ -- $(INSTALL_HEADER) $$files "$(DESTDIR)$(libexoincludedir)" || exit $$?; \ -- done -- --uninstall-libexoincludeHEADERS: -- @$(NORMAL_UNINSTALL) -- @list='$(libexoinclude_HEADERS)'; test -n "$(libexoincludedir)" || list=; \ -- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(libexoincludedir)'; $(am__uninstall_files_from_dir) - - ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -@@ -1370,7 +1338,7 @@ check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - installdirs: -- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libexo_2_includedir)" "$(DESTDIR)$(libexoincludedir)"; do \ -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libexo_2_includedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: $(BUILT_SOURCES) -@@ -1452,8 +1420,7 @@ info: info-am - - info-am: - --install-data-am: install-libexo_2_includeHEADERS \ -- install-libexoincludeHEADERS install-pkgconfigDATA -+install-data-am: install-libexo_2_includeHEADERS install-pkgconfigDATA - - install-dvi: install-dvi-am - -@@ -1519,8 +1486,7 @@ ps: ps-am - ps-am: - - uninstall-am: uninstall-libLTLIBRARIES \ -- uninstall-libexo_2_includeHEADERS \ -- uninstall-libexoincludeHEADERS uninstall-pkgconfigDATA -+ uninstall-libexo_2_includeHEADERS uninstall-pkgconfigDATA - - .MAKE: all check check-am install install-am install-strip - -@@ -1533,15 +1499,14 @@ uninstall-am: uninstall-libLTLIBRARIES \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-libexo_2_includeHEADERS \ -- install-libexoincludeHEADERS install-man install-pdf \ -- install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am recheck tags tags-am uninstall \ -- uninstall-am uninstall-libLTLIBRARIES \ -- uninstall-libexo_2_includeHEADERS \ -- uninstall-libexoincludeHEADERS uninstall-pkgconfigDATA -+ install-man install-pdf install-pdf-am install-pkgconfigDATA \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ recheck tags tags-am uninstall uninstall-am \ -+ uninstall-libLTLIBRARIES uninstall-libexo_2_includeHEADERS \ -+ uninstall-pkgconfigDATA - - .PRECIOUS: Makefile -
