From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C434A1382C5 for ; Mon, 19 Apr 2021 20:54:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10C20E081E; Mon, 19 Apr 2021 20:54:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DCF47E081E for ; Mon, 19 Apr 2021 20:54:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09CEA340E4A for ; Mon, 19 Apr 2021 20:54:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E76E6BD for ; Mon, 19 Apr 2021 20:54:38 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1618865625.df85c2585c90886f55d7ae7ffdcfbf919fb561d3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xfe/, x11-misc/xfe/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xfe/Manifest x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch x11-misc/xfe/xfe-1.42.ebuild x11-misc/xfe/xfe-1.43.1.ebuild X-VCS-Directories: x11-misc/xfe/files/ x11-misc/xfe/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: df85c2585c90886f55d7ae7ffdcfbf919fb561d3 X-VCS-Branch: master Date: Mon, 19 Apr 2021 20:54:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eedcf7de-c3ca-48ab-97fa-1ba0be0cf1ac X-Archives-Hash: 549f54a88be88c1360cde1bdebf676ee commit: df85c2585c90886f55d7ae7ffdcfbf919fb561d3 Author: Sam James gentoo org> AuthorDate: Mon Apr 19 20:06:28 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Apr 19 20:53:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df85c258 x11-misc/xfe: drop 1.42, 1.43.1 Signed-off-by: Sam James gentoo.org> x11-misc/xfe/Manifest | 2 - ...e-1.42-use_pkgconfig_for_freetype_and_xft.patch | 57 ---------------- x11-misc/xfe/xfe-1.42.ebuild | 78 ---------------------- x11-misc/xfe/xfe-1.43.1.ebuild | 75 --------------------- 4 files changed, 212 deletions(-) diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest index a5ce6bfabb4..071ab3b972a 100644 --- a/x11-misc/xfe/Manifest +++ b/x11-misc/xfe/Manifest @@ -1,3 +1 @@ -DIST xfe-1.42.tar.gz 2727833 BLAKE2B fbca14c77b04cb367173907dd4ae9c210cd88768276e5b7391338b29dc988288f866419f57d1189db6235941e4e2f91608835351000a42d46ed3e7c4c236c69f SHA512 858dd761e45ff09d32d2a230304be0817eab4b6a772376b08d778bb8e1eef681228e5d88e53c441f9b8722d8b7eeae96980e30f8c5e8bb603d4d9a3b3d267351 -DIST xfe-1.43.1.tar.gz 2776237 BLAKE2B fc82e2ea21643ecc3875512538af24daddb0db0e8829ce23c7589dc90d68e896282f70d771dcf885ea746acfa88adbb7abe6a0c354e74afa5f722dcfacf77350 SHA512 3c697ff5d0246c8bab86c9824dd4a3475ed3775d2933c63eb8e78f02b4455edb4ca98f86123eac77f611eee6ad660bf0a909c4c2791af19506a4f1744395008e DIST xfe-1.43.2.tar.gz 2834576 BLAKE2B 5ac7ebf229febb75a99e4829a38a3675d6674ec6eced13dc5be70d2b68ce88f6394621dffec2d8359e72da7eace582883b72491e90597ab4a8925685cb577fcb SHA512 ad7b450d0828747f801219c23824b0751fc2a7f0eea791369c4adb3090ffe1279056fa8804ef97b25a2f810e00d37357efc962dc9d4087c3d7cc5f8ffb37d51d diff --git a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch deleted file mode 100644 index 615f7b01bbe..00000000000 --- a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -29,6 +29,7 @@ - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET -+PKG_PROG_PKG_CONFIG - - - # Internationalization -@@ -109,16 +110,13 @@ - - echo "checking whether FOX was compiled with Xft support... yes" - -- # Check for FreeType2 headers -- freetype_config='' -- AC_CHECK_PROGS(freetype_config,freetype-config,) -- if test -n "$freetype_config"; then -- freetype_cflags=`$freetype_config --cflags` -- freetype_libs=`$freetype_config --libs` -- LIBS="$LIBS $freetype_libs" -- CPPFLAGS="$freetype_cflags $CPPFLAGS" -- fi -- AC_CHECK_HEADER(config/ftheader.h,,[AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h not found"))]) -+ # Check for FreeType2 -+ PKG_CHECK_MODULES(FREETYPE, freetype2, [ -+ freetype_cflags="$FREETYPE_CFLAGS" -+ freetype_libs="$FREETYPE_LIBS" -+ LIBS="$LIBS $freetype_libs" -+ CPPFLAGS="$freetype_cflags $CPPFLAGS" -+ ], AC_MSG_ERROR("freetype not found")) - - # Check for Xft headers - xft_config='' -@@ -131,15 +129,13 @@ - CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H" - else - # On some systems (e.g. Fedora) xft-config is deprecated and pkg-config should be used instead -- pkg_config='' -- AC_CHECK_PROGS(pkg_config,pkg-config,) -- if test -n "$pkg_config"; then -- xft_cflags=`$pkg_config --cflags xft` -- xft_libs=`$pkg_config --libs xft` -- LIBS="$LIBS $xft_libs" -- CPPFLAGS="$xft_cflags $CPPFLAGS" -- CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H" -- fi -+ PKG_CHECK_MODULES(XFT, xft, [ -+ xft_cflags="$XFT_CFLAGS" -+ xft_libs="$XFT_LIBS" -+ LIBS="$LIBS $xft_libs" -+ CPPFLAGS="$xft_cflags $CPPFLAGS" -+ CXXFLAGS="$CXXFLAGS -DHAVE_XFT_H" -+ ], AC_MSG_ERROR("Xft not found")) - fi - AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found")) - diff --git a/x11-misc/xfe/xfe-1.42.ebuild b/x11-misc/xfe/xfe-1.42.ebuild deleted file mode 100644 index c2619c850cc..00000000000 --- a/x11-misc/xfe/xfe-1.42.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES=" - bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr - zh_CN zh_TW -" -inherit autotools eutils l10n - -DESCRIPTION="MS-Explorer-like minimalist file manager for X" -HOMEPAGE="http://roland65.free.fr/xfe" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug nls startup-notification" - -RDEPEND=" - media-libs/libpng:0 - x11-libs/fox:1.6[png,truetype] - x11-libs/libX11 - x11-libs/libXft - startup-notification? ( x11-libs/startup-notification ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - nls? ( - dev-util/intltool - sys-devel/gettext - ) -" - -DOCS=( AUTHORS BUGS ChangeLog README TODO ) - -PATCHES=( "${FILESDIR}/${PN}-1.42-use_pkgconfig_for_freetype_and_xft.patch" ) - -src_prepare() { - default - - cat >po/POTFILES.skip <<-EOF - src/icons.cpp - xfe.desktop.in.in - xfi.desktop.in.in - xfp.desktop.in.in - xfv.desktop.in.in - xfw.desktop.in.in - EOF - - # malformed LINGUAS file - # recent intltool expects newline for every linguas - sed -i \ - -e '/^#/!s:\s\s*:\n:g' \ - po/LINGUAS || die - - # remove not selected locales - rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;} - l10n_for_each_disabled_locale_do rm_locale - - sed -i \ - -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable debug) - $(use_enable nls) - $(use_enable startup-notification sn) - --enable-minimalflags - ) - econf "${myeconfargs[@]}" -} diff --git a/x11-misc/xfe/xfe-1.43.1.ebuild b/x11-misc/xfe/xfe-1.43.1.ebuild deleted file mode 100644 index 0a9e382f69b..00000000000 --- a/x11-misc/xfe/xfe-1.43.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PLOCALES=" - bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr - zh_CN zh_TW -" -inherit l10n xdg-utils - -DESCRIPTION="MS-Explorer-like minimalist file manager for X" -HOMEPAGE="http://roland65.free.fr/xfe" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug nls startup-notification" - -RDEPEND=" - media-libs/libpng:0 - x11-libs/fox:1.6[png,truetype] - x11-libs/libX11 - x11-libs/libXft - startup-notification? ( x11-libs/startup-notification ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - nls? ( - dev-util/intltool - sys-devel/gettext - ) -" - -DOCS=( AUTHORS BUGS ChangeLog README TODO ) - -src_prepare() { - default - - cat >po/POTFILES.skip <<-EOF - src/icons.cpp - xfe.desktop.in.in - xfi.desktop.in.in - xfp.desktop.in.in - xfv.desktop.in.in - xfw.desktop.in.in - EOF - - # malformed LINGUAS file - # recent intltool expects newline for every linguas - sed -i \ - -e '/^#/!s:\s\s*:\n:g' \ - po/LINGUAS || die - - # remove not selected locales - rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;} - l10n_for_each_disabled_locale_do rm_locale -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable nls) \ - $(use_enable startup-notification sn) \ - --enable-minimalflags -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -}