commit: 155152fe686e11568d68ade29167f60762c53111 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Sat Sep 4 08:20:57 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sat Sep 4 15:24:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155152fe
dev-util/pkgconfig: Remove last-rited package Closes: https://bugs.gentoo.org/632124 Closes: https://bugs.gentoo.org/691268 Closes: https://bugs.gentoo.org/767853 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-util/pkgconfig/Manifest | 1 - dev-util/pkgconfig/metadata.xml | 10 --- dev-util/pkgconfig/pkgconfig-0.29.2.ebuild | 121 ----------------------------- dev-util/pkgconfig/pkgconfig-9999.ebuild | 117 ---------------------------- profiles/package.mask | 1 - 5 files changed, 250 deletions(-) diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest deleted file mode 100644 index cd45508224c..00000000000 --- a/dev-util/pkgconfig/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75 diff --git a/dev-util/pkgconfig/metadata.xml b/dev-util/pkgconfig/metadata.xml deleted file mode 100644 index feea3b542d9..00000000000 --- a/dev-util/pkgconfig/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - </maintainer> - <use> - <flag name="internal-glib">Use internal copy of <pkg>dev-libs/glib</pkg></flag> - </use> -</pkgmetadata> diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild deleted file mode 100644 index d854a38b082..00000000000 --- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 -inherit eutils flag-o-matic libtool multilib multilib-minimal - -MY_P=pkg-config-${PV} - -if [[ ${PV} == *9999* ]]; then - # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER - # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13 - WANT_AUTOMAKE=1.12 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"; - EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} - inherit autotools git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"; -fi - -DESCRIPTION="Package config system that manages compile/link flags" -HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" - -RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - !dev-util/pkgconf[pkg-config] - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config] - virtual/libintl" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS NEWS README ) - -src_prepare() { - sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 - - eapply_user - - if [[ ${PV} == *9999* ]]; then - eautoreconf - else - elibtoolize - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # fix standards conflict, since gcc-4.5 default is gnu90 - if tc-is-gcc && [[ $(gcc-major-version) -gt 4 || \ - ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 5 ) ]] ; - then - sed -i \ - -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \ - -e '/\<_XOPEN_SOURCE\>/s/2/600/' \ - glib/configure || die - fi - fi -} - -multilib_src_configure() { - local myconf - - if use internal-glib; then - myconf+=' --with-internal-glib' - # non-glibc platforms use GNU libiconv, but configure needs to - # know about that not to get confused when it finds something - # outside the prefix too - if use prefix && use !elibc_glibc ; then - myconf+=" --with-libiconv=gnu" - # add the libdir for libtool, otherwise it'll make love with system - # installed libiconv - append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" - # the glib objects reference symbols from these frameworks, - # not good, esp. since Carbon should be deprecated - [[ ${CHOST} == *-darwin* ]] && \ - append-ldflags -framework CoreFoundation -framework Carbon - if [[ ${CHOST} == *-solaris* ]] ; then - # required due to __EXTENSIONS__ - append-cppflags -DENABLE_NLS - # similar to Darwin - append-ldflags -lintl - fi - fi - else - if ! has_version --host-root dev-util/pkgconfig; then - export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - export GLIB_LIBS="-lglib-2.0" - fi - fi - - use ppc64 && use hardened && replace-flags -O[2-3] -O1 - - # Force using all the requirements when linking, so that needed -pthread - # lines are inherited between libraries - use elibc_FreeBSD && myconf+=' --enable-indirect-deps' - - [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' - - ECONF_SOURCE=${S} \ - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-system-include-path="${EPREFIX}"/usr/include \ - --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if use prefix; then - # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to - # simplify cross-prefix builds - echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} - doenvd "${T}"/99${PN} - fi -} diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild deleted file mode 100644 index d2554a4effd..00000000000 --- a/dev-util/pkgconfig/pkgconfig-9999.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 -inherit eutils flag-o-matic libtool multilib multilib-minimal - -MY_P=pkg-config-${PV} - -if [[ ${PV} == *9999* ]]; then - # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER - # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13 - WANT_AUTOMAKE=1.12 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"; - EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} - inherit autotools git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"; -fi - -DESCRIPTION="Package config system that manages compile/link flags" -HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" - -RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - !dev-util/pkgconf[pkg-config] - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config] - virtual/libintl" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS NEWS README ) - -src_prepare() { - sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 - - eapply_user - - if [[ ${PV} == *9999* ]]; then - eautoreconf - else - elibtoolize - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # fix standards conflicts - sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/ \1_DISABLED/' \ - glib/configure || die - sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ - glib/glib/giounix.c || die - fi -} - -multilib_src_configure() { - local myconf - - if use internal-glib; then - myconf+=' --with-internal-glib' - # non-glibc platforms use GNU libiconv, but configure needs to - # know about that not to get confused when it finds something - # outside the prefix too - if use prefix && use !elibc_glibc ; then - myconf+=" --with-libiconv=gnu" - # add the libdir for libtool, otherwise it'll make love with system - # installed libiconv - append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" - # the glib objects reference symbols from these frameworks, - # not good, esp. since Carbon should be deprecated - [[ ${CHOST} == *-darwin* ]] && \ - append-ldflags -framework CoreFoundation -framework Carbon - if [[ ${CHOST} == *-solaris* ]] ; then - # required due to __EXTENSIONS__ - append-cppflags -DENABLE_NLS - # similar to Darwin - append-ldflags -lintl - fi - fi - else - if ! has_version --host-root dev-util/pkgconfig; then - export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - export GLIB_LIBS="-lglib-2.0" - fi - fi - - use ppc64 && use hardened && replace-flags -O[2-3] -O1 - - # Force using all the requirements when linking, so that needed -pthread - # lines are inherited between libraries - use elibc_FreeBSD && myconf+=' --enable-indirect-deps' - - [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' - - ECONF_SOURCE=${S} \ - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-system-include-path="${EPREFIX}"/usr/include \ - --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if use prefix; then - # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to - # simplify cross-prefix builds - echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} - doenvd "${T}"/99${PN} - fi -} diff --git a/profiles/package.mask b/profiles/package.mask index 0dd03221bff..4a7c8647634 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -189,7 +189,6 @@ app-i18n/man-pages-it # (If you hit blockers, please run: # $ emerge --deselect dev-util/pkgconfig # This is necessary as your world file should not contain dependencies.) -# Bug #245228, #632124, #691268, #767853, removal in 30 days. dev-util/pkgconfig # Andreas Sturmlechner <[email protected]> (2021-08-02)
