From b1c62426acf7fedab5f9ce94d8cce46290f1a603 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Fri, 4 Sep 2020 13:57:32 +0100
Subject: sys-libs/blocksruntime: install Blocks.h into private dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Blocks.h collides with gnustep-base/libobjc2. -fblocks
does not really need external headers. For rare users
that need it we still provide it in non-standard location.

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/740356
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 .../blocksruntime-0_pre20171027-r1.ebuild          | 42 ++++++++++++++++++++++
 .../blocksruntime-0_pre20171027.ebuild             | 41 ---------------------
 2 files changed, 42 insertions(+), 41 deletions(-)
 create mode 100644 sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild
 delete mode 100644 sys-libs/blocksruntime/blocksruntime-0_pre20171027.ebuild

(limited to 'sys-libs')

diff --git a/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild b/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild
new file mode 100644
index 000000000000..6c49e1748dba
--- /dev/null
+++ b/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs vcs-snapshot
+
+COMMIT=9cc93ae2b58676c23fd02cf0c686fa15b7a3ff81 # 27 Oct 2017
+
+DESCRIPTION="BlocksRuntime library needed for clang's -fblocks support"
+HOMEPAGE="https://github.com/mackyle/blocksruntime"
+SRC_URI="https://github.com/mackyle/blocksruntime/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0_pre20171027-ldflags-soname.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export CC AR RANLIB
+}
+
+src_compile() {
+	./buildlib -shared || die
+}
+
+src_install() {
+	prefix="${EPREFIX}/usr" \
+	includedir="${EPREFIX}/usr/include/blocksruntime" \
+	libdir="${EPREFIX}/usr/$(get_libdir)" \
+	DESTDIR="${D}" \
+		./installlib $(use static-libs || echo -shared) || die
+}
diff --git a/sys-libs/blocksruntime/blocksruntime-0_pre20171027.ebuild b/sys-libs/blocksruntime/blocksruntime-0_pre20171027.ebuild
deleted file mode 100644
index a855b832dba2..000000000000
--- a/sys-libs/blocksruntime/blocksruntime-0_pre20171027.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs vcs-snapshot
-
-COMMIT=9cc93ae2b58676c23fd02cf0c686fa15b7a3ff81 # 27 Oct 2017
-
-DESCRIPTION="BlocksRuntime library needed for clang's -fblocks support"
-HOMEPAGE="https://github.com/mackyle/blocksruntime"
-SRC_URI="https://github.com/mackyle/blocksruntime/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0_pre20171027-ldflags-soname.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export CC AR RANLIB
-}
-
-src_compile() {
-	./buildlib -shared || die
-}
-
-src_install() {
-	prefix="${EPREFIX}/usr" \
-	libdir="${EPREFIX}/usr/$(get_libdir)" \
-	DESTDIR="${D}" \
-		./installlib $(use static-libs || echo -shared) || die
-}
-- 
cgit v1.2.3-65-gdbad