aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
Diffstat (limited to 'paludis')
-rw-r--r--paludis/CMakeLists.txt12
-rw-r--r--paludis/repositories/e/CMakeLists.txt6
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_config.bash2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash2
-rw-r--r--paludis/repositories/e/ebuild/utils/CMakeLists.txt3
5 files changed, 11 insertions, 14 deletions
diff --git a/paludis/CMakeLists.txt b/paludis/CMakeLists.txt
index 8677d526c..eaee6bbae 100644
--- a/paludis/CMakeLists.txt
+++ b/paludis/CMakeLists.txt
@@ -46,7 +46,7 @@ execute_process(COMMAND
BUILDHOST
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND
- date +%&-%m-%dT%H:%M:%S%z
+ date +%Y-%m-%dT%H:%M:%S%z
OUTPUT_VARIABLE
BUILDDATE
OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -223,15 +223,12 @@ if(ENABLE_PYTHON)
target_compile_definitions(libpaludispythonhooks
PRIVATE
-DPYTHONINSTALLDIR="${PALUDIS_PYTHON_INSTALL_DIR}")
- target_include_directories(libpaludispythonhooks
- PRIVATE
- ${PYTHON_INCLUDE_DIRS})
target_link_libraries(libpaludispythonhooks
PRIVATE
libpaludis
libpaludisutil
- Boost::python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
- ${PYTHON_LIBRARY})
+ Boost::python
+ Python::Python)
endif()
if(ENABLE_PBINS)
@@ -242,7 +239,8 @@ if(ENABLE_PBINS)
PRIVATE
libpaludis
libpaludisutil
- ${LibArchive_LIBRARIES})
+ LibArchive::LibArchive
+ )
endif()
if(ENABLE_STRIPPER)
diff --git a/paludis/repositories/e/CMakeLists.txt b/paludis/repositories/e/CMakeLists.txt
index fb0b19648..4d085452c 100644
--- a/paludis/repositories/e/CMakeLists.txt
+++ b/paludis/repositories/e/CMakeLists.txt
@@ -7,14 +7,12 @@ if(ENABLE_XML)
paludis_add_library(libpaludiserepositoryxmlthings
"${CMAKE_CURRENT_SOURCE_DIR}/xml_things.cc")
- target_include_directories(libpaludiserepositoryxmlthings
- PRIVATE
- ${LIBXML2_INCLUDE_DIR})
target_link_libraries(libpaludiserepositoryxmlthings
PRIVATE
libpaludis
libpaludisutil
- ${LIBXML2_LIBRARIES})
+ LibXml2::LibXml2
+ )
endif()
paludis_add_library(libpaludiserepository
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash
index e72a998bc..570de0124 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash
@@ -49,7 +49,7 @@ exheres_internal_config()
if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
SANDBOX_WRITE="${old_sandbox_write}"
- esandbox check >/dev/null 2>&1 && esandbox allow "${ROOT}"
+ esandbox check >/dev/null 2>&1 && esandbox disallow "${ROOT}"
fi
true
}
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash
index be3ea99ae..24bc95c78 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash
@@ -49,7 +49,7 @@ exheres_internal_postinst()
if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
SANDBOX_WRITE="${old_sandbox_write}"
- esandbox check >/dev/null 2>&1 && esandbox allow "${ROOT}"
+ esandbox check >/dev/null 2>&1 && esandbox disallow "${ROOT}"
fi
true
}
diff --git a/paludis/repositories/e/ebuild/utils/CMakeLists.txt b/paludis/repositories/e/ebuild/utils/CMakeLists.txt
index 6633a3194..bfe61de2a 100644
--- a/paludis/repositories/e/ebuild/utils/CMakeLists.txt
+++ b/paludis/repositories/e/ebuild/utils/CMakeLists.txt
@@ -14,7 +14,8 @@ if(ENABLE_PBINS)
"${CMAKE_CURRENT_SOURCE_DIR}/unpaxinate.cc")
target_link_libraries(unpaxinate
PRIVATE
- ${LibArchive_LIBRARIES})
+ LibArchive::LibArchive
+ )
endif()
add_executable(print_exports