commit: 9cd7a7aac24b3569e72ac5f5a21591d90e0592ee Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 22 17:43:42 2023 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Dec 22 17:47:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd7a7aa
app-misc/realpath: treeclean Closes: https://bugs.gentoo.org/908406 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> app-misc/realpath/Manifest | 2 - .../realpath/files/realpath-1.14-no-po4a.patch | 12 --- app-misc/realpath/files/realpath-1.15-prefix.patch | 37 ---------- app-misc/realpath/files/realpath-1.16-nonls.patch | 24 ------ app-misc/realpath/files/realpath-1.17-build.patch | 43 ----------- app-misc/realpath/metadata.xml | 12 --- app-misc/realpath/realpath-1.18.ebuild | 85 ---------------------- profiles/package.mask | 5 -- 8 files changed, 220 deletions(-) diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest deleted file mode 100644 index 1c60942c3fc0..000000000000 --- a/app-misc/realpath/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed -DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37 diff --git a/app-misc/realpath/files/realpath-1.14-no-po4a.patch b/app-misc/realpath/files/realpath-1.14-no-po4a.patch deleted file mode 100644 index 44e13286bfac..000000000000 --- a/app-misc/realpath/files/realpath-1.14-no-po4a.patch +++ /dev/null @@ -1,12 +0,0 @@ -Don't require po4a at build time. -http://bugs.gentoo.org/269905 - ---- a/po/Makefile -+++ b/po/Makefile -@@ -4,5 +4,5 @@ - # - - ALL_TARGET= --SUBDIRS=bin man -+SUBDIRS=bin - include ../common.mk diff --git a/app-misc/realpath/files/realpath-1.15-prefix.patch b/app-misc/realpath/files/realpath-1.15-prefix.patch deleted file mode 100644 index 3e0837a8bf38..000000000000 --- a/app-misc/realpath/files/realpath-1.15-prefix.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/common.mk -+++ b/common.mk -@@ -8,17 +8,19 @@ override TOPDIR := $(dir $(call getCurrentMakefileName)) - - override PACKAGE := realpath - --PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH) -+#PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH) -+ -+SHELL := @GENTOO_PORTAGE_EPREFIX@/bin/bash - - # build abstraction --install_file := install -p -o root -g root -m 644 --install_script := install -p -o root -g root -m 755 --install_dir := install -d -o root -g root -m 755 -+install_file := install -p -m 644 -+install_script := install -p -m 755 -+install_dir := install -d -m 755 - install_link := ln -sf - compress := gzip -9f - --prefix := /usr --etcdir := /etc/$(PACKAGE) -+prefix := @GENTOO_PORTAGE_EPREFIX@/usr -+etcdir := @GENTOO_PORTAGE_EPREFIX@/etc/$(PACKAGE) - bindir := $(prefix)/bin - sbindir := $(prefix)/sbin - mandir := $(prefix)/share/man -@@ -33,7 +35,7 @@ webdocrootdir := /var/www - webcgidir := $(prefix)/lib/cgi-bin - applicationsdir := $(prefix)/share/applications - --PERL := /usr/bin/perl -+PERL := @GENTOO_PORTAGE_EPREFIX@/usr/bin/perl - CC ?= gcc - CFLAGS += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' - LDFLAGS += diff --git a/app-misc/realpath/files/realpath-1.16-nonls.patch b/app-misc/realpath/files/realpath-1.16-nonls.patch deleted file mode 100644 index c1963ae46014..000000000000 --- a/app-misc/realpath/files/realpath-1.16-nonls.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/realpath.c -+++ b/src/realpath.c -@@ -23,10 +23,9 @@ - #include <errno.h> - #include <getopt.h> - #include <stdarg.h> --#include <libintl.h> - #include <locale.h> - --#define _(String) gettext (String) -+#define _(String) (String) - - static char *stripdir(char * dir, char *buf, int maxlen); - -@@ -116,9 +115,6 @@ int main(int argc, char **argv) { - - myname = ( p = strchr(argv[0], '/') ) ? p+1 : argv[0]; - -- setlocale(LC_ALL, ""); -- bindtextdomain(PACKAGE, LOCALEDIR); -- textdomain(PACKAGE); - - - parse_options(argc, argv); diff --git a/app-misc/realpath/files/realpath-1.17-build.patch b/app-misc/realpath/files/realpath-1.17-build.patch deleted file mode 100644 index c4a8b3dfc9b9..000000000000 --- a/app-misc/realpath/files/realpath-1.17-build.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/common.mk -+++ b/common.mk -@@ -33,16 +33,9 @@ - applicationsdir := $(prefix)/share/applications - - PERL := /usr/bin/perl --CC := gcc --CFLAGS += $(CPPFLAGS) -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Werror -g -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' --LIBS := -- --ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -- CFLAGS += -O0 --else -- CFLAGS += -O2 --endif -- -+CC ?= gcc -+CFLAGS += $(CPPFLAGS) -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' -+LIBS += - - # determine our version number - ifndef VERSION -@@ -58,9 +51,6 @@ - unexport CDPATH ENV - - ifdef DESTDIR -- ifneq ($(DESTDIR),$(abspath $(DESTDIR))) -- $(error DESTDIR "$(DESTDIR)" is not an absolute path) -- endif - override ddirshort := DESTDIR - export ddirshort - endif -@@ -108,7 +99,9 @@ - esac; fi; - endef - else -- msg := : -+ define msg -+ : -+ endef - endif - - msgprefix := *$(subst * ,*,$(wordlist 1,$(MAKELEVEL),* * * * * * * * * * * * * * * * * *)) diff --git a/app-misc/realpath/metadata.xml b/app-misc/realpath/metadata.xml deleted file mode 100644 index dab54dbc151c..000000000000 --- a/app-misc/realpath/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>shell-to...@gentoo.org</email> - <name>Gentoo Shell Tools Project</name> - </maintainer> - <longdescription lang="en"> - The realpath utility finds the canonicalized absolute pathname of its - arguments in a similar way to readlink -f. - </longdescription> -</pkgmetadata> diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild deleted file mode 100644 index 4c596cd953c7..000000000000 --- a/app-misc/realpath/realpath-1.18.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic prefix - -DESCRIPTION="Return the canonicalized absolute pathname" -HOMEPAGE="http://packages.debian.org/unstable/utils/realpath"; -SRC_URI=" - mirror://debian/pool/main/r/${PN}/${PN}_${PV}.tar.gz - nls? ( mirror://debian/pool/main/r/${PN}/${PN}_${PV}_i386.deb )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="nls" - -RDEPEND=" - nls? ( virtual/libintl )" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.17-build.patch - "${FILESDIR}"/${PN}-1.14-no-po4a.patch - "${FILESDIR}"/${PN}-1.15-prefix.patch -) - -src_unpack() { - unpack ${PN}_${PV}.tar.gz - - if use nls; then - # Unpack the .deb file, in order to get the preprocessed man page - # translations. This way we avoid a dependency on app-text/po4a. - mkdir deb - cd deb - unpack ${PN}_${PV}_i386.deb - unpack ./data.tar.gz - fi -} - -src_prepare() { - if ! use nls ; then - eapply "${FILESDIR}"/${PN}-1.16-nonls.patch - fi - - default - - # Don't compress man pages - sed -i -e 's:gzip -9f:true:' common.mk || die - - eprefixify common.mk -} - -src_compile() { - tc-export CC - - use nls && ! use elibc_glibc && append-libs -lintl - - local subdir - for subdir in src man $(usex nls po ''); do - emake MAKE_VERBOSE=yes VERSION="${PV}" -C ${subdir} - done -} - -src_install() { - emake \ - VERSION="${PV}" \ - SUBDIRS="src man $(usex nls po '')" \ - DESTDIR="${D}" \ - install - - newdoc debian/changelog ChangeLog.debian - - if use nls; then - local dir - for dir in "${WORKDIR}"/deb/usr/share/man/*; do - [[ -f "${dir}"/man1/realpath.1 ]] || continue - newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1 - done - fi -} diff --git a/profiles/package.mask b/profiles/package.mask index 4887620e3253..3ed7727ed5e7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -358,11 +358,6 @@ dev-haskell/terminfo # Performance regression. Bug #916713. =dev-db/mydumper-0.15.1.3 -# Michał Górny <mgo...@gentoo.org> (2023-10-26) -# Not installable due to conflict with sys-apps/coreutils. -# Removal on 2023-11-25. Bug #908406. -app-misc/realpath - # Ulrich Müller <u...@gentoo.org> (2023-10-19) # Pretest versions, masked for testing. <app-editors/emacs-29.1.9999:29-vcs
