aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2017-05-13 16:56:36 +0100
committerJustin Lecher <jlec@gentoo.org>2017-05-13 16:56:36 +0100
commit15aa3558a40ada4f52c6941dad7b044caf07f862 (patch)
tree3a950dab2723fcde8ffbb355e535bddb72b4f285
parentlongdescription change (diff)
downloadsci-15aa3558a40ada4f52c6941dad7b044caf07f862.tar.gz
sci-15aa3558a40ada4f52c6941dad7b044caf07f862.tar.bz2
sci-15aa3558a40ada4f52c6941dad7b044caf07f862.zip
dev-cpp/eigen: Merge tree changes Fixes
Fixes gentoo/sci#707 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=601170 Package-Manager: Portage-2.3.5, Repoman-2.3.2 Signed-off-by: Justin Lecher <jlec@gentoo.org>
-rw-r--r--dev-cpp/eigen/eigen-3.2.8-r2.ebuild (renamed from dev-cpp/eigen/eigen-3.2.8-r1.ebuild)6
-rw-r--r--dev-cpp/eigen/eigen-9999.ebuild6
-rw-r--r--dev-cpp/eigen/metadata.xml2
3 files changed, 3 insertions, 11 deletions
diff --git a/dev-cpp/eigen/eigen-3.2.8-r1.ebuild b/dev-cpp/eigen/eigen-3.2.8-r2.ebuild
index 4f5fa6ab8..e93a800aa 100644
--- a/dev-cpp/eigen/eigen-3.2.8-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -64,10 +64,6 @@ src_prepare() {
sed -i -e "/Unknown build type/d" CMakeLists.txt || die
- sed \
- -e '/Cflags/s|:.*|: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}|g' \
- -i eigen3.pc.in || die
-
cmake-utils_src_prepare
}
diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild
index 759d64683..266a9ed2b 100644
--- a/dev-cpp/eigen/eigen-9999.ebuild
+++ b/dev-cpp/eigen/eigen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -60,10 +60,6 @@ src_prepare() {
sed -i -e "/Unknown build type/d" CMakeLists.txt || die
- sed \
- -e '/Cflags/s|:.*|: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}|g' \
- -i eigen3.pc.in || die
-
cmake-utils_src_prepare
}
diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index cfb88d051..6d5cb6666 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">