dev-util/pkgconfig-openbsd: Remove last-rited pkg

Closes: https://bugs.gentoo.org/694034
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/dev-util/pkgconfig-openbsd/Manifest b/dev-util/pkgconfig-openbsd/Manifest
deleted file mode 100644 (file)
index 07366ca..0000000
--- a/dev-util/pkgconfig-openbsd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-DIST pkgconfig-openbsd-20130507.tar.xz 10876 BLAKE2B 38beb8dfe17742fe83d57e62d5898de1d6d029ec5bf4caa5d16edb317e179e45fc6bf3c5d7bd56792b5e774ebc53d7cb51a721abd62753f67b1cd5cb76bdfb1a SHA512 39335c986be0f58fe22bfcda9b6196b34c7c8b7e889df2df0d9707fc699ba6e45df7aaa1d1f4bbe53098ea5fb1bb4aa3e5e33c22971978b40bba395642b41b69

diff --git a/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch b/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch
deleted file mode 100644 (file)
index 41784c9..0000000
--- a/dev-util/pkgconfig-openbsd/files/pkgconfig-openbsd-20130507-zap-warning.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Use of $_ produces warnings which can cause build failures in certain consumers.
-
-Backported from revision 1.4 upstream (http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm).
-
-Gentoo-bug: 538012
-Gentoo-bug: 545314
-Gentoo-bug: 545322
-Gentoo-bug: 545962
-
---- a/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm
-+++ b/src/usr.bin/pkg-config/OpenBSD/PkgConfig.pm
-@@ -91,7 +91,6 @@
- {
-       my ($class, $fh, $name) = @_;
-       my $cfg = $class->new;
--      my $_;
- 
-       $name = '' if !defined $name;
-       while (<$fh>) {

diff --git a/dev-util/pkgconfig-openbsd/metadata.xml b/dev-util/pkgconfig-openbsd/metadata.xml
deleted file mode 100644 (file)
index e5d0047..0000000
--- a/dev-util/pkgconfig-openbsd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <use>
-    <flag name="pkg-config">Install as a replacement for <pkg>dev-util/pkgconfig</pkg></flag>
-  </use>
-</pkgmetadata>

diff --git a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
deleted file mode 100644 (file)
index e47abef..0000000
--- a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils multilib perl-module multilib-minimal
-
-# cvs -d anoncvs@anoncvs.openbsd.org:/cvs get src/usr.bin/pkg-config
-
-PKG_M4_VERSION=0.28
-
-DESCRIPTION="A perl based version of pkg-config from OpenBSD"
-HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/"
-SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz
-       pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-${PKG_M4_VERSION}.tar.gz )"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pkg-config"
-
-RDEPEND="virtual/perl-Getopt-Long
-       pkg-config? (
-               !dev-util/pkgconfig
-               !dev-util/pkgconf[pkg-config]
-       )"
-
-S=${WORKDIR}/src
-
-src_prepare() {
-       epatch_user
-       ecvs_clean
-
-       epatch "${FILESDIR}/${P}-zap-warning.patch"
-
-       # Config.pm from dev-lang/perl doesn't set ARCH, only archname
-       sed -i -e '/Config/s:ARCH:archname:' usr.bin/pkg-config/pkg-config || die
-
-       if use pkg-config; then
-               MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config )
-       else
-               MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config-openbsd )
-       fi
-}
-
-multilib_src_install() {
-       local pc_bin=pkg-config
-       use pkg-config || pc_bin+=-openbsd
-
-       newbin "${S}"/usr.bin/pkg-config/pkg-config ${pc_bin}
-       newman "${S}"/usr.bin/pkg-config/pkg-config.1 ${pc_bin}.1
-
-       # insert proper paths
-       local pc_paths=(
-               /usr/$(get_libdir)/pkgconfig
-               /usr/share/pkgconfig
-       )
-       sed -i -e "/my @PKGPATH/,/;/{s@(.*@( ${pc_paths[*]} );@p;d}" \
-               "${ED%/}/usr/bin/${pc_bin}" || die
-}
-
-multilib_src_install_all() {
-       if use pkg-config; then
-               insinto /usr/share/aclocal
-               doins "${WORKDIR}"/pkg-config-*/pkg.m4
-       fi
-
-       perl_set_version
-       insinto "${VENDOR_LIB}"
-       doins -r "${S}"/usr.bin/pkg-config/OpenBSD
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index f7db2d7f22e342dc0b7db79b3d2b9bca3f8eb781..589197c0cacf9949aa7a2c532a5e043c786daaf5 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -793,13 +793,6 @@ sys-freebsd/ubin-wrappers
 # Removal in 30 days.  Bug #694036.
 sys-process/vixie-cron
 
-# Michał Górny <mgorny@gentoo.org> (2019-09-11)
-# Unmaintained.  Last bumped in 2013.  No apparent advantage over
-# the two other implementations in Gentoo (dev-util/pkgconfig,
-# dev-util/pkgconf).
-# Removal in 30 days.  Bug #694034.
-dev-util/pkgconfig-openbsd
-
 # Lars Wendler <polynomial-c@gentoo.org> (2019-09-04)
 # Unofficial build. Superseded by official 2.49.5 release.
 # Masked for removal.