From 1766e2a34d57bf77074164320d0d417d3162f6ee Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Mon, 4 Jan 2021 17:37:26 -0500
Subject: app-arch/tar: drop 'static' USE flag

Closes: https://bugs.gentoo.org/763585
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 app-arch/tar/tar-1.32-r1.ebuild    | 78 ++++++++++++++++++++++++++++++++++++
 app-arch/tar/tar-1.32.90-r1.ebuild | 81 ++++++++++++++++++++++++++++++++++++++
 app-arch/tar/tar-1.32.90.ebuild    | 80 -------------------------------------
 app-arch/tar/tar-1.32.ebuild       | 79 -------------------------------------
 4 files changed, 159 insertions(+), 159 deletions(-)
 create mode 100644 app-arch/tar/tar-1.32-r1.ebuild
 create mode 100644 app-arch/tar/tar-1.32.90-r1.ebuild
 delete mode 100644 app-arch/tar/tar-1.32.90.ebuild
 delete mode 100644 app-arch/tar/tar-1.32.ebuild

(limited to 'app-arch')

diff --git a/app-arch/tar/tar-1.32-r1.ebuild b/app-arch/tar/tar-1.32-r1.ebuild
new file mode 100644
index 000000000000..6856b79e4026
--- /dev/null
+++ b/app-arch/tar/tar-1.32-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl elibc_glibc minimal nls selinux userland_GNU xattr"
+
+RDEPEND="
+	acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )
+"
+
+src_prepare() {
+	default
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-backup-scripts
+		--libexecdir="${EPREFIX}"/usr/sbin
+		$(usex userland_GNU "" "--program-prefix=g")
+		$(use_with acl posix-acls)
+		$(use_enable nls)
+		$(use_with selinux)
+		$(use_with xattr xattrs)
+	)
+	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	local p=$(usex userland_GNU "" "g")
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt
+	fi
+
+	# autoconf looks for gtar before tar (in configure scripts), hence
+	# in Prefix it is important that it is there, otherwise, a gtar from
+	# the host system (FreeBSD, Solaris, Darwin) will be found instead
+	# of the Prefix provided (GNU) tar
+	if use prefix ; then
+		dosym tar /bin/gtar
+	fi
+
+	mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
+
+	if use minimal ; then
+		find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \
+			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+			-delete || die
+	fi
+}
diff --git a/app-arch/tar/tar-1.32.90-r1.ebuild b/app-arch/tar/tar-1.32.90-r1.ebuild
new file mode 100644
index 000000000000..f5cf6f3b8b87
--- /dev/null
+++ b/app-arch/tar/tar-1.32.90-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.xz
+	mirror://gnu-alpha/tar/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+[[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl elibc_glibc minimal nls selinux userland_GNU xattr"
+
+RDEPEND="
+	acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-backup-scripts
+		--libexecdir="${EPREFIX}"/usr/sbin
+		$(usex userland_GNU "" "--program-prefix=g")
+		$(use_with acl posix-acls)
+		$(use_enable nls)
+		$(use_with selinux)
+		$(use_with xattr xattrs)
+	)
+	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	local p=$(usex userland_GNU "" "g")
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt
+	fi
+
+	# autoconf looks for gtar before tar (in configure scripts), hence
+	# in Prefix it is important that it is there, otherwise, a gtar from
+	# the host system (FreeBSD, Solaris, Darwin) will be found instead
+	# of the Prefix provided (GNU) tar
+	if use prefix ; then
+		dosym tar /bin/gtar
+	fi
+
+	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
+
+	if use minimal ; then
+		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+			-delete || die
+	fi
+}
diff --git a/app-arch/tar/tar-1.32.90.ebuild b/app-arch/tar/tar-1.32.90.ebuild
deleted file mode 100644
index 067def3d8efd..000000000000
--- a/app-arch/tar/tar-1.32.90.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="https://www.gnu.org/software/tar/"
-SRC_URI="mirror://gnu/tar/${P}.tar.xz
-	mirror://gnu-alpha/tar/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-[[ -n "$(ver_cut 3)" ]] && [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
-
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	if ! use userland_GNU ; then
-		sed -i \
-			-e 's:/backup\.sh:/gbackup.sh:' \
-			scripts/{backup,dump-remind,restore}.in \
-			|| die "sed non-GNU"
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-backup-scripts
-		--libexecdir="${EPREFIX}"/usr/sbin
-		$(usex userland_GNU "" "--program-prefix=g")
-		$(use_with acl posix-acls)
-		$(use_enable nls)
-		$(use_with selinux)
-		$(use_with xattr xattrs)
-	)
-	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local p=$(usex userland_GNU "" "g")
-	if [[ -z ${p} ]] ; then
-		# a nasty yet required piece of baggage
-		exeinto /etc
-		doexe "${FILESDIR}"/rmt
-	fi
-
-	# autoconf looks for gtar before tar (in configure scripts), hence
-	# in Prefix it is important that it is there, otherwise, a gtar from
-	# the host system (FreeBSD, Solaris, Darwin) will be found instead
-	# of the Prefix provided (GNU) tar
-	if use prefix ; then
-		dosym tar /bin/gtar
-	fi
-
-	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
-	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
-
-	if use minimal ; then
-		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
-			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
-			-delete || die
-	fi
-}
diff --git a/app-arch/tar/tar-1.32.ebuild b/app-arch/tar/tar-1.32.ebuild
deleted file mode 100644
index 334f50b87cd1..000000000000
--- a/app-arch/tar/tar-1.32.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Use this to make tarballs :)"
-HOMEPAGE="https://www.gnu.org/software/tar/"
-SRC_URI="mirror://gnu/tar/${P}.tar.bz2
-	mirror://gnu-alpha/tar/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
-
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.35 )
-	static? ( ${LIB_DEPEND} )
-	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
-
-src_prepare() {
-	default
-
-	if ! use userland_GNU ; then
-		sed -i \
-			-e 's:/backup\.sh:/gbackup.sh:' \
-			scripts/{backup,dump-remind,restore}.in \
-			|| die "sed non-GNU"
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-backup-scripts
-		--libexecdir="${EPREFIX}"/usr/sbin
-		$(usex userland_GNU "" "--program-prefix=g")
-		$(use_with acl posix-acls)
-		$(use_enable nls)
-		$(use_with selinux)
-		$(use_with xattr xattrs)
-	)
-	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local p=$(usex userland_GNU "" "g")
-	if [[ -z ${p} ]] ; then
-		# a nasty yet required piece of baggage
-		exeinto /etc
-		doexe "${FILESDIR}"/rmt
-	fi
-
-	# autoconf looks for gtar before tar (in configure scripts), hence
-	# in Prefix it is important that it is there, otherwise, a gtar from
-	# the host system (FreeBSD, Solaris, Darwin) will be found instead
-	# of the Prefix provided (GNU) tar
-	if use prefix ; then
-		dosym tar /bin/gtar
-	fi
-
-	mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die
-	mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
-
-	if use minimal ; then
-		find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \
-			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
-			-delete || die
-	fi
-}
-- 
cgit v1.2.3-65-gdbad