[gentoo-commits] repo/gentoo:master commit in: sci-libs/liborigin/, sci-libs/liborigin/files/
commit: f37e914434c8ac71cce2333be51c5eecdd67e813
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 18 11:34:18 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 19 14:44:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37e9144
sci-libs/liborigin: drop 3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
sci-libs/liborigin/Manifest| 1 -
.../files/liborigin-3.0.1-buildsystem.patch| 47 ---
sci-libs/liborigin/liborigin-3.0.1.ebuild | 53 --
3 files changed, 101 deletions(-)
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index 05362459eb68..418d138d29d8 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -1,2 +1 @@
-DIST liborigin-3.0.1.tar.gz 156842 BLAKE2B
2c88d0419c4c7be1ff6d3aaba1f794fe67174e02e591878c754a32d9b2789bd8594d39f4786d9ac04884b443b528086617a9e1fdbca8815089c8ebb400dd321c
SHA512
c3fde3549bce462ea38b961885d6c835aac53db64375645db1d3636eb78396b3353c5bcc9ea3313dac3ffb436de35677ecec6fddb2fcf1eb37eaf6a78e2a31f8
DIST liborigin-3.0.1_p20210828.tar.gz 156437 BLAKE2B
48713d8854ccd7f46b1aca72bf7b7739af588f08aea32e1d27ff4416ca4fa96a942b19e37fb151f5e7afbd5133d870c305a608e639c620672e683fe805d4f5d1
SHA512
0c9866bef16844102be6ae6e150c927420ca07e6ee50342e9fbd4312f9cd3c476c8d730464b010076f31d7fdcc16bd1133de9ace3a6e5b9b321a231ddab00458
diff --git a/sci-libs/liborigin/files/liborigin-3.0.1-buildsystem.patch
b/sci-libs/liborigin/files/liborigin-3.0.1-buildsystem.patch
deleted file mode 100644
index 36e5d7fc7a9c..
--- a/sci-libs/liborigin/files/liborigin-3.0.1-buildsystem.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f3b26d..4c543bf 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,6 +28,8 @@ else()
- set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic" )
- endif()
-
-+option(ENABLE_TOOLS "Install opj2dat command line util" ON)
-+
- # compile-time configuration variables to be linked in
- configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-@@ -44,7 +46,6 @@ set (devel-headers
- OriginObj.h
- OriginFile.h
- OriginParser.h
--tree.hh
- )
-
- # object library
-@@ -87,6 +88,7 @@ if (BUILD_SHARED_LIBS)
- endif ()
-
- # command line util
-+if(ENABLE_TOOLS)
- if (BUILD_STATIC_LIBS)
- add_executable(opj2dat opj2dat.cpp)
- target_link_libraries (opj2dat origin_static)
-@@ -94,6 +96,7 @@ elseif (BUILD_SHARED_LIBS)
- add_executable(opj2dat opj2dat.cpp)
- target_link_libraries (opj2dat origin_shared)
- endif ()
-+endif ()
-
- # Generate a pkg-config file matching this config
- configure_file("liborigin.pc.in" "liborigin.pc" @ONLY)
-@@ -103,7 +106,9 @@ install(FILES ${devel-headers} DESTINATION
${CMAKE_INSTALL_INCLUDEDIR}/liborigin
- # install pkg-config file
- if (BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION
${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+if(ENABLE_TOOLS)
- install(TARGETS opj2dat DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
-+endif ()
- endif ()
-
- # documentation
diff --git a/sci-libs/liborigin/liborigin-3.0.1.ebuild
b/sci-libs/liborigin/liborigin-3.0.1.ebuild
deleted file mode 100644
index c7fb5af70c2b..
--- a/sci-libs/liborigin/liborigin-3.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Library for reading OriginLab OPJ project files"
-HOMEPAGE="https://sourceforge.net/projects/liborigin/
https://github.com/SciDAVis/liborigin/;
-SRC_URI="http://downloads.sourceforge.net/liborigin/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc tools"
-
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-RDEPEND="
- dev-cpp/tree
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- # add missing header
- "${FILESDIR}/${P}-missing-header.patch"
- # downstream
- "${FILESDIR}/${P}-buildsystem.patch" # ENABLE_TOOLS, shared link, doc
paths
-)
-
-src_prepare() {
- cmake_src_prepare
- rm tree.hh || die "failed to remove bundled tree.hh"
-
- sed -e "/install.*html/s/liborigin/${PF}/" \
- -i CMakeLists.txt || die "failed to fix htmldoc install path"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DGENERATE_CODE_FOR_LOG=$(usex debug)
- $(cmake_use_find_package doc Doxygen)
- -DENABLE_TOOLS=$(usex tools)
- -DBUILD_STATIC_LIBS=NO
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_src_compile doc
-}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/liborigin/, sci-libs/liborigin/files/
commit: f23b2debadee5ddc67ce8fdacf1470fa546319e2
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Dec 8 08:56:28 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Dec 8 08:56:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23b2deb
sci-libs/liborigin: no static libs
Closes: https://bugs.gentoo.org/828534
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan gentoo.org>
.../liborigin-3.0.1_p20210828-buildsystem.patch| 24 +++---
ebuild => liborigin-3.0.1_p20210828-r1.ebuild} | 0
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git
a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch
b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch
index 8ad6fd432abe..150ae4e21be1 100644
--- a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch
+++ b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a8e5914..6401a30 100644
+index a8e5914..a1a129c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,6 @@ set (devel-headers
@@ -10,15 +10,21 @@ index a8e5914..6401a30 100644
)
# allow for installation of individual targets
-@@ -65,6 +64,7 @@ add_library (origin_static STATIC $)
- set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" )
+@@ -59,12 +58,8 @@ else()
+ message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to
activate logging.")
+ endif ()
+-# Static library
+-add_library (origin_static STATIC $)
+-
+-set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" )
+-
if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
+ include(GNUInstallDirs)
# Shared library
add_library( origin_shared SHARED $)
-@@ -74,13 +74,14 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}"
)
+@@ -74,15 +69,16 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}"
)
SOVERSION ${PROJECT_VERSION_MAJOR}
)
# Generate a pkg-config file matching this config
@@ -28,14 +34,18 @@ index a8e5914..6401a30 100644
+ if(ENABLE_TOOLS)
# command line util
add_executable(opj2dat opj2dat.cpp)
- target_link_libraries (opj2dat origin_static)
+- target_link_libraries (opj2dat origin_static)
++ target_link_libraries (opj2dat origin_shared)
+ endif ()
- include(GNUInstallDirs)
# install libraries
- install( TARGETS origin_shared origin_static
+- install( TARGETS origin_shared origin_static
++ install( TARGETS origin_shared
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-@@ -92,7 +93,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -92,7 +88,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
# install pkg-config file
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION
${CMAKE_INSTALL_LIBDIR}/pkgconfig)
#
diff --git a/sci-libs/liborigin/liborigin-3.0.1_p20210828.ebuild
b/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild
similarity index 100%
rename from sci-libs/liborigin/liborigin-3.0.1_p20210828.ebuild
rename to sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild
