[patch] split virtual/libelf into two

virtual-libelf.patch (text/plain), 2.84 KB, created by Anthony Basile on 2018-01-12 13:51:45 UTC

diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index c4367eb8487..303f8b5b4ca 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -14,6 +14,7 @@ sys-fs/udev
 
 # dev-libs/elfutils needs a port to musl, bug #602126
 dev-libs/elfutils
+>virtual/libelf-2
 
 # packages that unconditionally depend on dev-libs/elfutils
 <net-firewall/fwbuilder-5.3.7
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index da2e709730f..f5208eadab2 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -11,6 +11,7 @@ sys-fs/udev
 
 # Working on it, bug #470884
 dev-libs/elfutils
+>virtual/libelf-2
 
 # packages that unconditionally depend on dev-libs/elfutils
 <net-firewall/fwbuilder-5.3.7
diff --git a/virtual/libelf/libelf-0.ebuild b/virtual/libelf/libelf-0.ebuild
deleted file mode 100644
index 0b8e5336de8..00000000000
--- a/virtual/libelf/libelf-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for libelf.so.0 provider (dev-libs/libelf)"
-SLOT="0/0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/libelf-0.8.13-r2:0/0[${MULTILIB_USEDEP}]"
diff --git a/virtual/libelf/libelf-2.ebuild b/virtual/libelf/libelf-2.ebuild
new file mode 100644
index 00000000000..0064f255acd
--- /dev/null
+++ b/virtual/libelf/libelf-2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for libelf.so.1 provider (dev-libs/elfutils)"
+SLOT="0/1"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND=">=dev-libs/libelf-0.8.13-r2:0/0[${MULTILIB_USEDEP}]"
diff --git a/virtual/libelf/libelf-1.ebuild b/virtual/libelf/libelf-3.ebuild
similarity index 88%
rename from virtual/libelf/libelf-1.ebuild
rename to virtual/libelf/libelf-3.ebuild
index b2acd4bb712..7ff12f5d83d 100644
--- a/virtual/libelf/libelf-1.ebuild
+++ b/virtual/libelf/libelf-3.ebuild
@@ -6,12 +6,11 @@ EAPI=6
 inherit multilib-build
 
 DESCRIPTION="Virtual for libelf.so.1 provider (dev-libs/elfutils)"
-SLOT="0/1"
+SLOT="0/2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 
 RDEPEND="
 	|| (
 		>=dev-libs/elfutils-0.155-r1:0/0[${MULTILIB_USEDEP}]
 		>=sys-freebsd/freebsd-lib-9.2_rc1[${MULTILIB_USEDEP}]
-		>=dev-libs/libelf-0.8.13-r2:0/0[${MULTILIB_USEDEP}]
 	)"