summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-05-02 11:51:25 +0200
committerAlexis Ballier <aballier@gentoo.org>2017-05-02 12:21:45 +0200
commit45c8c215964ea702481285cb7a4a3551492da453 (patch)
tree89f0de8ef0a1600b67a0f1f08632f650c160120f /sci-electronics
parentdev-ros/pointcloud_to_laserscan: Bump to 1.3.1 (diff)
downloadgentoo-45c8c215964ea702481285cb7a4a3551492da453.tar.gz
gentoo-45c8c215964ea702481285cb7a4a3551492da453.tar.bz2
gentoo-45c8c215964ea702481285cb7a4a3551492da453.zip
sci-electronics/Stage: Bump to 4.3.0
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/Stage/Manifest1
-rw-r--r--sci-electronics/Stage/Stage-4.3.0.ebuild39
-rw-r--r--sci-electronics/Stage/Stage-9999.ebuild3
-rw-r--r--sci-electronics/Stage/files/libdir.patch64
4 files changed, 106 insertions, 1 deletions
diff --git a/sci-electronics/Stage/Manifest b/sci-electronics/Stage/Manifest
index 60d4bccba80..04dcdf263e1 100644
--- a/sci-electronics/Stage/Manifest
+++ b/sci-electronics/Stage/Manifest
@@ -1 +1,2 @@
DIST Stage-4.1.1.tar.gz 1014322 SHA256 0f115024db427a72c92c85d0987ca10b8dbc55fd756ae7f51e0277c389039498 SHA512 db39135ab2b93925dd0bfbec19d8c2820e3d6ba7caf3cf5f4b617fbdfa76b720ad99f21fde0a08559ab905d819325f5391b29deb7b6af7bb72f522ac15eb5bf2 WHIRLPOOL 7305f903ac7fea4798d11abe64774b401659ace0b5ea840b339c6433bf68da5712abbeeee0f031e668da3f00c2529c15f0a854b38cea2f6780d854658c611e8b
+DIST Stage-4.3.0.tar.gz 1039133 SHA256 f32cb6887146441fd34671975fa81ea76438ce447bc68a0a6a1b62b5233ad2d6 SHA512 37abf63c3a187dc2521c80d504aaef4b7eeef861cbbdce488a7d1c14e7e6eb6f84e010e014b1a3cb81f4ca9ccbebc564a32ffa7ba7b50458c50436216bd8250f WHIRLPOOL cc3b4789215809dc3d4b9cd6f4441ad4bceaa2991a3b92fd0e9a934b771ec0a794e665d54aa9818b9809dfc13897b5f8c70e3af6585bc3ae4a3e2340e1585172
diff --git a/sci-electronics/Stage/Stage-4.3.0.ebuild b/sci-electronics/Stage/Stage-4.3.0.ebuild
new file mode 100644
index 00000000000..eb8323affe4
--- /dev/null
+++ b/sci-electronics/Stage/Stage-4.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://github.com/rtv/Stage"
+fi
+
+inherit ${SCM} cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+ SRC_URI=""
+else
+ KEYWORDS="~amd64"
+ SRC_URI="https://github.com/rtv/Stage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="The Stage Robot Simulator"
+HOMEPAGE="http://rtv.github.io/Stage/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libltdl:0
+ virtual/jpeg:0
+ media-libs/libpng:0=
+ sys-libs/zlib:0=
+ x11-libs/fltk[opengl]
+ virtual/glu
+ virtual/opengl
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/libdir.patch" )
diff --git a/sci-electronics/Stage/Stage-9999.ebuild b/sci-electronics/Stage/Stage-9999.ebuild
index 6ac936b86f1..22baa119e3e 100644
--- a/sci-electronics/Stage/Stage-9999.ebuild
+++ b/sci-electronics/Stage/Stage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -29,6 +29,7 @@ RDEPEND="
dev-libs/libltdl:0
virtual/jpeg:0
media-libs/libpng:0=
+ sys-libs/zlib:0=
x11-libs/fltk[opengl]
virtual/glu
virtual/opengl
diff --git a/sci-electronics/Stage/files/libdir.patch b/sci-electronics/Stage/files/libdir.patch
new file mode 100644
index 00000000000..c083a837b8b
--- /dev/null
+++ b/sci-electronics/Stage/files/libdir.patch
@@ -0,0 +1,64 @@
+From 777430f083c4190fbc1beecfd4b619e63cf08dfb Mon Sep 17 00:00:00 2001
+From: Alexis Ballier <aballier@gentoo.org>
+Date: Tue, 2 May 2017 11:47:13 +0200
+Subject: [PATCH] Revert "Do not install to lib64, even on x86_64 machines"
+
+This reverts commit 9f6e9bae3c51480d7f4c1b329493bbe30bc21839.
+---
+ cmake/internal/FindOS.cmake | 36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/cmake/internal/FindOS.cmake b/cmake/internal/FindOS.cmake
+index 5666bbce..cec44912 100644
+--- a/cmake/internal/FindOS.cmake
++++ b/cmake/internal/FindOS.cmake
+@@ -45,28 +45,28 @@ ELSE (PROJECT_OS_LINUX)
+ ENDIF (PROJECT_OS_LINUX)
+
+ # 32 or 64 bit Linux
+-# IF (PROJECT_OS_LINUX)
+-# # Set the library directory suffix accordingly
+-# IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+-# SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+-# MESSAGE (STATUS "Linux x86_64 Detected")
+-# ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
+-# MESSAGE (STATUS "Linux ppc64 Detected")
+-# SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+-# ELSEIF ($CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
+-# MESSAGE (STATEUS "Linux s390x Detected")
+-# SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
+-# ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+-# ENDIF (PROJECT_OS_LINUX)
++IF (PROJECT_OS_LINUX)
++ # Set the library directory suffix accordingly
++ IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
++ SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
++ MESSAGE (STATUS "Linux x86_64 Detected")
++ ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
++ MESSAGE (STATUS "Linux ppc64 Detected")
++ SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
++ ELSEIF ($CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
++ MESSAGE (STATEUS "Linux s390x Detected")
++ SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
++ ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
++ENDIF (PROJECT_OS_LINUX)
+
+-# IF(PROJECT_PROC_64BIT)
++IF(PROJECT_PROC_64BIT)
+ # Set the install path to lib64
+- # SET(PROJECT_LIB_DIR "lib64")
+- # SET(PROJECT_PLUGIN_DIR "lib64/${PROJECT_NAME}-${APIVERSION}")
+-# ELSE (PROJECT_PROC_64BIT)
++ SET(PROJECT_LIB_DIR "lib64")
++ SET(PROJECT_PLUGIN_DIR "lib64/${PROJECT_NAME}-${APIVERSION}")
++ELSE (PROJECT_PROC_64BIT)
+ SET(PROJECT_LIB_DIR "lib")
+ SET(PROJECT_PLUGIN_DIR "lib/${PROJECT_NAME}-${APIVERSION}")
+-# ENDIF (PROJECT_PROC_64BIT)
++ENDIF (PROJECT_PROC_64BIT)
+
+ MESSAGE(STATUS "Installing Libraries to ${CMAKE_INSTALL_PREFIX}/${PROJECT_LIB_DIR}")
+ MESSAGE(STATUS "Installing Plugins to ${CMAKE_INSTALL_PREFIX}/${PROJECT_PLUGIN_DIR}")
+--
+2.12.2
+