[gentoo-commits] proj/sci:master commit in: dev-cpp/eigen/

["Justin Lecher" <jlec@gentoo.org>]

commit:     15aa3558a40ada4f52c6941dad7b044caf07f862
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 15:56:36 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat May 13 15:56:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=15aa3558

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 <AT> gentoo.org>

 dev-cpp/eigen/{eigen-3.2.8-r1.ebuild => eigen-3.2.8-r2.ebuild} | 6 +-----
 dev-cpp/eigen/eigen-9999.ebuild                                | 6 +-----
 dev-cpp/eigen/metadata.xml                                     | 2 +-
 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
similarity index 95%
rename from dev-cpp/eigen/eigen-3.2.8-r1.ebuild
rename to 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">