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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED805158086 for ; Thu, 18 Nov 2021 07:48:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB9F6E08CD; Thu, 18 Nov 2021 07:48:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96E51E08CD for ; Thu, 18 Nov 2021 07:48:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5C1D342F40 for ; Thu, 18 Nov 2021 07:48:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8896E1EF for ; Thu, 18 Nov 2021 07:48:15 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1637221617.cc4b13f77d5860810ef74e47c09e70056a60c9f2.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/, x11-misc/xorg-cf-files/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xorg-cf-files/Manifest x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild X-VCS-Directories: x11-misc/xorg-cf-files/ x11-misc/xorg-cf-files/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: cc4b13f77d5860810ef74e47c09e70056a60c9f2 X-VCS-Branch: master Date: Thu, 18 Nov 2021 07:48:15 +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: 8b7bd16a-7842-4c4c-9be3-28cdc2e33614 X-Archives-Hash: b56d95a637d0445d0ff1974eff27c446 commit: cc4b13f77d5860810ef74e47c09e70056a60c9f2 Author: Matt Turner gentoo org> AuthorDate: Thu Nov 18 07:46:01 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Nov 18 07:46:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc4b13f7 x11-misc/xorg-cf-files: Drop old versions Signed-off-by: Matt Turner gentoo.org> x11-misc/xorg-cf-files/Manifest | 1 - .../files/xorg-cf-files-1.0.6-no-ar-l.patch | 20 -------- .../xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild | 57 ---------------------- x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild | 45 ----------------- 4 files changed, 123 deletions(-) diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest index c4bcd8556547..671593617e28 100644 --- a/x11-misc/xorg-cf-files/Manifest +++ b/x11-misc/xorg-cf-files/Manifest @@ -1,3 +1,2 @@ DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3 -DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531 SHA512 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch deleted file mode 100644 index 52e07f319544..000000000000 --- a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch +++ /dev/null @@ -1,20 +0,0 @@ -l argument was formerly ignored by binutils, but since 2.36 is used -for something other than what was intended here (tmp files location). -https://bugs.gentoo.org/782514 ---- a/Imake.tmpl -+++ b/Imake.tmpl -@@ -1083,3 +1083,3 @@ - #else --#define ArCmd ArCmdBase clq -+#define ArCmd ArCmdBase cq - #endif -@@ -1090,3 +1090,3 @@ - #else --#define ArAddCmd ArCmdBase rul -+#define ArAddCmd ArCmdBase ru - #endif -@@ -1097,3 +1097,3 @@ - #else --#define ArExtCmd ArCmdBase xl -+#define ArExtCmd ArCmdBase x - #endif diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild deleted file mode 100644 index 5ac95d9db225..000000000000 --- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Old Imake-related build files" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf" -SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2 - https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -BDEPEND=" - virtual/pkgconfig - app-arch/bzip2 -" -RDEPEND="" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-no-ar-l.patch - "${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch -) - -src_configure() { - local econfargs=( - --disable-selective-werror - ) - - econf "${econfargs[@]}" -} - -src_install() { - default - echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \ - "${ED}"/usr/$(get_libdir)/X11/config/host.def || die - sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \ - "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed" - sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \ - "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed" - sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \ - "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed" - sed -i -e "/# define Solaris64bitSubdir/d" \ - "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die - sed -i -e 's/-DNOSTDHDRS//g' \ - "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die - - sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" \ - "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed" - sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" \ - "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed" - sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" \ - "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed" -} diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild deleted file mode 100644 index 55cb574d3bae..000000000000 --- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Old Imake-related build files" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf" -SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2 - https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -BDEPEND=" - virtual/pkgconfig - app-arch/bzip2 -" - -PATCHES=( - "${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch -) - -src_install() { - default - echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \ - "${ED}"/usr/$(get_libdir)/X11/config/host.def || die - sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \ - "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed" - sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \ - "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed" - sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \ - "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed" - sed -i -e "/# define Solaris64bitSubdir/d" \ - "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die - sed -i -e 's/-DNOSTDHDRS//g' \ - "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die - - sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" \ - "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed" - sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" \ - "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed" - sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" \ - "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed" -}