| 1 |
commit: 45c8c215964ea702481285cb7a4a3551492da453 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 2 09:51:25 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 2 10:21:45 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c8c215 |
| 7 |
|
| 8 |
sci-electronics/Stage: Bump to 4.3.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
sci-electronics/Stage/Manifest | 1 + |
| 13 |
.../{Stage-9999.ebuild => Stage-4.3.0.ebuild} | 4 +- |
| 14 |
sci-electronics/Stage/Stage-9999.ebuild | 3 +- |
| 15 |
sci-electronics/Stage/files/libdir.patch | 64 ++++++++++++++++++++++ |
| 16 |
4 files changed, 70 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-electronics/Stage/Manifest b/sci-electronics/Stage/Manifest |
| 19 |
index 60d4bccba80..04dcdf263e1 100644 |
| 20 |
--- a/sci-electronics/Stage/Manifest |
| 21 |
+++ b/sci-electronics/Stage/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
DIST Stage-4.1.1.tar.gz 1014322 SHA256 0f115024db427a72c92c85d0987ca10b8dbc55fd756ae7f51e0277c389039498 SHA512 db39135ab2b93925dd0bfbec19d8c2820e3d6ba7caf3cf5f4b617fbdfa76b720ad99f21fde0a08559ab905d819325f5391b29deb7b6af7bb72f522ac15eb5bf2 WHIRLPOOL 7305f903ac7fea4798d11abe64774b401659ace0b5ea840b339c6433bf68da5712abbeeee0f031e668da3f00c2529c15f0a854b38cea2f6780d854658c611e8b |
| 24 |
+DIST Stage-4.3.0.tar.gz 1039133 SHA256 f32cb6887146441fd34671975fa81ea76438ce447bc68a0a6a1b62b5233ad2d6 SHA512 37abf63c3a187dc2521c80d504aaef4b7eeef861cbbdce488a7d1c14e7e6eb6f84e010e014b1a3cb81f4ca9ccbebc564a32ffa7ba7b50458c50436216bd8250f WHIRLPOOL cc3b4789215809dc3d4b9cd6f4441ad4bceaa2991a3b92fd0e9a934b771ec0a794e665d54aa9818b9809dfc13897b5f8c70e3af6585bc3ae4a3e2340e1585172 |
| 25 |
|
| 26 |
diff --git a/sci-electronics/Stage/Stage-9999.ebuild b/sci-electronics/Stage/Stage-4.3.0.ebuild |
| 27 |
similarity index 87% |
| 28 |
copy from sci-electronics/Stage/Stage-9999.ebuild |
| 29 |
copy to sci-electronics/Stage/Stage-4.3.0.ebuild |
| 30 |
index 6ac936b86f1..eb8323affe4 100644 |
| 31 |
--- a/sci-electronics/Stage/Stage-9999.ebuild |
| 32 |
+++ b/sci-electronics/Stage/Stage-4.3.0.ebuild |
| 33 |
@@ -1,4 +1,4 @@ |
| 34 |
-# Copyright 1999-2015 Gentoo Foundation |
| 35 |
+# Copyright 1999-2017 Gentoo Foundation |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
EAPI=5 |
| 39 |
@@ -29,9 +29,11 @@ RDEPEND=" |
| 40 |
dev-libs/libltdl:0 |
| 41 |
virtual/jpeg:0 |
| 42 |
media-libs/libpng:0= |
| 43 |
+ sys-libs/zlib:0= |
| 44 |
x11-libs/fltk[opengl] |
| 45 |
virtual/glu |
| 46 |
virtual/opengl |
| 47 |
" |
| 48 |
DEPEND="${RDEPEND} |
| 49 |
virtual/pkgconfig" |
| 50 |
+PATCHES=( "${FILESDIR}/libdir.patch" ) |
| 51 |
|
| 52 |
diff --git a/sci-electronics/Stage/Stage-9999.ebuild b/sci-electronics/Stage/Stage-9999.ebuild |
| 53 |
index 6ac936b86f1..22baa119e3e 100644 |
| 54 |
--- a/sci-electronics/Stage/Stage-9999.ebuild |
| 55 |
+++ b/sci-electronics/Stage/Stage-9999.ebuild |
| 56 |
@@ -1,4 +1,4 @@ |
| 57 |
-# Copyright 1999-2015 Gentoo Foundation |
| 58 |
+# Copyright 1999-2017 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
|
| 61 |
EAPI=5 |
| 62 |
@@ -29,6 +29,7 @@ RDEPEND=" |
| 63 |
dev-libs/libltdl:0 |
| 64 |
virtual/jpeg:0 |
| 65 |
media-libs/libpng:0= |
| 66 |
+ sys-libs/zlib:0= |
| 67 |
x11-libs/fltk[opengl] |
| 68 |
virtual/glu |
| 69 |
virtual/opengl |
| 70 |
|
| 71 |
diff --git a/sci-electronics/Stage/files/libdir.patch b/sci-electronics/Stage/files/libdir.patch |
| 72 |
new file mode 100644 |
| 73 |
index 00000000000..c083a837b8b |
| 74 |
--- /dev/null |
| 75 |
+++ b/sci-electronics/Stage/files/libdir.patch |
| 76 |
@@ -0,0 +1,64 @@ |
| 77 |
+From 777430f083c4190fbc1beecfd4b619e63cf08dfb Mon Sep 17 00:00:00 2001 |
| 78 |
+From: Alexis Ballier <aballier@g.o> |
| 79 |
+Date: Tue, 2 May 2017 11:47:13 +0200 |
| 80 |
+Subject: [PATCH] Revert "Do not install to lib64, even on x86_64 machines" |
| 81 |
+ |
| 82 |
+This reverts commit 9f6e9bae3c51480d7f4c1b329493bbe30bc21839. |
| 83 |
+--- |
| 84 |
+ cmake/internal/FindOS.cmake | 36 ++++++++++++++++++------------------ |
| 85 |
+ 1 file changed, 18 insertions(+), 18 deletions(-) |
| 86 |
+ |
| 87 |
+diff --git a/cmake/internal/FindOS.cmake b/cmake/internal/FindOS.cmake |
| 88 |
+index 5666bbce..cec44912 100644 |
| 89 |
+--- a/cmake/internal/FindOS.cmake |
| 90 |
++++ b/cmake/internal/FindOS.cmake |
| 91 |
+@@ -45,28 +45,28 @@ ELSE (PROJECT_OS_LINUX) |
| 92 |
+ ENDIF (PROJECT_OS_LINUX) |
| 93 |
+ |
| 94 |
+ # 32 or 64 bit Linux |
| 95 |
+-# IF (PROJECT_OS_LINUX) |
| 96 |
+-# # Set the library directory suffix accordingly |
| 97 |
+-# IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") |
| 98 |
+-# SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL) |
| 99 |
+-# MESSAGE (STATUS "Linux x86_64 Detected") |
| 100 |
+-# ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64") |
| 101 |
+-# MESSAGE (STATUS "Linux ppc64 Detected") |
| 102 |
+-# SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL) |
| 103 |
+-# ELSEIF ($CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x") |
| 104 |
+-# MESSAGE (STATEUS "Linux s390x Detected") |
| 105 |
+-# SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL) |
| 106 |
+-# ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") |
| 107 |
+-# ENDIF (PROJECT_OS_LINUX) |
| 108 |
++IF (PROJECT_OS_LINUX) |
| 109 |
++ # Set the library directory suffix accordingly |
| 110 |
++ IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") |
| 111 |
++ SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL) |
| 112 |
++ MESSAGE (STATUS "Linux x86_64 Detected") |
| 113 |
++ ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64") |
| 114 |
++ MESSAGE (STATUS "Linux ppc64 Detected") |
| 115 |
++ SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL) |
| 116 |
++ ELSEIF ($CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x") |
| 117 |
++ MESSAGE (STATEUS "Linux s390x Detected") |
| 118 |
++ SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL) |
| 119 |
++ ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") |
| 120 |
++ENDIF (PROJECT_OS_LINUX) |
| 121 |
+ |
| 122 |
+-# IF(PROJECT_PROC_64BIT) |
| 123 |
++IF(PROJECT_PROC_64BIT) |
| 124 |
+ # Set the install path to lib64 |
| 125 |
+- # SET(PROJECT_LIB_DIR "lib64") |
| 126 |
+- # SET(PROJECT_PLUGIN_DIR "lib64/${PROJECT_NAME}-${APIVERSION}") |
| 127 |
+-# ELSE (PROJECT_PROC_64BIT) |
| 128 |
++ SET(PROJECT_LIB_DIR "lib64") |
| 129 |
++ SET(PROJECT_PLUGIN_DIR "lib64/${PROJECT_NAME}-${APIVERSION}") |
| 130 |
++ELSE (PROJECT_PROC_64BIT) |
| 131 |
+ SET(PROJECT_LIB_DIR "lib") |
| 132 |
+ SET(PROJECT_PLUGIN_DIR "lib/${PROJECT_NAME}-${APIVERSION}") |
| 133 |
+-# ENDIF (PROJECT_PROC_64BIT) |
| 134 |
++ENDIF (PROJECT_PROC_64BIT) |
| 135 |
+ |
| 136 |
+ MESSAGE(STATUS "Installing Libraries to ${CMAKE_INSTALL_PREFIX}/${PROJECT_LIB_DIR}") |
| 137 |
+ MESSAGE(STATUS "Installing Plugins to ${CMAKE_INSTALL_PREFIX}/${PROJECT_PLUGIN_DIR}") |
| 138 |
+-- |
| 139 |
+2.12.2 |
| 140 |
+ |
Archives