root
6 years ago
parent
670aeee59a
commit
6300bb8016
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST simon-0.4.1.tar.bz2 23856024 BLAKE2B 12b89f823ff9d13faed71d2ad5e61f3f9ca005589019687b39f79b6ff143efc1f578ebc4d36fae6f3bfa278f3fffcf5a73a411ffa403add906c51d8fab0795ab SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d
|
||||
DIST simon-0.4.90.tar.xz 25257276 BLAKE2B d5f78c721dc55387db415a740b00831471d6325d3aa2a0282e476132d2c7e378c4b024500527fd54a4073e972494e6ecc6f094022b5651b163d78ff6fcb20fcf SHA512 88b225e6d0168b87241649019376c8726fb3cc96ccbb985fd3dac5f5b67ed2d84de2756537300d7944797bceb7e340cdaf1c5aed731c1a7e2873d284ca3f94c1
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -14,6 +14,9 @@
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
|
||||
|
||||
+# NLS
|
||||
+option(ENABLE_NLS "Enable native language support" 1)
|
||||
+
|
||||
find_package(KDE4 "4.4" REQUIRED)
|
||||
find_package(Qt4 COMPONENTS QtCore QtDbus QtGui QtTest QtXml QtScript QtConcurrent REQUIRED)
|
||||
find_package(Qwt6 REQUIRED)
|
||||
@@ -143,4 +146,6 @@
|
||||
macro_display_feature_log()
|
||||
|
||||
include(MacroOptionalAddSubdirectory)
|
||||
-macro_optional_add_subdirectory( po )
|
||||
+if(ENABLE_NLS)
|
||||
+ macro_optional_add_subdirectory( po )
|
||||
+endif(ENABLE_NLS)
|
||||
--- a/doc/CMakeLists.txt
|
||||
+++ b/doc/CMakeLists.txt
|
||||
@@ -1,11 +1,15 @@
|
||||
+if(ENABLE_NLS)
|
||||
+ # gettext behavior
|
||||
+ execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
|
||||
+ OUTPUT_VARIABLE UNSETLINGUAS)
|
||||
+set(langs pt_BR ca nl et de it pt es sv uk)
|
||||
+
|
||||
+ foreach(mylang ${langs})
|
||||
+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
|
||||
+ add_subdirectory(${mylang})
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+endif(ENABLE_NLS)
|
||||
+
|
||||
+# default doc
|
||||
add_subdirectory(en_US)
|
||||
-add_subdirectory(pt_BR)
|
||||
-add_subdirectory(ca)
|
||||
-add_subdirectory(nl)
|
||||
-add_subdirectory(et)
|
||||
-add_subdirectory(de)
|
||||
-add_subdirectory(it)
|
||||
-add_subdirectory(pt)
|
||||
-add_subdirectory(es)
|
||||
-add_subdirectory(sv)
|
||||
-add_subdirectory(uk)
|
||||
--- a/po/CMakeLists.txt
|
||||
+++ b/po/CMakeLists.txt
|
||||
@@ -11,25 +11,14 @@ endif (NOT GETTEXT_MSGMERGE_EXECUTABLE)
|
||||
if (NOT GETTEXT_MSGFMT_EXECUTABLE)
|
||||
MESSAGE(FATAL_ERROR "Please install msgmerge binary")
|
||||
endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
|
||||
-add_subdirectory(de)
|
||||
-add_subdirectory(da)
|
||||
-add_subdirectory(fr)
|
||||
-add_subdirectory(nl)
|
||||
-add_subdirectory(uk)
|
||||
-add_subdirectory(pt_BR)
|
||||
-add_subdirectory(pl)
|
||||
-add_subdirectory(es)
|
||||
-add_subdirectory(cs)
|
||||
-add_subdirectory(ro)
|
||||
-add_subdirectory(ca)
|
||||
-add_subdirectory(sk)
|
||||
-add_subdirectory(sl)
|
||||
-add_subdirectory(pt)
|
||||
-add_subdirectory(gl)
|
||||
-add_subdirectory(ca@valencia)
|
||||
-add_subdirectory(sv)
|
||||
-add_subdirectory(el)
|
||||
-add_subdirectory(fi)
|
||||
-add_subdirectory(it)
|
||||
-add_subdirectory(zh_TW)
|
||||
-add_subdirectory(et)
|
||||
+
|
||||
+# gettext behavior
|
||||
+execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
|
||||
+ OUTPUT_VARIABLE UNSETLINGUAS)
|
||||
+set(langs ca@valencia cs de da fr nl uk pt_BR pl es ro ca sl pt gl sk sv el fi it zh_TW et)
|
||||
+
|
||||
+foreach(mylang ${langs})
|
||||
+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
|
||||
+ add_subdirectory(${mylang})
|
||||
+ endif()
|
||||
+endforeach()
|
||||
@ -1,24 +0,0 @@
|
||||
From 81bd3d089a19f1e23383e2da7376740152540f7f Mon Sep 17 00:00:00 2001
|
||||
From: Rex Dieter <rdieter@math.unl.edu>
|
||||
Date: Mon, 6 Jul 2015 09:59:56 -0500
|
||||
Subject: omit unused reference to QWebView header
|
||||
|
||||
no cmake checks for QtWebKit either
|
||||
---
|
||||
simon/src/simonview.cpp | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/simon/src/simonview.cpp b/simon/src/simonview.cpp
|
||||
index 69673bc..7a1873d 100644
|
||||
--- a/simon/src/simonview.cpp
|
||||
+++ b/simon/src/simonview.cpp
|
||||
@@ -60,7 +60,6 @@
|
||||
#include <KDE/KComboBox>
|
||||
#include <QDesktopServices>
|
||||
#include <QTimeLine>
|
||||
-#include <QWebView>
|
||||
|
||||
#include <KMessageBox>
|
||||
#include <KApplication>
|
||||
--
|
||||
cgit v0.11.2
|
||||
@ -1,20 +0,0 @@
|
||||
From: Peter Grasch <me@bedahr.org>
|
||||
Date: Sat, 25 Jul 2015 08:45:03 +0000
|
||||
Subject: Adding OpenCV include directories to include path
|
||||
X-Git-Url: http://quickgit.kde.org/?p=simon.git&a=commitdiff&h=b4e663e5cc36511b15ef20865c723182cd3d88c9
|
||||
---
|
||||
Adding OpenCV include directories to include path
|
||||
---
|
||||
|
||||
|
||||
--- a/cmake/FindOpenCV.cmake
|
||||
+++ b/cmake/FindOpenCV.cmake
|
||||
@@ -61,6 +61,7 @@
|
||||
|
||||
## Include the standard CMake script
|
||||
include("${OpenCV_DIR}/OpenCVConfig.cmake")
|
||||
+ include_directories(${OpenCV_INCLUDE_DIRS})
|
||||
|
||||
## Search for a specific version
|
||||
set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
--- simon-0.4.1/CMakeLists.txt
|
||||
+++ simon-0.4.1/CMakeLists.txt
|
||||
@@ -59,11 +59,11 @@
|
||||
macro_optional_find_package(QAccessibilityClient)
|
||||
macro_log_feature(QAccessibilityClient_FOUND "qaccessibilityclient" "KDE client-side accessibility library" "https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient" FALSE "" "Required to enable ATSPI plugin.")
|
||||
|
||||
-find_package(Sphinxbase)
|
||||
+macro_optional_find_package(Sphinxbase)
|
||||
macro_log_feature(SphinxBase_LIBRARIES "Sphinxbase"
|
||||
"Open source toolkit for speech recognition" "http://cmusphinx.sourceforge.net/"
|
||||
FALSE "" "Required to build Sphinx backend")
|
||||
-find_package(Pocketsphinx)
|
||||
+macro_optional_find_package(Pocketsphinx)
|
||||
macro_log_feature(POCKETSPHINX_LIBRARIES "PocketSphinx"
|
||||
"PocketSphinx is a small-footprint continuous speech recognition system"
|
||||
"http://cmusphinx.sourceforge.net/" FALSE ""
|
||||
@ -1,89 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# KEEP KDE ECLASSES OUT OF HERE
|
||||
|
||||
# TODO: qaccessibilityclient support (not in portage)
|
||||
# https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient/repository
|
||||
# TODO: julius
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils multilib gnome2-utils cmake-utils
|
||||
|
||||
DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
|
||||
HOMEPAGE="http://simon-listens.org/"
|
||||
SRC_URI="mirror://kde/stable/simon/${PV}/src/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="libsamplerate nls opencv sphinx"
|
||||
|
||||
RDEPEND="
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtdbus:4
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtscript:4
|
||||
dev-qt/qtsql:4
|
||||
kde-frameworks/kdelibs:4[plasma(+)]
|
||||
media-libs/alsa-lib
|
||||
x11-libs/libX11
|
||||
x11-libs/libXtst
|
||||
x11-libs/qwt:6[qt4(+)]
|
||||
libsamplerate? ( media-libs/libsamplerate )
|
||||
nls? (
|
||||
kde-apps/kde4-l10n
|
||||
virtual/libintl
|
||||
)
|
||||
opencv? ( media-libs/opencv )
|
||||
sphinx? (
|
||||
>=app-accessibility/pocketsphinx-0.8
|
||||
>=app-accessibility/sphinxbase-0.8
|
||||
>=app-accessibility/SphinxTrain-1
|
||||
)
|
||||
!sphinx? ( app-accessibility/julius )"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-libdir.patch
|
||||
"${FILESDIR}"/${P}-linguas.patch
|
||||
"${FILESDIR}"/${P}-sphinx.patch
|
||||
"${FILESDIR}"/${P}-opencv-include.patch
|
||||
"${FILESDIR}"/${P}-no-qtwebkit.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
|
||||
-DBackendType=$(usex sphinx "both" "jhtk")
|
||||
$(cmake-utils_use_with sphinx Sphinxbase)
|
||||
$(cmake-utils_use_with sphinx Pocketsphinx)
|
||||
-DWITH_KdepimLibs=OFF
|
||||
$(cmake-utils_use_with libsamplerate LibSampleRate)
|
||||
$(cmake-utils_use_with opencv OpenCV)
|
||||
$(cmake-utils_use_enable nls NLS)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
|
||||
elog "optional dependencies:"
|
||||
elog " kde-apps/jovie (support for Jovie TTS system)"
|
||||
use sphinx && elog " app-accessibility/julius (alternative backend)"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -0,0 +1,76 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
EGIT_BRANCH="kf5"
|
||||
KDE_HANDBOOK="forceoptional"
|
||||
KDE_TEST="forceoptional"
|
||||
inherit kde5
|
||||
|
||||
DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
|
||||
HOMEPAGE="http://simon-listens.org/"
|
||||
[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS=""
|
||||
IUSE="libsamplerate opencv pim sphinx"
|
||||
|
||||
DEPEND="
|
||||
$(add_frameworks_dep karchive)
|
||||
$(add_frameworks_dep kcmutils)
|
||||
$(add_frameworks_dep kcompletion)
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kconfigwidgets)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kcrash)
|
||||
$(add_frameworks_dep kdbusaddons)
|
||||
$(add_frameworks_dep kdelibs4support)
|
||||
$(add_frameworks_dep kguiaddons)
|
||||
$(add_frameworks_dep khtml)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_frameworks_dep kiconthemes)
|
||||
$(add_frameworks_dep kio)
|
||||
$(add_frameworks_dep kparts)
|
||||
$(add_frameworks_dep ktexteditor)
|
||||
$(add_frameworks_dep kwidgetsaddons)
|
||||
$(add_frameworks_dep kxmlgui)
|
||||
$(add_kdeapps_dep okular)
|
||||
$(add_qt_dep qtconcurrent)
|
||||
$(add_qt_dep qtdbus)
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtnetwork)
|
||||
$(add_qt_dep qtsql)
|
||||
$(add_qt_dep qtwidgets)
|
||||
$(add_qt_dep qtxml)
|
||||
$(add_qt_dep qtx11extras)
|
||||
media-libs/alsa-lib
|
||||
media-libs/libqaccessibilityclient:5
|
||||
x11-libs/libX11
|
||||
x11-libs/libXtst
|
||||
x11-libs/qwt:6=[qt5]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_find_package pim KF5CalendarCore)
|
||||
$(cmake-utils_use_find_package pim KF5Akonadi)
|
||||
-DWITH_LibSampleRate=$(usex libsamplerate)
|
||||
-DWITH_OpenCV=$(usex opencv)
|
||||
-DBackendType=$(usex sphinx "both" "jhtk")
|
||||
$(cmake-utils_use_find_package sphinx Sphinxbase)
|
||||
$(cmake-utils_use_find_package sphinx Pocketsphinx)
|
||||
-DQWT_INCLUDE_DIR=/usr/include/qwt6
|
||||
-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
|
||||
)
|
||||
|
||||
kde5_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kde5_pkg_postinst
|
||||
|
||||
elog "Optional dependency:"
|
||||
use sphinx && elog " app-accessibility/julius (alternative backend)"
|
||||
}
|
||||
Binary file not shown.
@ -1,3 +1,3 @@
|
||||
DIST filebeat-5.5.2.tar.gz 18075191 BLAKE2B 9786cb8f3db003c86e4bc6d56fcac660b615e7e6ad82d0912f70c545f2af3caab605be739481355466438a1769c20b28db576d208af6b0af9620ce6408068215 SHA512 ad92b41a9ceaad6c6e6fc80d0adccd7fe03a7056d121484bcf35c6a46b2061a5ef6d32121dd12d59b51e7678769da5c405b1d549fa130631ae3f1989b78fba48
|
||||
DIST filebeat-5.6.4.tar.gz 18145215 BLAKE2B ff5c848a87365fd9c592a2a10d852cdca2e32206827c26e8f631c35015623c8fb85c49799d6bae91877a0d7e718f316856e8cf8833ef29694c7d1cef5d86b47c SHA512 1ae66b7dd81f04434d667ecc295a747f8c650ba1affb88d7ae358051c739634b75c64d9c52d55fe6ee0b65848ff1825e508426c03d7e822517f55602091e186a
|
||||
DIST filebeat-6.0.0.tar.gz 15118739 BLAKE2B 5b4e4998c98c52f65ad239a1002e499e042a37ccd4d53acc21c3647bbc9fc7dee913c7c3393684eccc962892d93d4ff62a91957888a46f38b8b3430c11d99c42 SHA512 6dbeecb640fe2e39b81be90fdd05d03c1b3ffddd20ef06ab7c51805eede82035a8d0a00de3132edb77594383095bd5e7a79609e3bdf3d62377140cde7ed3fcd7
|
||||
DIST filebeat-5.6.5.tar.gz 18145468 BLAKE2B 57f3320012d8c17b7b961dd6d843e982e3cc5fe0f39658ca5ccc2fb9056c8dd4527306b7cfe483d3fa39bef5892dd22c4f07f24aad1e804bd76cdda94b56a3e8 SHA512 f1c8ffa2521e0e15a14850199c3da83d8f8489d5f97364b205ee8120b56e2ae47055c78ed6a5ef2d0296f449339efa05f2d7bce7282b1e7f2e044d7ed3244d4c
|
||||
DIST filebeat-6.0.1.tar.gz 15150919 BLAKE2B 40149de3257d78a737d71f59f8be91a3bd60185f716ecc89dbe373283ab6481afe709ff573efb8b1079f2c571c6de036bd705dd082c3cba1eda44d282409247c SHA512 baf21acf38409b398f261509d25d2b009342fdde1fcd824c99d16cc279355ae5eb029699a5a7e3b6e58abdbed4ef5fda1b4058ed94b807fd5964ad24828585e2
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST logstash-5.5.3.zip 99551442 BLAKE2B ee29db9b606a3aae83c218d020fc8c17d19013411e3a0deb6c333489803f4d3d6809ac8806adf373e319888049826d0d4ce8f09ca6db3b1afdeb261321e349ba SHA512 a4328ad0b8192b7c5aaed155d608d9db6adeaefd640e461ef4467daa1a28a2ae25d6b2b1adcf47c5dd82b66fc1adbf8ba5f3eabcf7e69dd8719a5860795877aa
|
||||
DIST logstash-5.6.4.zip 109819435 BLAKE2B 63c7016c7fa38f92d2f6a43b9e3086014bc4d4fb67772d4156f8c9fb31bce7329e52734a30effca3fa9691bef81727be1c7da9b54bfc4ce97bc7487fe60a4862 SHA512 5382671758d905bbd89f9e05eff9ffcf4a3bbc4fca6f06844647c31df3f50198c297daa0151915c9ef1f0cd741ccb9fb12a7fa13cdc429463d92783c92624717
|
||||
DIST logstash-6.0.0.zip 118915764 BLAKE2B fd99a2d73c0f7bc381154f197353cb8a5f55f8c278b8381207b3bbeac13dd7850ae4b994dbcc582324b11e7a9bfa6807bcaeebf5506b5234bc6ba0ad62009182 SHA512 9d830f5a88e51b5076af13cc2909fd42c7a75de9466fdd0e7379dff20e7f6d6bfd97b6005278222fb3ab020aa98a572023fc36a7f7cde2eaa4d9a1745f3c82b4
|
||||
DIST logstash-5.6.5.zip 109135563 BLAKE2B 6846231439807dd4fc77ae86af849aaefcc9084482f2f88de6148da3d31ef583164da6749ebe0c4def83217e95729a933acbb3e04777db58639eaab91de06831 SHA512 f1dcbb8f67d2f2868e38646b56376428e0996cbf302837300939b8c7ff6d764417fccea40f90559c48441f939e6940e84501ee3ad1e29ad2538969f2cc12b2b8
|
||||
DIST logstash-6.0.1.zip 116215793 BLAKE2B 676810b9cd62f578e31e1d63d4aae8c920590905a7344434d5e14607bab0e3ce59e2740e6839491f44ce769b24330a7a060174dcb5e6cb9cf51a31d165ba990b SHA512 395e4e2ff199d9ffc5156901d6ba6ab17771ab8f8859acede74567b2294e2d7ee2a6693e79f7b3e82c8d5c1959ad259bfb22e7992670cdcd3b73c7b72a635a31
|
||||
|
||||
@ -1,8 +1,4 @@
|
||||
DIST puppet-agent_1.10.7-1xenial_amd64.deb 16449418 BLAKE2B c3b0e1328e981e5c2506770f658f69337b3877d885d4488db0c768728b627c92076c9f43cd9a35910e39ba19043da84125ec94605ea546ae848affafeb627fd1 SHA512 5c73eea444186cbd0d52e42a20858964db6e7f2b6e537274b5b0a44499cc2bb0622a4eb6a55fa10dcc3946bdae3bb00b9d228aa5d1d444cc53aeefddf11f7b5b
|
||||
DIST puppet-agent_1.10.7-1xenial_i386.deb 16182468 BLAKE2B 71efcc4db94ec237342f7f215b7f35d0912be72139310f7c37d046e5a02ba5f5b611a932d335b0aed609a338f0e39777c8732434e7f9e40401bc49ed6820767a SHA512 7d5a41af7619fe008fec5302e23482d688692affaeded4b0b2f4e693168c2ef6995beee5e2410a9cb2e7f99650119e9c5f8007ed65709ad623654bdd6c09e402
|
||||
DIST puppet-agent_1.10.9-1xenial_amd64.deb 16308224 BLAKE2B c7fb29e83b0aff89c01f9625b9233871e799bb85d80ec17e38f4ef598d9eb268c2bab04b7bb8304370c304909570ea93fd8f467d101f5e4a1c40aaa9794c5083 SHA512 5fc5d70a9fabeb73ac384875f485263c9e890d3792e56aa41f42de86c971190a21526381bb5330c2f52790e6aa82b9c1e5a7dd61f378b086b78cab8de7120b5b
|
||||
DIST puppet-agent_1.10.9-1xenial_i386.deb 16202586 BLAKE2B 293d7802058caf762157c209e233a344d565c0d9a536b6aba92d787647f2b2708f45dedb80d0fb1a270f0867ec9aa91bdd91b8615e689ac98ca65bebf861fdb4 SHA512 19b84b5b6080c5b842877d9e7ee6b10837309c25e52429a14bc20939b18850eec616a5daa3a457d36504d51c9c0a8a9b71c3c9cb9c84dceb66e332a075b91e73
|
||||
DIST puppet-agent_5.1.0-1xenial_amd64.deb 15141786 BLAKE2B bcc71151acc47e2b5d0bd31a434ec0e9c72826d2ab386242100563c4016066bd5a646840b8f45fda5edb063c919c232043b911e981182bbf64dd63ef3a92440f SHA512 a210d225591328e2c041aad1dd7cfdac614531e1ceb524c3e35d3330962111bdc66408268550072e53190d6a10a7c8244b0bfa8a12b81f023883831c1fcbd070
|
||||
DIST puppet-agent_5.1.0-1xenial_i386.deb 15596316 BLAKE2B e8403835b18866dfaa22fa73041bd125542e071ceefb7f513853346ed0d767a33acfb3bddeaedfa1e08e3ff99cdc5904ce9208437c179b2153d585320f2c05a7 SHA512 9e364fc50baa081cc808c0e0277d6625f6064dad7d56fba352d552e9398e7197405a8c3e15fac4f569dfa11c7c4657261f06b8c90f04bef6fcc6a9794d94e927
|
||||
DIST puppet-agent_5.3.3-1xenial_amd64.deb 15647308 BLAKE2B 461532d697b645c6e36f0abaf6c366a6bbd6caeabb1f7f1fc9357e92b252555b1ab05ba433a2f3319008ba59eaa892dc9b8642070ae4322f9826e9f758937cfe SHA512 29c826d891a3930e18ed71a1c788819fe421b6a398d77ab21900feba457a386bad34ecb210d63054372af19de81eb31b13ea729adc3cb1fdd2fa09b0783b1e7d
|
||||
DIST puppet-agent_5.3.3-1xenial_i386.deb 16329408 BLAKE2B 7d024c3c39bd2ef495c2864f69aaba599cb26e8fc9bc924211780552436c275b5ef4a89db756cad77d1c1d30b5dec0b7561c871c97c9acdcedac550db212f972 SHA512 418c5f0a289d9c7335b49961dd6ad28340ed66cddbd476ca4f2fe6edbc3933c1d4841783d3a0f1f0ea1fab748c6f14f90ebc82fd02cf4046cde95c87b7b94548
|
||||
|
||||
@ -1,111 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
inherit eutils systemd unpacker user
|
||||
|
||||
DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
|
||||
HOMEPAGE="https://puppetlabs.com/"
|
||||
SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_BASE}_amd64.deb )
|
||||
x86? ( ${SRC_BASE}_i386.deb )
|
||||
"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="experimental puppetdb selinux"
|
||||
RESTRICT="strip"
|
||||
|
||||
CDEPEND="!app-admin/augeas
|
||||
!app-admin/mcollective
|
||||
!app-admin/puppet
|
||||
!dev-ruby/hiera
|
||||
!dev-ruby/facter
|
||||
!app-emulation/virt-what"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}"
|
||||
RDEPEND="${CDEPEND}
|
||||
app-portage/eix
|
||||
sys-apps/dmidecode
|
||||
sys-libs/glibc
|
||||
>=sys-libs/readline-6.0
|
||||
<sys-libs/readline-7.0
|
||||
selinux? (
|
||||
sys-libs/libselinux[ruby]
|
||||
sec-policy/selinux-puppet
|
||||
)
|
||||
puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
QA_PREBUILT="
|
||||
/opt/puppetlabs/puppet
|
||||
/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
|
||||
/opt/puppetlabs/puppet/lib/engines/*
|
||||
/opt/puppetlabs/puppet/lib/virt-what/*
|
||||
/opt/puppetlabs/puppet/lib/*
|
||||
/opt/puppetlabs/puppet/bin/*"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /var/run/puppet puppet
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use experimental; then
|
||||
epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# conf.d
|
||||
doconfd etc/default/puppet
|
||||
doconfd etc/default/mcollective
|
||||
doconfd etc/default/pxp-agent
|
||||
# logrotate.d
|
||||
insinto /etc/logrotate.d
|
||||
doins etc/logrotate.d/mcollective
|
||||
doins etc/logrotate.d/pxp-agent
|
||||
# puppet itself
|
||||
insinto /etc/puppetlabs
|
||||
doins -r etc/puppetlabs/*
|
||||
# logdir for systemd
|
||||
dodir var/log/puppetlabs/puppet/
|
||||
fperms 0750 var/log/puppetlabs/puppet/
|
||||
# the rest
|
||||
insinto /opt
|
||||
dodir opt/puppetlabs/puppet/cache
|
||||
doins -r opt/*
|
||||
fperms 0750 /opt/puppetlabs/puppet/cache
|
||||
# init
|
||||
newinitd "${FILESDIR}/puppet.initd" puppet
|
||||
newinitd "${FILESDIR}/mcollective.initd" mcollective
|
||||
systemd_dounit lib/systemd/system/puppet.service
|
||||
systemd_dounit lib/systemd/system/mcollective.service
|
||||
systemd_dounit lib/systemd/system/pxp-agent.service
|
||||
systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
|
||||
# symlinks
|
||||
chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
|
||||
chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
|
||||
dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
|
||||
dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
|
||||
dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
|
||||
dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
|
||||
dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
|
||||
dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
|
||||
dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
|
||||
dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
|
||||
dosym ../../opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
|
||||
}
|
||||
@ -1,104 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
inherit eutils systemd unpacker user
|
||||
|
||||
DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
|
||||
HOMEPAGE="https://puppetlabs.com/"
|
||||
SRC_BASE="http://apt.puppetlabs.com/pool/xenial/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_BASE}_amd64.deb )
|
||||
x86? ( ${SRC_BASE}_i386.deb )
|
||||
"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="puppetdb selinux"
|
||||
RESTRICT="strip"
|
||||
|
||||
CDEPEND="!app-admin/augeas
|
||||
!app-admin/mcollective
|
||||
!app-admin/puppet
|
||||
!dev-ruby/hiera
|
||||
!dev-ruby/facter
|
||||
!app-emulation/virt-what"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}"
|
||||
RDEPEND="${CDEPEND}
|
||||
app-portage/eix
|
||||
sys-apps/dmidecode
|
||||
sys-libs/glibc
|
||||
>=sys-libs/readline-6.0
|
||||
<sys-libs/readline-7.0
|
||||
selinux? (
|
||||
sys-libs/libselinux[ruby]
|
||||
sec-policy/selinux-puppet
|
||||
)
|
||||
puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
QA_PREBUILT="
|
||||
/opt/puppetlabs/puppet
|
||||
/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
|
||||
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
|
||||
/opt/puppetlabs/puppet/lib/engines/*
|
||||
/opt/puppetlabs/puppet/lib/virt-what/*
|
||||
/opt/puppetlabs/puppet/lib/*
|
||||
/opt/puppetlabs/puppet/bin/*"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /var/run/puppet puppet
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# conf.d
|
||||
doconfd etc/default/puppet
|
||||
doconfd etc/default/mcollective
|
||||
doconfd etc/default/pxp-agent
|
||||
# logrotate.d
|
||||
insinto /etc/logrotate.d
|
||||
doins etc/logrotate.d/mcollective
|
||||
doins etc/logrotate.d/pxp-agent
|
||||
# puppet itself
|
||||
insinto /etc/puppetlabs
|
||||
doins -r etc/puppetlabs/*
|
||||
# logdir for systemd
|
||||
dodir var/log/puppetlabs/puppet/
|
||||
fperms 0750 var/log/puppetlabs/puppet/
|
||||
# the rest
|
||||
insinto /opt
|
||||
dodir opt/puppetlabs/puppet/cache
|
||||
doins -r opt/*
|
||||
fperms 0750 /opt/puppetlabs/puppet/cache
|
||||
# init
|
||||
newinitd "${FILESDIR}/puppet.initd" puppet
|
||||
newinitd "${FILESDIR}/mcollective.initd" mcollective
|
||||
systemd_dounit lib/systemd/system/puppet.service
|
||||
systemd_dounit lib/systemd/system/mcollective.service
|
||||
systemd_dounit lib/systemd/system/pxp-agent.service
|
||||
systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
|
||||
# symlinks
|
||||
chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
|
||||
chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
|
||||
dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
|
||||
dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
|
||||
dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
|
||||
dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
|
||||
dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
|
||||
dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
|
||||
dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
|
||||
dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST puppetserver-2.8.0.tar.gz 34015599 BLAKE2B a26348947478e5b752311cb3450cf29fff4683da6f2eddc1ff8fd73d91f8432be0b542ac1de0c10ae56e8f75711a15ecbed1a125b2208386834ffa25718db7ec SHA512 7023278fe501614f1ff9650f72b9193054cb79888ce03f29932a10fa826ee07d67e96eee80a3f2c19007b8bae14008846ea850fb98544bcd39e1ada11fadd22c
|
||||
DIST puppetserver-5.0.0.tar.gz 66380485 BLAKE2B bce9b21dc8578da42dffc9d7105009e94f771748a0b466690126a4d32babf06b765c8aa20c1eea9e2f71baf6852bb88b44f430787cb57605ec322ad2cba065c5 SHA512 1dd7b332871abf12981a7ef33ee92a813275c86ca0cd72a24c3853679c3e93aaf264b76bf4108bf62c04021889e0b7ee0bb46963bd1f3df1f8e67c48e41698e8
|
||||
DIST puppetserver-5.1.4.tar.gz 66628031 BLAKE2B 815f0eb1508589855556ae0f82a2f595a22fd3e13a8168c7c2d8add0f7c18981bb220feee9573d29a94a06e13ac801797e6d96a9ef378c4a743889c938e4238f SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820
|
||||
|
||||
@ -1,129 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit multilib systemd tmpfiles user
|
||||
|
||||
DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
|
||||
HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
|
||||
SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="puppetdb"
|
||||
# will need the same keywords as puppet
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND+="
|
||||
>=virtual/jdk-1.8.0
|
||||
app-admin/puppet-agent[puppetdb?]"
|
||||
DEPEND+=""
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die
|
||||
sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die
|
||||
sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die
|
||||
sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
|
||||
sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
|
||||
sed -i 's/var\/run/run/g' install.sh || die
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
einfo "not compiling"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver
|
||||
insopts -m0774
|
||||
doins ext/ezbake-functions.sh
|
||||
insopts -m0644
|
||||
doins ext/ezbake.manifest
|
||||
doins puppet-server-release.jar
|
||||
doins jruby-9k.jar
|
||||
doins jruby-1_7.jar
|
||||
insinto /etc/puppetlabs/puppetserver
|
||||
doins ext/config/logback.xml
|
||||
doins ext/config/request-logging.xml
|
||||
insinto /etc/puppetlabs/puppetserver/services.d
|
||||
doins ext/system-config/services.d/bootstrap.cfg
|
||||
doins ext/config/services.d/ca.cfg
|
||||
insinto /etc/puppetlabs/puppetserver/conf.d
|
||||
doins ext/config/conf.d/puppetserver.conf
|
||||
doins ext/config/conf.d/auth.conf
|
||||
doins ext/config/conf.d/global.conf
|
||||
doins ext/config/conf.d/web-routes.conf
|
||||
doins ext/config/conf.d/metrics.conf
|
||||
doins ext/config/conf.d/webserver.conf
|
||||
insopts -m0755
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/scripts
|
||||
doins install.sh
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
|
||||
doins ext/cli/irb
|
||||
doins ext/cli/foreground
|
||||
doins ext/cli/gem
|
||||
doins ext/cli/ruby
|
||||
doins ext/cli/reload
|
||||
doins ext/cli/start
|
||||
doins ext/cli/stop
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/cli
|
||||
doins ext/cli_defaults/cli-defaults.sh
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/bin
|
||||
doins ext/bin/puppetserver
|
||||
insopts -m0644
|
||||
dodir /opt/puppetlabs/server/bin
|
||||
dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
|
||||
dodir /opt/puppetlabs/bin
|
||||
dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
|
||||
dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
|
||||
dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
|
||||
# other sys stuff
|
||||
dodir /etc/puppetlabs/code
|
||||
# needed for systemd
|
||||
dodir /var/log/puppetlabs/puppetserver
|
||||
dodir /etc/puppetlabs/puppet/ssl
|
||||
fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
|
||||
fperms -R 771 /etc/puppetlabs/puppet/ssl
|
||||
# init type tasks
|
||||
newconfd ext/default puppetserver
|
||||
newinitd "${FILESDIR}/puppetserver.init" puppetserver
|
||||
# systemd type things
|
||||
insinto /etc/systemd/system/puppetserver.service.d/
|
||||
newins ext/default gentoo.conf
|
||||
systemd_dounit ext/redhat/puppetserver.service
|
||||
# misc
|
||||
insinto /etc/logrotate.d
|
||||
newins ext/puppetserver.logrotate.conf puppetserver
|
||||
# cleanup
|
||||
dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
|
||||
fowners -R puppet:puppet /opt/puppetlabs/server/data
|
||||
fperms -R 775 /opt/puppetlabs/server/data/puppetserver
|
||||
fperms -R 700 /var/log/puppetlabs/puppetserver
|
||||
insinto /opt/puppetlabs/server/data
|
||||
newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
|
||||
newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "to install you may want to run the following:"
|
||||
elog
|
||||
elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
|
||||
elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
|
||||
elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
|
||||
elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
|
||||
elog "puppet config set --section master codedir /etc/puppetlabs/code"
|
||||
elog
|
||||
elog "# install puppetserver gems"
|
||||
elog "cd /opt/puppetlabs/server/apps/puppetserver"
|
||||
elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
|
||||
elog "while read LINE"
|
||||
elog "do"
|
||||
elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
|
||||
elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
|
||||
}
|
||||
@ -1,130 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit multilib systemd tmpfiles user
|
||||
|
||||
DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
|
||||
HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
|
||||
SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="puppetdb"
|
||||
# will need the same keywords as puppet
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND+="
|
||||
>=virtual/jdk-1.8.0
|
||||
app-admin/puppet-agent[puppetdb?]"
|
||||
DEPEND+=""
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
|
||||
sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
|
||||
sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
|
||||
sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
|
||||
sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
|
||||
sed -i 's/var\/run/run/g' install.sh || die
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
einfo "not compiling"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver
|
||||
insopts -m0774
|
||||
doins ext/ezbake-functions.sh
|
||||
insopts -m0644
|
||||
doins ext/ezbake.manifest
|
||||
doins puppet-server-release.jar
|
||||
doins jruby-9k.jar
|
||||
doins jruby-1_7.jar
|
||||
insinto /etc/puppetlabs/puppetserver
|
||||
doins ext/config/logback.xml
|
||||
doins ext/config/request-logging.xml
|
||||
insinto /etc/puppetlabs/puppetserver/services.d
|
||||
doins ext/system-config/services.d/bootstrap.cfg
|
||||
doins ext/config/services.d/ca.cfg
|
||||
insinto /etc/puppetlabs/puppetserver/conf.d
|
||||
doins ext/config/conf.d/puppetserver.conf
|
||||
doins ext/config/conf.d/auth.conf
|
||||
doins ext/config/conf.d/global.conf
|
||||
doins ext/config/conf.d/web-routes.conf
|
||||
doins ext/config/conf.d/metrics.conf
|
||||
doins ext/config/conf.d/webserver.conf
|
||||
insopts -m0755
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/scripts
|
||||
doins install.sh
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
|
||||
doins ext/cli/irb
|
||||
doins ext/cli/foreground
|
||||
doins ext/cli/gem
|
||||
doins ext/cli/ruby
|
||||
doins ext/cli/reload
|
||||
doins ext/cli/start
|
||||
doins ext/cli/stop
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/cli
|
||||
doins ext/cli_defaults/cli-defaults.sh
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/bin
|
||||
doins ext/bin/puppetserver
|
||||
insopts -m0644
|
||||
dodir /opt/puppetlabs/server/bin
|
||||
dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
|
||||
dodir /opt/puppetlabs/bin
|
||||
dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
|
||||
dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
|
||||
dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
|
||||
# other sys stuff
|
||||
dodir /etc/puppetlabs/code
|
||||
# needed for systemd
|
||||
dodir /var/log/puppetlabs/puppetserver
|
||||
dodir /etc/puppetlabs/puppet/ssl
|
||||
fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
|
||||
fperms -R 771 /etc/puppetlabs/puppet/ssl
|
||||
# systemd type things
|
||||
insinto /etc/systemd/system/puppetserver.service.d/
|
||||
systemd_dounit ext/redhat/puppetserver.service
|
||||
insinto /etc/default
|
||||
newins ext/default puppetserver
|
||||
# normal init type tasks
|
||||
dosym ../default/puppetserver /etc/conf.d/puppetserver
|
||||
newinitd "${FILESDIR}/puppetserver.init" puppetserver
|
||||
# misc
|
||||
insinto /etc/logrotate.d
|
||||
newins ext/puppetserver.logrotate.conf puppetserver
|
||||
# cleanup
|
||||
dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
|
||||
fowners -R puppet:puppet /opt/puppetlabs/server/data
|
||||
fperms -R 775 /opt/puppetlabs/server/data/puppetserver
|
||||
fperms -R 700 /var/log/puppetlabs/puppetserver
|
||||
insinto /opt/puppetlabs/server/data
|
||||
newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
|
||||
newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "to install you may want to run the following:"
|
||||
elog
|
||||
elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
|
||||
elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
|
||||
elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
|
||||
elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
|
||||
elog "puppet config set --section master codedir /etc/puppetlabs/code"
|
||||
elog
|
||||
elog "# install puppetserver gems"
|
||||
elog "cd /opt/puppetlabs/server/apps/puppetserver"
|
||||
elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
|
||||
elog "while read LINE"
|
||||
elog "do"
|
||||
elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
|
||||
elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B abe273c561569047ef4ea0b21b08341d207ecc9a37ba88d1aa28f00de8a0c28cab2942b3d461b7b4fea940668b44ceda7f9c71b6f7c7583143f4bf65adb54036 SHA512 00370f8b090156c064d9fe932e2aafe3f78ffc01bc47b2bc2f0f3c6cbdf98ea8cc2084317b8c2b1a9755cce404646b20e131039ce55b87e24f4401a55b95ff7e
|
||||
DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
|
||||
DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
@version: 3.13
|
||||
#
|
||||
# Syslog-ng default configuration file for Gentoo Linux
|
||||
|
||||
# https://bugs.gentoo.org/426814
|
||||
@include "scl.conf"
|
||||
|
||||
options {
|
||||
threaded(yes);
|
||||
chain_hostnames(no);
|
||||
|
||||
# The default action of syslog-ng is to log a STATS line
|
||||
# to the file every 10 minutes. That's pretty ugly after a while.
|
||||
# Change it to every 12 hours so you get a nice daily update of
|
||||
# how many messages syslog-ng missed (0).
|
||||
stats_freq(43200);
|
||||
# The default action of syslog-ng is to log a MARK line
|
||||
# to the file every 20 minutes. That's seems high for most
|
||||
# people so turn it down to once an hour. Set it to zero
|
||||
# if you don't want the functionality at all.
|
||||
mark_freq(3600);
|
||||
};
|
||||
|
||||
source src { system(); internal(); };
|
||||
|
||||
destination messages { file("/var/log/messages"); };
|
||||
|
||||
# By default messages are logged to tty12...
|
||||
destination console_all { file("/dev/tty12"); };
|
||||
# ...if you intend to use /dev/console for programs like xconsole
|
||||
# you can comment out the destination line above that references /dev/tty12
|
||||
# and uncomment the line below.
|
||||
#destination console_all { file("/dev/console"); };
|
||||
|
||||
log { source(src); destination(messages); };
|
||||
log { source(src); destination(console_all); };
|
||||
@ -0,0 +1,24 @@
|
||||
@version: 3.13
|
||||
#
|
||||
# Syslog-ng default configuration file for Gentoo FreeBSD
|
||||
#
|
||||
|
||||
# https://bugs.gentoo.org/426814
|
||||
@include "scl.conf"
|
||||
|
||||
options {
|
||||
threaded(yes);
|
||||
chain_hostnames(no);
|
||||
|
||||
# The default action of syslog-ng is to log a STATS line
|
||||
# to the file every 10 minutes. That's pretty ugly after a while.
|
||||
# Change it to every 12 hours so you get a nice daily update of
|
||||
# how many messages syslog-ng missed (0).
|
||||
stats_freq(43200);
|
||||
};
|
||||
|
||||
source src { system(); internal(); };
|
||||
|
||||
destination messages { file("/var/log/messages"); };
|
||||
|
||||
log { source(src); destination(messages); };
|
||||
@ -0,0 +1,115 @@
|
||||
@version: 3.13
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# https://bugs.gentoo.org/426814
|
||||
@include "scl.conf"
|
||||
|
||||
#
|
||||
# Syslog-ng configuration file, compatible with default hardened installations.
|
||||
#
|
||||
|
||||
options {
|
||||
threaded(yes);
|
||||
chain_hostnames(no);
|
||||
stats_freq(43200);
|
||||
};
|
||||
|
||||
source src {
|
||||
system();
|
||||
internal();
|
||||
};
|
||||
|
||||
source kernsrc {
|
||||
file("/proc/kmsg");
|
||||
};
|
||||
|
||||
#source net { udp(); };
|
||||
#log { source(net); destination(net_logs); };
|
||||
#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
|
||||
|
||||
destination authlog { file("/var/log/auth.log"); };
|
||||
destination _syslog { file("/var/log/syslog"); };
|
||||
destination cron { file("/var/log/cron.log"); };
|
||||
destination daemon { file("/var/log/daemon.log"); };
|
||||
destination kern { file("/var/log/kern.log"); };
|
||||
destination lpr { file("/var/log/lpr.log"); };
|
||||
destination user { file("/var/log/user.log"); };
|
||||
destination uucp { file("/var/log/uucp.log"); };
|
||||
#destination ppp { file("/var/log/ppp.log"); };
|
||||
destination mail { file("/var/log/mail.log"); };
|
||||
|
||||
destination avc { file("/var/log/avc.log"); };
|
||||
destination audit { file("/var/log/audit.log"); };
|
||||
destination pax { file("/var/log/pax.log"); };
|
||||
destination grsec { file("/var/log/grsec.log"); };
|
||||
|
||||
destination mailinfo { file("/var/log/mail.info"); };
|
||||
destination mailwarn { file("/var/log/mail.warn"); };
|
||||
destination mailerr { file("/var/log/mail.err"); };
|
||||
|
||||
destination newscrit { file("/var/log/news/news.crit"); };
|
||||
destination newserr { file("/var/log/news/news.err"); };
|
||||
destination newsnotice { file("/var/log/news/news.notice"); };
|
||||
|
||||
destination debug { file("/var/log/debug"); };
|
||||
destination messages { file("/var/log/messages"); };
|
||||
destination console { usertty("root"); };
|
||||
destination console_all { file("/dev/tty12"); };
|
||||
#destination loghost { udp("loghost" port(999)); };
|
||||
|
||||
destination xconsole { pipe("/dev/xconsole"); };
|
||||
|
||||
filter f_auth { facility(auth); };
|
||||
filter f_authpriv { facility(auth, authpriv); };
|
||||
filter f_syslog { not facility(authpriv, mail); };
|
||||
filter f_cron { facility(cron); };
|
||||
filter f_daemon { facility(daemon); };
|
||||
filter f_kern { facility(kern); };
|
||||
filter f_lpr { facility(lpr); };
|
||||
filter f_mail { facility(mail); };
|
||||
filter f_user { facility(user); };
|
||||
filter f_uucp { facility(uucp); };
|
||||
#filter f_ppp { facility(ppp); };
|
||||
filter f_news { facility(news); };
|
||||
filter f_debug { not facility(auth, authpriv, news, mail); };
|
||||
filter f_messages { level(info..warn)
|
||||
and not facility(auth, authpriv, mail, news); };
|
||||
filter f_emergency { level(emerg); };
|
||||
|
||||
filter f_info { level(info); };
|
||||
|
||||
filter f_notice { level(notice); };
|
||||
filter f_warn { level(warn); };
|
||||
filter f_crit { level(crit); };
|
||||
filter f_err { level(err); };
|
||||
|
||||
filter f_avc { message(".*avc: .*"); };
|
||||
filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
|
||||
filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
|
||||
filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
|
||||
|
||||
log { source(src); filter(f_authpriv); destination(authlog); };
|
||||
log { source(src); filter(f_syslog); destination(_syslog); };
|
||||
log { source(src); filter(f_cron); destination(cron); };
|
||||
log { source(src); filter(f_daemon); destination(daemon); };
|
||||
log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); };
|
||||
log { source(src); filter(f_lpr); destination(lpr); };
|
||||
log { source(src); filter(f_mail); destination(mail); };
|
||||
log { source(src); filter(f_user); destination(user); };
|
||||
log { source(src); filter(f_uucp); destination(uucp); };
|
||||
log { source(kernsrc); filter(f_pax); destination(pax); };
|
||||
log { source(kernsrc); filter(f_grsec); destination(grsec); };
|
||||
log { source(kernsrc); filter(f_audit); destination(audit); };
|
||||
log { source(kernsrc); filter(f_avc); destination(avc); };
|
||||
log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
|
||||
log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
|
||||
log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
|
||||
log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
|
||||
log { source(src); filter(f_news); filter(f_err); destination(newserr); };
|
||||
log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
|
||||
log { source(src); filter(f_debug); destination(debug); };
|
||||
log { source(src); filter(f_messages); destination(messages); };
|
||||
log { source(src); filter(f_emergency); destination(console); };
|
||||
#log { source(src); filter(f_ppp); destination(ppp); };
|
||||
log { source(src); destination(console_all); };
|
||||
@ -0,0 +1,42 @@
|
||||
# Config file for /etc/init.d/syslog-ng
|
||||
|
||||
# If you are not using network logging, this entire section should be
|
||||
# commented out. Otherwise, choose one of the settings below based on
|
||||
# how you are configuring your network.
|
||||
#
|
||||
# If you are using the net.* scripts to configure your network, you should
|
||||
# set rc_need to match the interface through which your logging server
|
||||
# can be reached.
|
||||
#rc_need="net.eth0"
|
||||
#
|
||||
# If you are using an interface manager like wicd, dhcpcd in standalone
|
||||
# mode, networkmanager, etc to control your interfaces, set rc_need to
|
||||
# the name of that service.
|
||||
# rc_need="dhcpcd"
|
||||
#rc_need="networkmanager"
|
||||
#
|
||||
# If you are using newnet and configuring your interface statically with
|
||||
# the network script, you should use this setting.
|
||||
#rc_need="network"
|
||||
#
|
||||
# You can use this setting, but I do not recommend relying on it.
|
||||
#rc_need="net"
|
||||
#
|
||||
# You may also want to uncomment the following if you are using network
|
||||
# logging.
|
||||
#rc_use="stunnel"
|
||||
|
||||
# For very customized setups these variables can be adjusted as needed
|
||||
# but for most situations they should remain commented:
|
||||
# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
|
||||
# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
|
||||
# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
|
||||
# SYSLOG_NG_PIDFILE_DIR=/run
|
||||
# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
|
||||
# SYSLOG_NG_GROUP=root
|
||||
# SYSLOG_NG_USER=root
|
||||
|
||||
# Put any additional options for syslog-ng here.
|
||||
# See syslog-ng(8) for more information.
|
||||
|
||||
SYSLOG_NG_OPTS=""
|
||||
@ -0,0 +1,58 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
|
||||
: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/syslog-ng}
|
||||
: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
|
||||
: ${SYSLOG_NG_PIDFILE_DIR:=/run}
|
||||
: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
|
||||
|
||||
: ${SYSLOG_NG_GROUP:=root}
|
||||
: ${SYSLOG_NG_USER:=root}
|
||||
|
||||
command="/usr/sbin/syslog-ng"
|
||||
command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
|
||||
extra_commands="checkconfig"
|
||||
extra_started_commands="reload"
|
||||
pidfile="${SYSLOG_NG_PIDFILE}"
|
||||
start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
|
||||
description="Syslog-ng is a syslog replacement with advanced filtering features."
|
||||
description_checkconfig="Check the configuration file that will be used by \"start\""
|
||||
description_reload="Reload the configuration without exiting"
|
||||
required_files="${SYSLOG_NG_CONFIGFILE}"
|
||||
required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
|
||||
|
||||
depend() {
|
||||
use clock
|
||||
need hostname localmount
|
||||
after bootmisc
|
||||
provide logger
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
|
||||
syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
|
||||
eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
checkconfig || return 1
|
||||
checkpath \
|
||||
-d \
|
||||
--mode 0700 \
|
||||
--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
|
||||
"${SYSLOG_NG_STATEFILE_DIR}"
|
||||
}
|
||||
|
||||
stop_pre() {
|
||||
[ "$RC_CMD" = "restart" ] && sleep 1
|
||||
return 0
|
||||
}
|
||||
|
||||
reload() {
|
||||
checkconfig || return 1
|
||||
ebegin "Reloading configuration and re-opening log files"
|
||||
start-stop-daemon --signal HUP --pidfile "${pidfile}"
|
||||
eend $?
|
||||
}
|
||||
@ -0,0 +1,167 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||
|
||||
inherit autotools python-single-r1 eutils multilib systemd versionator
|
||||
|
||||
MY_PV=${PV/_/}
|
||||
MY_PV_MM=$(get_version_component_range 1-2)
|
||||
DESCRIPTION="syslog replacement with advanced filtering features"
|
||||
HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
|
||||
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
amqp? ( >=net-libs/rabbitmq-c-0.8.0 )
|
||||
caps? ( sys-libs/libcap )
|
||||
dbi? ( >=dev-db/libdbi-0.9.0 )
|
||||
geoip? ( >=dev-libs/geoip-1.5.0 )
|
||||
http? ( net-misc/curl )
|
||||
json? ( >=dev-libs/json-c-0.9 )
|
||||
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
redis? ( >=dev-libs/hiredis-0.11.0 )
|
||||
smtp? ( net-libs/libesmtp )
|
||||
spoof-source? ( net-libs/libnet:1.1 )
|
||||
systemd? ( sys-apps/systemd )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
>=dev-libs/libpcre-6.1
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
!dev-libs/eventlog
|
||||
>=dev-libs/glib-2.10.1:2"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-libs/ivykis-0.36.1
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig"
|
||||
|
||||
S=${WORKDIR}/${PN}-${MY_PV}
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local f
|
||||
|
||||
use python && python_fix_shebang .
|
||||
|
||||
# remove bundled libs
|
||||
rm -rv lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
|
||||
|
||||
# drop scl modules requiring json
|
||||
if use !json; then
|
||||
sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
|
||||
eautoreconf
|
||||
fi
|
||||
|
||||
# use gentoo default path
|
||||
if use systemd; then
|
||||
sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
|
||||
-i contrib/systemd/syslog-ng@default || die
|
||||
fi
|
||||
|
||||
for f in "${FILESDIR}"/*logrotate*.in ; do
|
||||
local bn=$(basename "${f}")
|
||||
|
||||
sed \
|
||||
-e "$(usex systemd \
|
||||
's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng@default/' \
|
||||
's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
|
||||
"${f}" > "${T}/${bn/.in/}" || die
|
||||
done
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-docs \
|
||||
--disable-java \
|
||||
--disable-java-modules \
|
||||
--disable-riemann \
|
||||
--enable-manpages \
|
||||
--localstatedir=/var/lib/syslog-ng \
|
||||
--sysconfdir=/etc/syslog-ng \
|
||||
--with-embedded-crypto \
|
||||
--with-ivykis=system \
|
||||
--with-module-dir=/usr/$(get_libdir)/syslog-ng \
|
||||
--with-pidfile-dir=/var/run \
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
|
||||
$(use_enable amqp) \
|
||||
$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) \
|
||||
$(use_enable caps linux-caps) \
|
||||
$(use_enable dbi sql) \
|
||||
$(use_enable geoip) \
|
||||
$(use_enable http) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable json) \
|
||||
$(use_enable mongodb) \
|
||||
$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") \
|
||||
$(use_enable pacct) \
|
||||
$(use_enable python) \
|
||||
$(use_enable redis) \
|
||||
$(use_enable smtp) \
|
||||
$(use_enable spoof-source) \
|
||||
$(use_enable systemd) \
|
||||
$(use_enable tcpd tcp-wrapper)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
|
||||
contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
|
||||
"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
|
||||
|
||||
# Install default configuration
|
||||
insinto /etc/default
|
||||
doins contrib/systemd/syslog-ng@default
|
||||
|
||||
insinto /etc/syslog-ng
|
||||
if use userland_BSD ; then
|
||||
newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
|
||||
else
|
||||
newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
|
||||
fi
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${T}/syslog-ng.logrotate" syslog-ng
|
||||
|
||||
newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc" syslog-ng
|
||||
newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
|
||||
keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
|
||||
prune_libtool_files --modules
|
||||
|
||||
use python && python_optimize
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "For detailed documentation please see the upstream website:"
|
||||
elog "https://www.balabit.com/sites/default/files/documents/syslog-ng-ose-${MY_PV_MM}-guides/en/syslog-ng-ose-v${MY_PV_MM}-guide-admin/html/index.html"
|
||||
|
||||
# bug #355257
|
||||
if ! has_version app-admin/logrotate ; then
|
||||
echo
|
||||
elog "It is highly recommended that app-admin/logrotate be emerged to"
|
||||
elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
|
||||
elog "for logrotate to use."
|
||||
echo
|
||||
fi
|
||||
|
||||
if use systemd; then
|
||||
echo
|
||||
ewarn "The service file for systemd has changed to support multiple instances."
|
||||
ewarn "To start the default instance issue:"
|
||||
ewarn "# systemctl start syslog-ng@default"
|
||||
echo
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
DIST gpgme-1.10.0-beta81.tar.bz2 1293818 BLAKE2B 12dbc9120986943ace281c0f0f7020c71e5ed2760bcc85f7d427f731190df8b24779932b8fb8476372669960be28a9ce8af9622b534b4e3e7a9cd5180663f147 SHA512 be7b12c7c7df4fe5da574a6d443932bf4467175561c45a30bae8fe408fb916e05ce26f2b9add15e845351b3864491350060fe3436765ba0e84c167a7ec64066b
|
||||
DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
|
||||
DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
|
||||
|
||||
Binary file not shown.
@ -1,45 +1,21 @@
|
||||
DIST asar-0.12.1.tar.gz 1016626 BLAKE2B f3e2bee6e844fffcc19150f96cf4b20b5f6bf398d9c4c89f0527ded20478ad100e9fd1eadb3685ad05853b07b0e084c8cdcf99bb0d646e7f7acdcd9e3e9ec3cf SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7
|
||||
DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
|
||||
DIST atom-1.15.0.rpm 86561729 BLAKE2B 4b76613c955d0ad02d9bd13de1a969362b20bc7bdba6b912395c4a9de48d4130a427f6d0432411cc5acfd40d328e50c2461c847bc5c8b16dbf44147728491f9b SHA512 e8f5ceaae020f9fbf8cb1ffbef0f64b7b5d23a0be20d063591e3ba3b9fd33c771a028aca9aa0ecad254e250342d40106dac85bf6bdeff4de64da0b57fe6de3ea
|
||||
DIST atom-1.16.0.rpm 90249819 BLAKE2B a01866affda5bf206b1bec7966e35ca8889a4804f4972da853913602c779a5d6e3479cba24273a9e6e047cca403dab06fd19a07152c1e6b00783aa2df89eee29 SHA512 e3e9096caf6d5ca802ad47e434a6e8a51c0ab25b967747621e2ea4eb440d5401df3b7cd3d101d6d5a1f2f12fa77525e7e54e252438ff24ec9b651601bb7f4d97
|
||||
DIST atom-1.18.0.rpm 128551353 BLAKE2B 535016084340a347453e83120bde96b2100d5819f28c267caeb9dbe8f54f8caf455ccdeb3a20b7e5c8392170a8facf106e642efe5037e4c0d16c6a713cf73fd0 SHA512 c30df4b3c10e2e886c349a8c255ea6e9e308b38811f02b2517ba464959a873d159b5fa4fe89d68ed50500038b92219cb061d9dee0917b0b807e086cceec2803b
|
||||
DIST atom-1.20.1.tar.gz 9358859 BLAKE2B 5b20b29656ec70b4f885bf0cb2209903c3e344913acfb0802d25b3f6d0415c87849dd42a4d6515467c4a1e511e24e19487395f6f984161760077c8f4c34c7623 SHA512 a7f9edcfc84b81d768a92af5967a6889f85155c46a623b33e51999706e22f411ce570f42777fb3015174611ef19a956d8ed336ab1172612b27d75de8ef9c96fa
|
||||
DIST atom-1.21.0.tar.gz 9378180 BLAKE2B 3b2706d8b3691ffc2e55347ba415d5ff1a9cc085a6af92cd581f04d5288b4597fa1b83a0bf94b0e0c6cecca61d9be646065a5b3b27465890d63cbe173f47d81d SHA512 98afc286afc5ad46a28c3db7bfb7857c15a87711dae6b07046cd1aae5c7c2a30be847aec9eb779fdceaeb7e4f86f54ffd1262d6f0ba2d5a6c1b7d4ce5b8d2104
|
||||
DIST atom-bin-1.20.1.rpm 134506625 BLAKE2B ec25844e31f6d146a973698872d5141abab531e625312252bb2b5d2365a0daaf28e25e2cdc54c899582cb503b6e9b2705ca4d36ad7160ebc16d779d7ce7c6a61 SHA512 7bf8c4b092e0b45d56c5414d088633ae016b5564a7a97e1d706ad46743b6aad43a7268b7ade881680fa5f005eed0f46ba1523909a09cf3ec0aa51ce2335b8d92
|
||||
DIST atom-bin-1.21.0.rpm 131039632 BLAKE2B e155afd174896c7fee40f8ab6b3c25b49d1b1e023f63aaf3da4e0ea2baa68ff2dac65e9d6f9349f9ea1895675709544916ec04a947411de6b2a514f1507ec400 SHA512 8425b8d8741632e9fcc28127c8f2cbe5901c8a4a3b2a8a1cb5d4b1410374a841241e90939952db749334c829ac541925b3785a787c60adf32cfdfa5abc2e3b8a
|
||||
DIST atom-cached-run-in-this-context-0.4.1.tar.gz 3855 BLAKE2B 38a52632b94bc803a0ba2a6cd05a58443e2ecc5e780be5b51f500e4b6c06f03ec3dbb01bf2beb02a63f55ec6db21c61642a821259f090677137502c73b866fe4 SHA512 dca2a6c77bb94e704aa99b405ae017bf0c56ce536a7246a8feaf133722556d444fb684cd6b9b475abcd0b946a42073a9fc0d61f5141b564320ac023ab2fbf79d
|
||||
DIST atom-git-utils-4.1.2.tar.gz 36492 BLAKE2B b8cd425395a77e3f82f6d0505d32737f4e4630dc8f2f5ed6f025500ba377bfb0b90f2280d5b753263e98be2e978865e5bf470933535988255f6cd6ab5e569b36 SHA512 d1f0a5bbd6b059131ccf4ab92174d80caddbb254ea6d0676a5ce71d7dba55d60c86ed1c412862b9d104a5f6deb2671facad84841f9644afb9b37416b743e917a
|
||||
DIST atom-git-utils-5.0.0.tar.gz 36545 BLAKE2B 537dc044d1f471af5ad5d9befcc7a6c5e4e2a68c84f97eb1fd76a3d608ccc2b856cae6b939964d2c67c367b25e076f3ccf1712f8dc073b5196409fda11e99287 SHA512 42fd7589ca56049b1ad5cf7f2df7e295fc8575f4eee8a562fa103541157bd487c1748e3d6c536237b260dcbb4b530619dfcc121ba84b6d2fbf6d684dc959f819
|
||||
DIST atom-keyboard-layout-2.0.11.tar.gz 19294 BLAKE2B 9f3749b9c46383cfbebed98416ea1901219c857c25225951cdc0e55c4bc60c9fe3d450d3240cc72857e75593c92749f25ce5f5ba975113c302c263714115d29f SHA512 e7cbf3e8686ce6a86549d913523db75af623d4c5a18104f911b7f3931c273b87b4695b9b85afaea9a5cb440201b34d9e7445786c9328b87a5b58176cf2dbb877
|
||||
DIST atom-keyboard-layout-2.0.12.tar.gz 19605 BLAKE2B f0c4c966e0469cb845c524d65318dda572f2c3461e6416fb9bd783a0e67e1dd0e242909cf004edeae6f00426dc0a40c0ebe7436a0c2529d382a10e0f23fe12f4 SHA512 ad6c3f9289ec015406fb85fde5e6dd5111b0fad70ec311df2d26dec257bfff674e65ff0827025b1394f3773ddf6957deb67fa5dba647d3bc5485b928b2cf966b
|
||||
DIST atom-node-ctags-3.0.0.tar.gz 15062 BLAKE2B c27c883dc98da78e0eb496bebb2848276f9f0ecfc41974cb22ce1bada648f1ee4e304322650fc02a59d98d8e649449906c44666a0595dfca171fac3e2a2c64fa SHA512 6f7277a0ff872991c365f811c635fd881c3e466c20219d8a7bdaf6fec7c26c5feaa7ae2118691a8d52ceb3ecfda6d795bf39dfda7f8df5a6d02388575a010f87
|
||||
DIST atom-node-keytar-3.0.2.tar.gz 5718 BLAKE2B be80724f87a8f07b57cd44b5cd77a8dd383b38bb6676c7bb23cf4c469c4f5df919b474d7aa79d15305529f79c777106155857a2bc4014a7f1557c59725bebbf1 SHA512 f08ec6e50071e6e8995244607144009eaa8fd61a1724c80c40ccfb497e2b4682b30d6a091de9480b78f49ceb11f1a655e12ccb6b43d3df34f7e089585381697a
|
||||
DIST atom-node-nslog-3.0.0.tar.gz 2774 BLAKE2B ddf49f9f27986e70c9f5a446cb8530ce3c447aca4c2603a1be67b24e82c8628b4181711539504d0af829082e856c6d8b644afa13e513a949c70d706874901459 SHA512 1891632486acfa014eec79f70b14d56d967670310e46dedccfc9dfa505581365765f6bd42ad538b29e74d7c7de83d045b4199dd634fc588734a1ee086dcddb0a
|
||||
DIST atom-node-oniguruma-6.1.0.tar.gz 661394 BLAKE2B 60ac2a1c5ca0584399afb6dafcb83fcb1fc271fe4746c111b1fe29a69e9e0956a0edaea54259e25ea597b8d10c6ad94e9e738fe06adbf5a23eedd35a271c310f SHA512 6443881353b61ad59d29cab6628f07d488e54df7b5a04ddffe4de11329e928b2a9cfc7582e22e0a90b6a3c6bf0e37873d8a5e34036cee5f7187ed4ae11fd6507
|
||||
DIST atom-node-oniguruma-6.2.1.tar.gz 662040 BLAKE2B 0372a0238978babb72b1f874dc351a313b953cb12869cec1dc2b0cc9c5dca7768518d907e2d4b616efb9226d7cf41c8ee2ac8ece6813d2a502eda157393b54a1 SHA512 5a7d601f58957eb2cca879bf1dccd32ba6be3d6728ceb7926ee9944e23d981d5a8e70a3cbc1ecb7a99f130760d0c8513539a00bbae731b49ab9cef18aec2e6cb
|
||||
DIST atom-node-pathwatcher-6.8.0.tar.gz 24627 BLAKE2B 5e1fab25b54e3ebfcadd9a938b5066fcec7089401698d0df35b5e3346cec4be00a593bf5c1f8be380b7a1216b0b2740c0bb047823e6c845db9cbf6951521ac8a SHA512 ccb4d1270ba91cf31c5725e985b7bf224a8878fbeeb5fd2e78e22de7e25d382fc5b1c9e05ce1f2c23968d4ca3018e1db611c9485dbbd6eca2169228fb0a136e9
|
||||
DIST atom-node-pathwatcher-6.9.0.tar.gz 24821 BLAKE2B bedd1bb454f8ecc040acf03aadc4703eb9f3a9291ed734d85e060f9bdfb7b142d14715cead34ab6f2230a55c40237ab708067206ff9c7894c94168905a61af7e SHA512 fc2842a6ee75981590b445c4f51ce3f44baabee879377397d5bd4092964c21e726be44b94ffd751bd496d66963fb71ff59fbdf9f9fc9c3f7cd83af1fd5d65fb6
|
||||
DIST atom-node-pathwatcher-7.0.0.tar.gz 24822 BLAKE2B 6d8d6bbff6c28d283eac8ef8d7d6a27a4373650ad579589dcf2065933d9690c8fb818959570e5dc9cef3437fcdd5a9ff3978e6c21e7890b3fc03b49ee825770c SHA512 c6d72809b7f07d31f8d1624d6aa7565d8db6f4844febbedee9cca16cfb258bf3f55eefbd9247a0ab3f732d5e7433616e25d9adf5692f382ce3129b0963228bde
|
||||
DIST atom-node-runas-3.1.1.tar.gz 6628 BLAKE2B 00f2c7aeb5c60c238437e818a7eefa5f8ae382e67e418cb9a33595326b04fa6de8fa1278205fbd619877789d8743d2c366c0c5fdb9b1db1dc2983a75269c1a4e SHA512 bada6e99ceb833c8c6e74f4b3116c49f21b54b922c1a27668312552779b9e5ccebf380b41c781d49c1c0dd0fdff6de8b71a0dcaf1f992892593e85f4572238df
|
||||
DIST atom-node-spellchecker-3.2.3.tar.gz 481966 BLAKE2B f5197f47ee60cb88e0fb2a2fde949e2c45e177ed966d723f04ca26ac38e1f171e8fad74d2451ed83da02e0a9f06dfe819196d3743acaeb38717a0c2463874327 SHA512 b0209fdfcbee53d289443e1c203a720888a82fa59648b4038c036c6afe68a6b04624e23267e69c36f23c185160d6ab84b1e4020047fbe6d94354e99d717a60b9
|
||||
DIST atom-nsfw-1.0.15.tar.gz 45222 BLAKE2B ac8fcebf840afa1f3357a34d53a7289dc37ec0d34b8f16fec2a5228fc0227210a957d31dfed8c3862bee0def1e76dbc06f04acae1827c874121cf9390779d8a3 SHA512 dc2337caf6f82f0cd205af4bf92bf7d28b8eae091f8bbfb41f4ce6a4fe20d8ea4c793d1c51684a34bee2d264c420904db73992dad78eb6d6e584909c28a17746
|
||||
DIST atom-scrollbar-style-3.2.0.tar.gz 4609 BLAKE2B ae931b9a95b5bfac619e5737336671e41c782279e2db6c7c5f3cd4df6d227a28b0fcb04e4b5e1372f84176da7be183aff7c4b655e2903935dfad889c0133e682 SHA512 fc3ddfe7582517df45d7258a5857ca05fbadb92417d68b0c77d1e89e54b3bdaef3a1624e29177ebe64a2a994e62e1d1f5cb438911e881124aeec359426fab1bc
|
||||
DIST atom-superstring-1.1.0.tar.gz 259961 BLAKE2B 7474bea436e8567ca4412a7e6e8dc7a37d35931103cce2fc301c7f7beb6c606011c936cef7db5532a26fc919a97a794af6e1599abd0fb407d6d4a99a1d606efd SHA512 880c97d696036065aeb4320dc71c88b49b22b04e6582c75310131e61d8067fdf3d26c901d7b22a2bfd2a2a2056f350ba9485b7e55410cdee9ef29f5a75a8af59
|
||||
DIST atom-superstring-1.2.1.tar.gz 264386 BLAKE2B ad2b19ab97bbf52244f08aca74a3b429829a40492db0761a4cc21969c060c042d018aebb4013e46f399a4474fb8a8c1170b16323a0f589dc612d2d2a9d4c4d12 SHA512 8641f44defb9248c4fd91c4c7d5117322f83613386693ab51c3e77c9ad95ae383f69e662b6a870196504d7d99cd23527a822e989babdd95f42b6ddf517df7afc
|
||||
DIST atom-1.22.1.tar.gz 9541647 BLAKE2B 8801172da7b59dcf0974dc916e83633d52de8419b28db46578851d528dfce55b8dff1103e8e485a54203a7732e9288254d4d1b6ce1328d5e7340412e45fa14be SHA512 fb1a27c59ee6db8c659eb91fb397def3c05bd094b8a0614eb81a0ffabddcd61d480783f37af303773a9a9d15712630966ac162f3978e00ea2d8f8ef1ac78191a
|
||||
DIST atom-1.23.0-beta1.tar.gz 9553918 BLAKE2B ed44c6fca17bad667da145e1bcea17ae85330f4bb0dadf886c7b9ab929e3f580cb074532b0cc60f96d75d4d2bb68fedd7c25c4569983d008a024575a6d9b21e2 SHA512 3bcbe9ab9090eeb26cc6f121349c2c6bc4a3bdd58c36b7a2452320dde851bb0e2e60ed8040f406ed560cfd1a3cc217f220d98755ae50b8b81f123fca8e33bd44
|
||||
DIST atom-bin-1.22.1.rpm 129683452 BLAKE2B 7f408fced77dd1a965521ca7d905b568c2e5c9db19f5948a7c4c711372d53dfcc9b0988d5ec7c1ee748b1a1a3edc7c8e1e7cb919a223069263004e8683694404 SHA512 bd8305a36a8f6755907de576fe02bba64fcff08f804cf22f784323f58440d7c5b251d8da34c74a679c2d7f66b5afdf11c897337a314e829e2b5f06573ef0bddc
|
||||
DIST atom-bin-1.23.0-beta1.rpm 129888621 BLAKE2B f32ee16773fcf4cc956fd21adb6c3a03e2ba07f2c7ce4518e2f2721b1cf6051bcee01934d657ade38050b8d4c2049d693bf53ccb834301e71078a81d6f2e87d7 SHA512 44c19db7452cbbf704950e2ce3347fa52525f44563744860061fd07880a7f7eaa958de8c954b634df7055c26953a99321c1aeb332cbd290d86369d0e3a31ccf9
|
||||
DIST atomdep-atom--nsfw-1.0.18.tar.gz 20870 BLAKE2B 2e90e2cc337b2d40805db44c48a6f9da2b4e749bd5d036bdeec78790286a0d0c7e4536a8d461480b91c45552ce1f6db06e6f70f975e52b2ec90146714c4a0fb9 SHA512 61c78a57d6b75fada687843bf0dca2f1a4d16a8546769789047a202fc831535ee206112962fc4680c7d37b4da3d611f6b5a153e1b6ab919e51759906288b09ff
|
||||
DIST atomdep-cached-run-in-this-context-0.4.1.tar.gz 2388 BLAKE2B 9cf59f69c3433a9982c1dedf58c03eef5e1ccf1275f92ed192a2de601f38caceea5926e9b3a8571e2124b83e49c99a14f262db39a44732e1ff6550d6cd46d500 SHA512 942db40139b0beda616a25628772e515ce92ceca3e9a5288b10920e68c35149c52677a975e6e30f278ec64f06ae341fa1fa00702b339b2fb8f7af1cf9685efe5
|
||||
DIST atomdep-ctags-3.0.0.tar.gz 12864 BLAKE2B 561a64734f67cd7943f2d6f972e4d1ec55913934357e7a0d3077c2910f938071b090f55880788ebeab5d7fcaa3009c8984a9045dc83089c46d276152653eb156 SHA512 af1d3764cc3a6bb781a9a2357eeb8503886fc14481c3dbe4a899d3c672fea9325524aed3a4c1c87965bc4cce2fbae20b56b32690849afc1fcb751cd5462adbcc
|
||||
DIST atomdep-fs-admin-0.1.6.tar.gz 5539 BLAKE2B 9ee1857152cca343673a270c1044ad33a3ddbfb5b8389f2e0449e99348d0bdd4aaaa7e4c07bfb8871ae840f1a69cd90074a769f80fa3cc7f914050bc6f45b29c SHA512 2474523d5441ad882000633a929bcdbc5771b859a80f16a69c15504ff240a59b558e2edb1ca6e12ce91ad58da935243f3950a16e664529c59da70b9912903ae7
|
||||
DIST atomdep-git-utils-5.0.0.tar.gz 4147470 BLAKE2B bb35abe46aa96791f9b79316edd64a31fd8d0bf7c34bdc20e4a5b3bdaa2e4f2a9e833d28a17368c3f23935e7321339248968669ad9b1599a99c0efbeb558099f SHA512 ffb2ecf8eb89f7e4cbf51e5953d4e547c4ccf21985a6177cffd5f958433ac7c98d36070ffea82dae65b02bed53c49ba94fc12fb4823e1ef985a350726fe46424
|
||||
DIST atomdep-git-utils-5.1.0.tar.gz 4141959 BLAKE2B 7504a4ba57b093da659ed0ba7319863636d7f9f1e9a6a4bbd4b6c6fcf9922c9ca32398b44550e4a94d519471ca5cf249976426583f998186398c147c6cce5636 SHA512 1f9c38646b25a526c0399d538e58864c552d65802402df82f8303a936374121db40f61195ea3254e56e31dd9d25b847b325264911f62d6beddfc24931a9367bf
|
||||
DIST atomdep-keyboard-layout-2.0.13.tar.gz 17881 BLAKE2B e86a399be545a43768a53d5d9279dae1bc4d87fd99af87a10861f2e3367d6786e3631f8dc77671b08b06e30290f2c97833402e3732a010ae31c7c1c02d9d6afd SHA512 5b155cddb0484edb47a334b21183eccabe6b376290b97b4469732541f4231337b526b90bc37d321ff6dc367d481b1e3c6feb5d39dc9ba67abef8914b53615a66
|
||||
DIST atomdep-keytar-4.0.4.tar.gz 6550 BLAKE2B 3195b13f0a611acef28447fcdc46647110f12acfb1a6a47076cf5562724886d2b48307116ef6965bc68b71e58c561771b51bc6f3900488347ef69a07aa1038aa SHA512 78544e3646ce0f772a9adae055e137034d4b0e83bb8b95647a4efe239bf4bdf863f05317f4b37b0d2ac89e6a6e0107abd0022ccd7abb4310a39fa1c07982b4d4
|
||||
DIST atomdep-keytar-4.0.5.tar.gz 15594 BLAKE2B 3ced4a3eca1036ce21435473d013bc98537959d8488425581089c230b3e6ce276264754c607c29adf9d9d6272bde10066b23c7de502030c35ff2a5d907b17a4b SHA512 bd4dcd75517c057bacfed57490b9c1614f52169cc786a167eb1b391bf83845b23cdc53e20c72e7902140a5da7f865ad8bdc2d456063ebc1b86f6cb9fa1178929
|
||||
DIST atomdep-nsfw-1.0.16.tar.gz 43214 BLAKE2B 261539bebfe494aad0b372f1837a87c7c2a410bb591df523ea25bd5acd008f7eb0e8460a218fd4ee70d98bc26dd166472e9ea0aea265971cf2e904da913dda88 SHA512 0060d7fb5016454aaaf7df438d973b9a389a6e5f7a166c5d402cf8ef8bcda724501c3bfbd44e37e9e6c38d5f1decaeb48c571aad9145dec38ba0c94073b9702a
|
||||
DIST atomdep-nslog-3.0.0.tar.gz 2270 BLAKE2B 3258b7e7d7f94a89b0e5a21bfedfbe71bbfe3d776871aaeb3443ce6a7759860abfef2b8af823dab009183b5378c1ed06c7b2729df9acc09d3c5ea6a5f47ff160 SHA512 6a0ce8970ae12fdefd0935916e5501bb89e366fb66b05fffade884f3adf4add4b135eb4f0f208684e28424fdb9858ee8193eb1f3db1f7eac3cb49bdb5d1a4bb1
|
||||
DIST atomdep-oniguruma-6.2.1.tar.gz 586350 BLAKE2B 65574ef004c98cced7a9f5917845015ccd84b2383a85d889365da5c73313114454458b441bf6588eaee2a17150d674b7754ccc0bbb2d68ae3d98f7d5ca63530e SHA512 faa46dc4c1b8d7e75ab54512de9a823c5b958a7ccb43333375b33e16de47a464ea2a9ba9996596a8359d423a3e8c9d63cc92a5162b3f9d44b4485304073b41f1
|
||||
DIST atomdep-pathwatcher-8.0.1.tar.gz 18357 BLAKE2B 8e2b86da307757c352d0cab5eff64cc31e6745bf10a982f6ef11a0fd92eeeadf5b438aaaaa00e679100600691e59ff7aa7badf33e62c33a2497b5573cf7b4711 SHA512 34df8fecf456753f1977517018e5ff78b143f2d36e1417435bfcac2f9b9f8bd045a8080e7d0ad5d2930c63fa110c539911447863c46e757a4bb8f8c4f5bda999
|
||||
DIST atomdep-runas-3.1.1.tar.gz 6197 BLAKE2B 4625b085aa280a120ab66d295c8ca90c59151c65c3f3798b462beeb9f4bd9821022c4fd3a85c49828e3dbca06df730f1f49605f9f25f1cbc6ad715511e00beec SHA512 29b01d8a1bd05f7f0ad7cf4472f13d12ff27524d44fc0c2ffcf87c187633ccdd5a2d9ae6af2a771eb8e2432b6a957451ea6a6c68d15aa861c4a29affac711d79
|
||||
DIST atomdep-scrollbar-style-3.2.0.tar.gz 3498 BLAKE2B 2d1a88f2764b5a51da92e41f5dd5424a4ffbc13ec9b2e826236097ff7ebb0babd22b4e4cd00873e786aa52d901eedce49bd102ad6398eda614734bdd78b8b4e3 SHA512 9f5fcc2bcb13cb81e95a52aa6db0c99ffd67c9cd48a9faf0223587359f4082c3e867cb384497dc6be3e8230b4cd035e910a7048d431e81a28dfded0bc572da18
|
||||
DIST atomdep-spellchecker-3.4.2.tar.gz 476093 BLAKE2B 17ea32be639ed3ea03593e8c29e0970068f36a0545edd9c962443b4d6d4f6d8954c09d93c54ea348a396d10b7bef743c7f25a5cbab7a449c9bb57b9a38886528 SHA512 8ed6fa4251cd79de6e77004ea91a438080df7109ebbe2c92934366c34433388bc30c8b1ebc97a47aa2a9f3eb28ac5ba2ccf3a0de9d6f59b2d3125ff7ff2c06a4
|
||||
DIST atomdep-spellchecker-3.4.3.tar.gz 480739 BLAKE2B 5549ca23c50efc4573cb990d8cd79bc564dd4890e8509915e89173c8cb49ed0f9d17ff22c73f61e00487f9a09de3e6b0de542a755fa3eeeb2cc8bd766016ec62 SHA512 cef2aa6adf95772f0d38760adb9a805ad540bfb422647486ccd63db7afcca508eb821b6099d9913912dd1b0881f3b5ccc62d203f2ce6bc47859f36a76c781376
|
||||
DIST atomdep-superstring-2.2.3.tar.gz 785373 BLAKE2B 01ecaf112b76dfe4957a8ded5af23d1dcdecf5ed92bda20ee034c1b1a0516d7f9157d7c8ad21bc005e14a00115b81c8dca18296cc01dc3146d58adf7c96e9ec3 SHA512 edb71f4cc54436f563b6491f71e8c6c78aa711d1da821619031062e5e85fd60d66f0bcb6a70184b1fd55f31724d63ed9ba9c872d6d80387710262e404541a355
|
||||
DIST nodejs-nan-2.4.0.tar.gz 157071 BLAKE2B 081881da40f1afa8dfe7edb9db7cad0aa96a8057f2b13a21c7a9eabc514e10da5837d4f7ea5144b78f958f1f14f38a944a475b23d994f94def72236a89fec80b SHA512 e6f3ab3f67c72b3cc9e6e6b9b5de0f73134ef504dedae5e68376198858a6796f00c35869438e0480f28006dd8f6be13dca3bcc436a1a6b28b1dea5cbc72f9e45
|
||||
DIST atomdep-spellchecker-3.4.4.tar.gz 481892 BLAKE2B 3bae26ffffbaffdbac6f082c6f33ea4f5127583663e1df3ed8d98cebed2ce11ea0d9965615e369383695df6ad55aa996e8968e6616415d359ffae640a679f47b SHA512 974b3ce9866ce7e3f30137856ea0f4b1348c105edb833a94620c6b53cfa7052c37575f6dcd160a322fa10c61babfc32c916786d9d44ad10efdb2ab3578620ac1
|
||||
DIST atomdep-superstring-2.2.13.tar.gz 793833 BLAKE2B b5e8003c25ec38da1eae92022e972467b33ab45ea9db918a0acae6af10abb8a48609d76318558d327d013f65ea01888450ceb991dbfed39530ddd7076f1cf995 SHA512 9e2ce1ec9dffc0ccd700ed4b2f069dfc6cf258ae842dfe7a5242db99c0899ad77a692d2697695c3ca6d42cf4b9c590e9f29f469399d519029052b7ed806b39f8
|
||||
DIST nodejs-nan-2.6.2.tar.gz 161949 BLAKE2B f74e8d56e67ae03e60e0be7752ed9527bd8499c01f7df8899f3eb6735b1286633753e8bf595781b6d3d1446df20483fc0377bd745be10c6bae0ad66426751b79 SHA512 d1b5ed12e90accfa117cb73b9432897631ed2dd6045f93fa8b53237a13cec0ec467b14c035e9e4d4a5c6588949c1c80b0eef48a46d5c9c0a1f81ef400da031c3
|
||||
|
||||
@ -1,405 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit python-single-r1 multiprocessing rpm
|
||||
|
||||
DESCRIPTION="A hackable text editor for the 21st Century"
|
||||
HOMEPAGE="https://atom.io"
|
||||
MY_PV="${PV//_/-}"
|
||||
|
||||
ELECTRON_V=1.3.13
|
||||
ELECTRON_SLOT=1.3
|
||||
|
||||
# All binary packages depend on this
|
||||
NAN_V=2.4.0
|
||||
|
||||
# Keep dep versions in sync with atom/package.json
|
||||
CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
|
||||
GIT_UTILS_V=4.1.2
|
||||
NODE_NSLOG_V=3.0.0
|
||||
NODE_ONIGURUMA_V=6.1.0
|
||||
NODE_PATHWATCHER_V=6.8.0
|
||||
NODE_RUNAS_V=3.1.1
|
||||
SCROLLBAR_STYLE_V=3.2.0
|
||||
SPELL_CHECK_V=0.70.2
|
||||
|
||||
# text-buffer dependencies
|
||||
SUPERSTRING_V=1.1.0
|
||||
|
||||
# apm dependency
|
||||
NODE_KEYTAR_V=3.0.2
|
||||
|
||||
# atom-keymap dependency
|
||||
KEYBOARD_LAYOUT_V=2.0.11
|
||||
|
||||
# symbols-view dependency
|
||||
NODE_CTAGS_V=3.0.0
|
||||
|
||||
# spell-check dependency
|
||||
NODE_SPELLCHECKER_V=3.2.3
|
||||
|
||||
ASAR_V=0.12.1
|
||||
|
||||
# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
|
||||
SRC_URI="
|
||||
https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-${MY_PV}.rpm
|
||||
https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
|
||||
https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
|
||||
https://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
|
||||
https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz
|
||||
https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz
|
||||
https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
|
||||
https://github.com/atom/superstring/archive/v${SUPERSTRING_V}.tar.gz -> atom-superstring-${SUPERSTRING_V}.tar.gz
|
||||
https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
|
||||
https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz
|
||||
https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz
|
||||
https://github.com/atom/node-pathwatcher/archive/v${NODE_PATHWATCHER_V}.tar.gz -> atom-node-pathwatcher-${NODE_PATHWATCHER_V}.tar.gz
|
||||
https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> atom-node-runas-${NODE_RUNAS_V}.tar.gz
|
||||
https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
|
||||
https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz
|
||||
"
|
||||
|
||||
BINMODS="
|
||||
cached-run-in-this-context
|
||||
node-ctags
|
||||
git-utils
|
||||
keyboard-layout
|
||||
node-nslog
|
||||
node-oniguruma
|
||||
node-pathwatcher
|
||||
node-runas
|
||||
node-keytar
|
||||
scrollbar-style
|
||||
node-spellchecker
|
||||
superstring
|
||||
"
|
||||
|
||||
RESTRICT="mirror"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=app-text/hunspell-1.3.3:=
|
||||
>=dev-libs/libgit2-0.23:=[ssh]
|
||||
>=gnome-base/libgnome-keyring-3.12:=
|
||||
>=dev-libs/oniguruma-5.9.5:=
|
||||
>=dev-util/ctags-5.8
|
||||
>=dev-util/electron-1.3.5:${ELECTRON_SLOT}
|
||||
x11-libs/libxkbfile"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
!sys-apps/apmd
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
get_install_suffix() {
|
||||
local c=(${SLOT//\// })
|
||||
local slot=${c[0]}
|
||||
local suffix
|
||||
|
||||
if [[ "${slot}" == "0" ]]; then
|
||||
suffix=""
|
||||
else
|
||||
suffix="-${slot}"
|
||||
fi
|
||||
|
||||
echo -n "${suffix}"
|
||||
}
|
||||
|
||||
get_install_dir() {
|
||||
echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
|
||||
}
|
||||
|
||||
get_electron_dir() {
|
||||
echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
|
||||
}
|
||||
|
||||
get_electron_nodedir() {
|
||||
echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
|
||||
}
|
||||
|
||||
enode_electron() {
|
||||
"$(get_electron_dir)"/node $@
|
||||
}
|
||||
|
||||
enodegyp_atom() {
|
||||
local apmpath="/usr/share/atom/resources/app/apm"
|
||||
local nodegyp="${S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
|
||||
|
||||
PATH="$(get_electron_dir):${PATH}" \
|
||||
enode_electron "${nodegyp}" \
|
||||
--nodedir="$(get_electron_nodedir)" $@ || die
|
||||
}
|
||||
|
||||
easar() {
|
||||
local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
|
||||
echo "asar" $@
|
||||
enode_electron "${asar}" $@ || die
|
||||
}
|
||||
|
||||
package_dir() {
|
||||
local binmod="${1//-/_}"
|
||||
local binmod_v="${binmod^^}_V"
|
||||
echo -n ${1}-${!binmod_v}
|
||||
}
|
||||
|
||||
_unpack_npm_package() {
|
||||
local a="${1}" basename suffix
|
||||
|
||||
basename=${a%.*}
|
||||
suffix=${basename##*.}
|
||||
if [[ "${suffix}" == "tar" ]]; then
|
||||
basename=${basename%.*}
|
||||
fi
|
||||
|
||||
unpack ${a}
|
||||
mv package "${basename}" || die
|
||||
}
|
||||
|
||||
_have_patches_for() {
|
||||
local _patches="${1}-*.patch" _find
|
||||
_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
|
||||
test -n "$_find"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
local a
|
||||
|
||||
for a in ${A} ; do
|
||||
case ${a} in
|
||||
*.rpm) srcrpm_unpack "${a}" ;;
|
||||
*) unpack "${a}" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
mkdir "${WORKDIR}/atom-${MY_PV}" || die
|
||||
mv "${WORKDIR}/usr" "${WORKDIR}/atom-${MY_PV}" || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local install_dir="$(get_install_dir)"
|
||||
local suffix="$(get_install_suffix)"
|
||||
local patch binmod _s nan_s="${WORKDIR}/nan-${NAN_V}"
|
||||
|
||||
cd "${S}/usr/share/atom/resources/app" || die
|
||||
eapply "${FILESDIR}/${PN}-python.patch"
|
||||
eapply "${FILESDIR}/${PN}-unbundle-electron.patch"
|
||||
|
||||
sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
|
||||
./atom.sh \
|
||||
|| die
|
||||
|
||||
sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
|
||||
./atom.sh \
|
||||
|| die
|
||||
|
||||
sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
|
||||
./atom.sh \
|
||||
|| die
|
||||
|
||||
local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)"
|
||||
sed -i -e \
|
||||
"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
|
||||
apm/bin/apm || die
|
||||
|
||||
sed -i -e \
|
||||
"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
|
||||
apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
|
||||
|
||||
rm apm/bin/node || die
|
||||
|
||||
sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
|
||||
"${S}/usr/share/applications/atom.desktop" || die
|
||||
|
||||
cd "${S}" || die
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
cd "${_s}" || die
|
||||
if _have_patches_for "${binmod}"; then
|
||||
for patch in "${FILESDIR}"/${binmod}-*.patch; do
|
||||
eapply "${patch}"
|
||||
done
|
||||
fi
|
||||
done
|
||||
|
||||
# Unbundle bundled libs from modules
|
||||
|
||||
_s="${WORKDIR}/$(package_dir git-utils)"
|
||||
${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
|
||||
--inplace --unbundle "git;libgit2;git2" \
|
||||
"${_s}/binding.gyp" || die
|
||||
|
||||
_s="${WORKDIR}/$(package_dir node-oniguruma)"
|
||||
${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
|
||||
--inplace --unbundle "onig_scanner;oniguruma;onig" \
|
||||
"${_s}/binding.gyp" || die
|
||||
|
||||
_s="${WORKDIR}/$(package_dir node-spellchecker)"
|
||||
${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
|
||||
--inplace --unbundle "spellchecker;hunspell;hunspell" \
|
||||
"${_s}/binding.gyp" || die
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
mkdir -p "${_s}/node_modules" || die
|
||||
ln -s "${nan_s}" "${_s}/node_modules/nan" || die
|
||||
done
|
||||
|
||||
# Unpack app.asar
|
||||
easar extract "${S}/usr/share/atom/resources/app.asar" "${S}/build/app"
|
||||
|
||||
cd "${S}" || die
|
||||
|
||||
eapply "${FILESDIR}/atom-1.13-apm-path.patch"
|
||||
eapply "${FILESDIR}/atom-license-path.patch"
|
||||
eapply "${FILESDIR}/atom-fix-app-restart.patch"
|
||||
eapply "${FILESDIR}/atom-marker-layer.patch"
|
||||
|
||||
sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
|
||||
"${S}/build/app/src/config-schema.js" || die
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local binmod _s
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
einfo "Configuring ${binmod}..."
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
cd "${_s}" || die
|
||||
enodegyp_atom configure
|
||||
done
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local binmod _s x
|
||||
local ctags_d="node_modules/symbols-view/vendor"
|
||||
local jobs=$(makeopts_jobs) gypopts
|
||||
|
||||
gypopts="--verbose"
|
||||
|
||||
if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
|
||||
gypopts+=" --jobs ${jobs}"
|
||||
fi
|
||||
|
||||
mkdir -p "${S}/build/modules/" || die
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
einfo "Building ${binmod}..."
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
cd "${_s}" || die
|
||||
enodegyp_atom ${gypopts} build
|
||||
x=${binmod##node-}
|
||||
mkdir -p "${S}/build/modules/${x}" || die
|
||||
cp build/Release/*.node "${S}/build/modules/${x}" || die
|
||||
done
|
||||
|
||||
# Put compiled binary modules in place
|
||||
_fix_binmods "${S}/build" "app"
|
||||
_fix_binmods "${S}/usr/share/atom/resources" "app"
|
||||
|
||||
# Remove non-Linux vendored ctags binaries
|
||||
rm "${S}/build/app/${ctags_d}/ctags-darwin" \
|
||||
"${S}/build/app/${ctags_d}/ctags-win32.exe" || die
|
||||
|
||||
# Re-pack app.asar
|
||||
# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
|
||||
cd "${S}/build" || die
|
||||
x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
|
||||
easar pack "${x}" "app" "app.asar"
|
||||
cd "${S}" || die
|
||||
}
|
||||
|
||||
_fix_binmods() {
|
||||
local _dir="${2}" _prefix="${1}" path relpath modpath mod depth link f d
|
||||
local cruft
|
||||
|
||||
(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
|
||||
| while IFS= read -r path; do
|
||||
f=$(basename "${path}")
|
||||
d=$(dirname "${path}")
|
||||
relpath=${path#${_prefix}}
|
||||
relpath=${relpath##/}
|
||||
relpath=${relpath#W${_dir}}
|
||||
modpath=$(dirname ${relpath})
|
||||
modpath=${modpath%build/Release}
|
||||
mod=$(basename ${modpath})
|
||||
|
||||
# must copy here as symlinks will cause the module loading to fail
|
||||
cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die
|
||||
cruft=$(find "${d}" -name '*.a' -print)
|
||||
if [[ -n "${cruft}" ]]; then
|
||||
rm ${cruft} || die
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
_fix_executables() {
|
||||
local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node
|
||||
|
||||
(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
|
||||
| while IFS= read -r f; do
|
||||
IFS= read -r shebang < "${f}"
|
||||
|
||||
if [[ ${shebang} == '#!'* ]]; then
|
||||
fperms +x "${f#${ED}}"
|
||||
if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
|
||||
einfo "Fixing node shebang in ${f#${ED}}"
|
||||
sed --follow-symlinks -i \
|
||||
-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
|
||||
fi
|
||||
fi
|
||||
done || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local install_dir="$(get_install_dir)"
|
||||
local suffix="$(get_install_suffix)"
|
||||
local ctags_d="node_modules/symbols-view/vendor"
|
||||
|
||||
cd "${S}" || die
|
||||
|
||||
# Replace vendored ctags with a symlink to system ctags
|
||||
rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
|
||||
ln -s "/usr/bin/ctags" \
|
||||
"${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
|
||||
|
||||
insinto "${install_dir}"
|
||||
|
||||
doins build/app.asar
|
||||
doins -r build/app.asar.unpacked
|
||||
doins -r usr/share/atom/resources/app
|
||||
|
||||
insinto /usr/share/applications/
|
||||
newins usr/share/applications/atom.desktop "atom${suffix}.desktop"
|
||||
|
||||
insinto /usr/share/icons/
|
||||
doins -r usr/share/icons/hicolor
|
||||
|
||||
exeinto "${install_dir}"
|
||||
newexe usr/share/atom/resources/app/atom.sh atom
|
||||
insinto /usr/share/licenses/"${PN}${suffix}"
|
||||
doins usr/share/atom/resources/LICENSE.md
|
||||
dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
|
||||
dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
|
||||
|
||||
_fix_executables "${install_dir}/app/apm/bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/.bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
|
||||
}
|
||||
@ -1,405 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit python-single-r1 multiprocessing rpm
|
||||
|
||||
DESCRIPTION="A hackable text editor for the 21st Century"
|
||||
HOMEPAGE="https://atom.io"
|
||||
MY_PV="${PV//_/-}"
|
||||
|
||||
ELECTRON_V=1.3.13
|
||||
ELECTRON_SLOT=1.3
|
||||
|
||||
# All binary packages depend on this
|
||||
NAN_V=2.4.0
|
||||
|
||||
# Keep dep versions in sync with atom/package.json
|
||||
CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
|
||||
GIT_UTILS_V=4.1.2
|
||||
NODE_NSLOG_V=3.0.0
|
||||
NODE_ONIGURUMA_V=6.1.0
|
||||
NODE_PATHWATCHER_V=6.9.0
|
||||
NODE_RUNAS_V=3.1.1
|
||||
SCROLLBAR_STYLE_V=3.2.0
|
||||
SPELL_CHECK_V=0.71.3
|
||||
|
||||
# text-buffer dependencies
|
||||
SUPERSTRING_V=1.1.0
|
||||
|
||||
# apm dependency
|
||||
NODE_KEYTAR_V=3.0.2
|
||||
|
||||
# atom-keymap dependency
|
||||
KEYBOARD_LAYOUT_V=2.0.11
|
||||
|
||||
# symbols-view dependency
|
||||
NODE_CTAGS_V=3.0.0
|
||||
|
||||
# spell-check dependency
|
||||
NODE_SPELLCHECKER_V=3.2.3
|
||||
|
||||
ASAR_V=0.12.1
|
||||
|
||||
# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
|
||||
SRC_URI="
|
||||
https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-${MY_PV}.rpm
|
||||
https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
|
||||
https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
|
||||
https://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
|
||||
https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz
|
||||
https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz
|
||||
https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
|
||||
https://github.com/atom/superstring/archive/v${SUPERSTRING_V}.tar.gz -> atom-superstring-${SUPERSTRING_V}.tar.gz
|
||||
https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
|
||||
https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz
|
||||
https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz
|
||||
https://github.com/atom/node-pathwatcher/archive/v${NODE_PATHWATCHER_V}.tar.gz -> atom-node-pathwatcher-${NODE_PATHWATCHER_V}.tar.gz
|
||||
https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> atom-node-runas-${NODE_RUNAS_V}.tar.gz
|
||||
https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
|
||||
https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz
|
||||
"
|
||||
|
||||
BINMODS="
|
||||
cached-run-in-this-context
|
||||
node-ctags
|
||||
git-utils
|
||||
keyboard-layout
|
||||
node-nslog
|
||||
node-oniguruma
|
||||
node-pathwatcher
|
||||
node-runas
|
||||
node-keytar
|
||||
scrollbar-style
|
||||
node-spellchecker
|
||||
superstring
|
||||
"
|
||||
|
||||
RESTRICT="mirror"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=app-text/hunspell-1.3.3:=
|
||||
>=dev-libs/libgit2-0.23:=[ssh]
|
||||
>=gnome-base/libgnome-keyring-3.12:=
|
||||
>=dev-libs/oniguruma-5.9.5:=
|
||||
>=dev-util/ctags-5.8
|
||||
>=dev-util/electron-1.3.5:${ELECTRON_SLOT}
|
||||
x11-libs/libxkbfile"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
!sys-apps/apmd
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
get_install_suffix() {
|
||||
local c=(${SLOT//\// })
|
||||
local slot=${c[0]}
|
||||
local suffix
|
||||
|
||||
if [[ "${slot}" == "0" ]]; then
|
||||
suffix=""
|
||||
else
|
||||
suffix="-${slot}"
|
||||
fi
|
||||
|
||||
echo -n "${suffix}"
|
||||
}
|
||||
|
||||
get_install_dir() {
|
||||
echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
|
||||
}
|
||||
|
||||
get_electron_dir() {
|
||||
echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
|
||||
}
|
||||
|
||||
get_electron_nodedir() {
|
||||
echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
|
||||
}
|
||||
|
||||
enode_electron() {
|
||||
"$(get_electron_dir)"/node $@
|
||||
}
|
||||
|
||||
enodegyp_atom() {
|
||||
local apmpath="/usr/share/atom/resources/app/apm"
|
||||
local nodegyp="${S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
|
||||
|
||||
PATH="$(get_electron_dir):${PATH}" \
|
||||
enode_electron "${nodegyp}" \
|
||||
--nodedir="$(get_electron_nodedir)" $@ || die
|
||||
}
|
||||
|
||||
easar() {
|
||||
local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
|
||||
echo "asar" $@
|
||||
enode_electron "${asar}" $@ || die
|
||||
}
|
||||
|
||||
package_dir() {
|
||||
local binmod="${1//-/_}"
|
||||
local binmod_v="${binmod^^}_V"
|
||||
echo -n ${1}-${!binmod_v}
|
||||
}
|
||||
|
||||
_unpack_npm_package() {
|
||||
local a="${1}" basename suffix
|
||||
|
||||
basename=${a%.*}
|
||||
suffix=${basename##*.}
|
||||
if [[ "${suffix}" == "tar" ]]; then
|
||||
basename=${basename%.*}
|
||||
fi
|
||||
|
||||
unpack ${a}
|
||||
mv package "${basename}" || die
|
||||
}
|
||||
|
||||
_have_patches_for() {
|
||||
local _patches="${1}-*.patch" _find
|
||||
_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
|
||||
test -n "$_find"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
local a
|
||||
|
||||
for a in ${A} ; do
|
||||
case ${a} in
|
||||
*.rpm) srcrpm_unpack "${a}" ;;
|
||||
*) unpack "${a}" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
mkdir "${WORKDIR}/atom-${MY_PV}" || die
|
||||
mv "${WORKDIR}/usr" "${WORKDIR}/atom-${MY_PV}" || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local install_dir="$(get_install_dir)"
|
||||
local suffix="$(get_install_suffix)"
|
||||
local patch binmod _s nan_s="${WORKDIR}/nan-${NAN_V}"
|
||||
|
||||
cd "${S}/usr/share/atom/resources/app" || die
|
||||
eapply "${FILESDIR}/${PN}-python.patch"
|
||||
eapply "${FILESDIR}/${PN}-unbundle-electron.patch"
|
||||
|
||||
sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
|
||||
./atom.sh \
|
||||
|| die
|
||||
|
||||
sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
|
||||
./atom.sh \
|
||||
|| die
|
||||
|
||||
sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
|
||||
./atom.sh \
|
||||
|| die
|
||||
|
||||
local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)"
|
||||
sed -i -e \
|
||||
"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
|
||||
apm/bin/apm || die
|
||||
|
||||
sed -i -e \
|
||||
"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
|
||||
apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
|
||||
|
||||
rm apm/bin/node || die
|
||||
|
||||
sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
|
||||
"${S}/usr/share/applications/atom.desktop" || die
|
||||
|
||||
cd "${S}" || die
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
cd "${_s}" || die
|
||||
if _have_patches_for "${binmod}"; then
|
||||
for patch in "${FILESDIR}"/${binmod}-*.patch; do
|
||||
eapply "${patch}"
|
||||
done
|
||||
fi
|
||||
done
|
||||
|
||||
# Unbundle bundled libs from modules
|
||||
|
||||
_s="${WORKDIR}/$(package_dir git-utils)"
|
||||
${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
|
||||
--inplace --unbundle "git;libgit2;git2" \
|
||||
"${_s}/binding.gyp" || die
|
||||
|
||||
_s="${WORKDIR}/$(package_dir node-oniguruma)"
|
||||
${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
|
||||
--inplace --unbundle "onig_scanner;oniguruma;onig" \
|
||||
"${_s}/binding.gyp" || die
|
||||
|
||||
_s="${WORKDIR}/$(package_dir node-spellchecker)"
|
||||
${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
|
||||
--inplace --unbundle "spellchecker;hunspell;hunspell" \
|
||||
"${_s}/binding.gyp" || die
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
mkdir -p "${_s}/node_modules" || die
|
||||
ln -s "${nan_s}" "${_s}/node_modules/nan" || die
|
||||
done
|
||||
|
||||
# Unpack app.asar
|
||||
easar extract "${S}/usr/share/atom/resources/app.asar" "${S}/build/app"
|
||||
|
||||
cd "${S}" || die
|
||||
|
||||
eapply "${FILESDIR}/atom-1.13-apm-path.patch"
|
||||
eapply "${FILESDIR}/atom-license-path.patch"
|
||||
eapply "${FILESDIR}/atom-fix-app-restart.patch"
|
||||
eapply "${FILESDIR}/atom-marker-layer.patch"
|
||||
|
||||
sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
|
||||
"${S}/build/app/src/config-schema.js" || die
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local binmod _s
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
einfo "Configuring ${binmod}..."
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
cd "${_s}" || die
|
||||
enodegyp_atom configure
|
||||
done
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local binmod _s x
|
||||
local ctags_d="node_modules/symbols-view/vendor"
|
||||
local jobs=$(makeopts_jobs) gypopts
|
||||
|
||||
gypopts="--verbose"
|
||||
|
||||
if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
|
||||
gypopts+=" --jobs ${jobs}"
|
||||
fi
|
||||
|
||||
mkdir -p "${S}/build/modules/" || die
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
einfo "Building ${binmod}..."
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
cd "${_s}" || die
|
||||
enodegyp_atom ${gypopts} build
|
||||
x=${binmod##node-}
|
||||
mkdir -p "${S}/build/modules/${x}" || die
|
||||
cp build/Release/*.node "${S}/build/modules/${x}" || die
|
||||
done
|
||||
|
||||
# Put compiled binary modules in place
|
||||
_fix_binmods "${S}/build" "app"
|
||||
_fix_binmods "${S}/usr/share/atom/resources" "app"
|
||||
|
||||
# Remove non-Linux vendored ctags binaries
|
||||
rm "${S}/build/app/${ctags_d}/ctags-darwin" \
|
||||
"${S}/build/app/${ctags_d}/ctags-win32.exe" || die
|
||||
|
||||
# Re-pack app.asar
|
||||
# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
|
||||
cd "${S}/build" || die
|
||||
x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
|
||||
easar pack "${x}" "app" "app.asar"
|
||||
cd "${S}" || die
|
||||
}
|
||||
|
||||
_fix_binmods() {
|
||||
local _dir="${2}" _prefix="${1}" path relpath modpath mod depth link f d
|
||||
local cruft
|
||||
|
||||
(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
|
||||
| while IFS= read -r path; do
|
||||
f=$(basename "${path}")
|
||||
d=$(dirname "${path}")
|
||||
relpath=${path#${_prefix}}
|
||||
relpath=${relpath##/}
|
||||
relpath=${relpath#W${_dir}}
|
||||
modpath=$(dirname ${relpath})
|
||||
modpath=${modpath%build/Release}
|
||||
mod=$(basename ${modpath})
|
||||
|
||||
# must copy here as symlinks will cause the module loading to fail
|
||||
cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die
|
||||
cruft=$(find "${d}" -name '*.a' -print)
|
||||
if [[ -n "${cruft}" ]]; then
|
||||
rm ${cruft} || die
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
_fix_executables() {
|
||||
local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node
|
||||
|
||||
(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
|
||||
| while IFS= read -r f; do
|
||||
IFS= read -r shebang < "${f}"
|
||||
|
||||
if [[ ${shebang} == '#!'* ]]; then
|
||||
fperms +x "${f#${ED}}"
|
||||
if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
|
||||
einfo "Fixing node shebang in ${f#${ED}}"
|
||||
sed --follow-symlinks -i \
|
||||
-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
|
||||
fi
|
||||
fi
|
||||
done || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local install_dir="$(get_install_dir)"
|
||||
local suffix="$(get_install_suffix)"
|
||||
local ctags_d="node_modules/symbols-view/vendor"
|
||||
|
||||
cd "${S}" || die
|
||||
|
||||
# Replace vendored ctags with a symlink to system ctags
|
||||
rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
|
||||
ln -s "/usr/bin/ctags" \
|
||||
"${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
|
||||
|
||||
insinto "${install_dir}"
|
||||
|
||||
doins build/app.asar
|
||||
doins -r build/app.asar.unpacked
|
||||
doins -r usr/share/atom/resources/app
|
||||
|
||||
insinto /usr/share/applications/
|
||||
newins usr/share/applications/atom.desktop "atom${suffix}.desktop"
|
||||
|
||||
insinto /usr/share/icons/
|
||||
doins -r usr/share/icons/hicolor
|
||||
|
||||
exeinto "${install_dir}"
|
||||
newexe usr/share/atom/resources/app/atom.sh atom
|
||||
insinto /usr/share/licenses/"${PN}${suffix}"
|
||||
doins usr/share/atom/resources/LICENSE.md
|
||||
dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
|
||||
dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
|
||||
|
||||
_fix_executables "${install_dir}/app/apm/bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/.bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
|
||||
}
|
||||
@ -1,411 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit python-single-r1 multiprocessing rpm
|
||||
|
||||
DESCRIPTION="A hackable text editor for the 21st Century"
|
||||
HOMEPAGE="https://atom.io"
|
||||
MY_PV="${PV//_/-}"
|
||||
|
||||
ELECTRON_V=1.3.13
|
||||
ELECTRON_SLOT=1.3
|
||||
|
||||
# All binary packages depend on this
|
||||
NAN_V=2.4.0
|
||||
|
||||
# Keep dep versions in sync with atom/package.json
|
||||
CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
|
||||
GIT_UTILS_V=5.0.0
|
||||
NODE_NSLOG_V=3.0.0
|
||||
NODE_ONIGURUMA_V=6.2.1
|
||||
NODE_PATHWATCHER_V=7.0.0
|
||||
NODE_RUNAS_V=3.1.1
|
||||
SCROLLBAR_STYLE_V=3.2.0
|
||||
SPELL_CHECK_V=0.71.4
|
||||
|
||||
# text-buffer dependencies
|
||||
SUPERSTRING_V=1.2.1
|
||||
|
||||
# apm dependency
|
||||
NODE_KEYTAR_V=3.0.2
|
||||
|
||||
# atom-keymap dependency
|
||||
KEYBOARD_LAYOUT_V=2.0.12
|
||||
|
||||
# symbols-view dependency
|
||||
NODE_CTAGS_V=3.0.0
|
||||
|
||||
# spell-check dependency
|
||||
NODE_SPELLCHECKER_V=3.2.3
|
||||
|
||||
NSFW_V=1.0.15
|
||||
|
||||
ASAR_V=0.12.1
|
||||
|
||||
# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
|
||||
SRC_URI="
|
||||
https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-${MY_PV}.rpm
|
||||
https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
|
||||
https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
|
||||
https://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
|
||||
https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz
|
||||
https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz
|
||||
https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
|
||||
https://github.com/atom/superstring/archive/v${SUPERSTRING_V}.tar.gz -> atom-superstring-${SUPERSTRING_V}.tar.gz
|
||||
https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
|
||||
https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz
|
||||
https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz
|
||||
https://github.com/atom/node-pathwatcher/archive/v${NODE_PATHWATCHER_V}.tar.gz -> atom-node-pathwatcher-${NODE_PATHWATCHER_V}.tar.gz
|
||||
https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> atom-node-runas-${NODE_RUNAS_V}.tar.gz
|
||||
https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
|
||||
https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz
|
||||
https://github.com/Axosoft/nsfw/archive/v${NSFW_V}.tar.gz -> atom-nsfw-${NSFW_V}.tar.gz
|
||||
"
|
||||
|
||||
BINMODS="
|
||||
cached-run-in-this-context
|
||||
node-ctags
|
||||
git-utils
|
||||
keyboard-layout
|
||||
node-nslog
|
||||
node-oniguruma
|
||||
node-pathwatcher
|
||||
node-runas
|
||||
node-keytar
|
||||
scrollbar-style
|
||||
node-spellchecker
|
||||
superstring
|
||||
nsfw
|
||||
"
|
||||
|
||||
RESTRICT="mirror"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=app-text/hunspell-1.3.3:=
|
||||
>=dev-libs/libgit2-0.23:=[ssh]
|
||||
>=gnome-base/libgnome-keyring-3.12:=
|
||||
>=dev-libs/oniguruma-5.9.5:=
|
||||
>=dev-util/ctags-5.8
|
||||
>=dev-util/electron-1.3.5:${ELECTRON_SLOT}
|
||||
x11-libs/libxkbfile"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
!sys-apps/apmd
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
get_install_suffix() {
|
||||
local c=(${SLOT//\// })
|
||||
local slot=${c[0]}
|
||||
local suffix
|
||||
|
||||
if [[ "${slot}" == "0" ]]; then
|
||||
suffix=""
|
||||
else
|
||||
suffix="-${slot}"
|
||||
fi
|
||||
|
||||
echo -n "${suffix}"
|
||||
}
|
||||
|
||||
get_install_dir() {
|
||||
echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
|
||||
}
|
||||
|
||||
get_electron_dir() {
|
||||
echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
|
||||
}
|
||||
|
||||
get_electron_nodedir() {
|
||||
echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
|
||||
}
|
||||
|
||||
enode_electron() {
|
||||
"$(get_electron_dir)"/node $@
|
||||
}
|
||||
|
||||
enodegyp_atom() {
|
||||
local apmpath="/usr/share/atom/resources/app/apm"
|
||||
local nodegyp="${S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
|
||||
|
||||
PATH="$(get_electron_dir):${PATH}" \
|
||||
enode_electron "${nodegyp}" \
|
||||
--nodedir="$(get_electron_nodedir)" $@ || die
|
||||
}
|
||||
|
||||
easar() {
|
||||
local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
|
||||
echo "asar" $@
|
||||
enode_electron "${asar}" $@ || die
|
||||
}
|
||||
|
||||
package_dir() {
|
||||
local binmod="${1//-/_}"
|
||||
local binmod_v="${binmod^^}_V"
|
||||
echo -n ${1}-${!binmod_v}
|
||||
}
|
||||
|
||||
_unpack_npm_package() {
|
||||
local a="${1}" basename suffix
|
||||
|
||||
basename=${a%.*}
|
||||
suffix=${basename##*.}
|
||||
if [[ "${suffix}" == "tar" ]]; then
|
||||
basename=${basename%.*}
|
||||
fi
|
||||
|
||||
unpack ${a}
|
||||
mv package "${basename}" || die
|
||||
}
|
||||
|
||||
_have_patches_for() {
|
||||
local _patches="${1}-*.patch" _find
|
||||
_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
|
||||
test -n "$_find"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
local a
|
||||
|
||||
for a in ${A} ; do
|
||||
case ${a} in
|
||||
*.rpm) srcrpm_unpack "${a}" ;;
|
||||
*) unpack "${a}" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
mkdir "${WORKDIR}/atom-${MY_PV}" || die
|
||||
mv "${WORKDIR}/usr" "${WORKDIR}/atom-${MY_PV}" || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local install_dir="$(get_install_dir)"
|
||||
local suffix="$(get_install_suffix)"
|
||||
local patch binmod _s nan_s="${WORKDIR}/nan-${NAN_V}"
|
||||
|
||||
cd "${S}/usr/share/atom/resources/app" || die
|
||||
eapply "${FILESDIR}/${PN}-python.patch"
|
||||
eapply "${FILESDIR}/${PN}-unbundle-electron.patch"
|
||||
|
||||
sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
|
||||
./atom.sh \
|
||||
|| die
|
||||
|
||||
sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
|
||||
./atom.sh \
|
||||
|| die
|
||||
|
||||
sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
|
||||
./atom.sh \
|
||||
|| die
|
||||
|
||||
local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)"
|
||||
sed -i -e \
|
||||
"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
|
||||
apm/bin/apm || die
|
||||
|
||||
sed -i -e \
|
||||
"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
|
||||
apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
|
||||
|
||||
rm apm/bin/node || die
|
||||
|
||||
sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
|
||||
"${S}/usr/share/applications/atom.desktop" || die
|
||||
|
||||
cd "${S}" || die
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
cd "${_s}" || die
|
||||
if _have_patches_for "${binmod}"; then
|
||||
for patch in "${FILESDIR}"/${binmod}-*.patch; do
|
||||
eapply "${patch}"
|
||||
done
|
||||
fi
|
||||
done
|
||||
|
||||
# Unbundle bundled libs from modules
|
||||
|
||||
_s="${WORKDIR}/$(package_dir git-utils)"
|
||||
${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
|
||||
--inplace --unbundle "git;libgit2;git2" \
|
||||
"${_s}/binding.gyp" || die
|
||||
|
||||
_s="${WORKDIR}/$(package_dir node-oniguruma)"
|
||||
${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
|
||||
--inplace --unbundle "onig_scanner;oniguruma;onig" \
|
||||
"${_s}/binding.gyp" || die
|
||||
|
||||
_s="${WORKDIR}/$(package_dir node-spellchecker)"
|
||||
${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
|
||||
--inplace --unbundle "spellchecker;hunspell;hunspell" \
|
||||
"${_s}/binding.gyp" || die
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
mkdir -p "${_s}/node_modules" || die
|
||||
ln -s "${nan_s}" "${_s}/node_modules/nan" || die
|
||||
done
|
||||
|
||||
mkdir "${S}/build" || die
|
||||
cp -a "${S}/usr/share/atom/resources/app" "${S}/build/app" || die
|
||||
|
||||
cd "${S}" || die
|
||||
|
||||
eapply "${FILESDIR}/atom-1.13-apm-path.patch"
|
||||
eapply "${FILESDIR}/atom-license-path.patch"
|
||||
eapply "${FILESDIR}/atom-fix-app-restart.patch"
|
||||
eapply "${FILESDIR}/atom-marker-layer.patch"
|
||||
|
||||
sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
|
||||
"${S}/build/app/src/config-schema.js" || die
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local binmod _s
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
einfo "Configuring ${binmod}..."
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
cd "${_s}" || die
|
||||
enodegyp_atom configure
|
||||
done
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local binmod _s x
|
||||
local ctags_d="node_modules/symbols-view/vendor"
|
||||
local jobs=$(makeopts_jobs) gypopts
|
||||
|
||||
gypopts="--verbose"
|
||||
|
||||
if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
|
||||
gypopts+=" --jobs ${jobs}"
|
||||
fi
|
||||
|
||||
mkdir -p "${S}/build/modules/" || die
|
||||
|
||||
for binmod in ${BINMODS}; do
|
||||
einfo "Building ${binmod}..."
|
||||
_s="${WORKDIR}/$(package_dir ${binmod})"
|
||||
cd "${_s}" || die
|
||||
enodegyp_atom ${gypopts} build
|
||||
x=${binmod##node-}
|
||||
mkdir -p "${S}/build/modules/${x}" || die
|
||||
cp build/Release/*.node "${S}/build/modules/${x}" || die
|
||||
done
|
||||
|
||||
# Put compiled binary modules in place
|
||||
_fix_binmods "${S}/build" "app"
|
||||
_fix_binmods "${S}/usr/share/atom/resources" "app"
|
||||
|
||||
# Remove non-Linux vendored ctags binaries
|
||||
rm "${S}/build/app/${ctags_d}/ctags-darwin" \
|
||||
"${S}/build/app/${ctags_d}/ctags-win32.exe" || die
|
||||
|
||||
# Re-pack app.asar
|
||||
# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
|
||||
cd "${S}/build" || die
|
||||
x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
|
||||
easar pack "${x}" "app" "app.asar"
|
||||
cd "${S}" || die
|
||||
}
|
||||
|
||||
_fix_binmods() {
|
||||
local _dir="${2}" _prefix="${1}" path relpath modpath mod depth link f d
|
||||
local cruft
|
||||
|
||||
(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
|
||||
| while IFS= read -r path; do
|
||||
f=$(basename "${path}")
|
||||
d=$(dirname "${path}")
|
||||
relpath=${path#${_prefix}}
|
||||
relpath=${relpath##/}
|
||||
relpath=${relpath#W${_dir}}
|
||||
modpath=$(dirname ${relpath})
|
||||
modpath=${modpath%build/Release}
|
||||
mod=$(basename ${modpath})
|
||||
|
||||
# must copy here as symlinks will cause the module loading to fail
|
||||
cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die
|
||||
cruft=$(find "${d}" -name '*.a' -print)
|
||||
if [[ -n "${cruft}" ]]; then
|
||||
rm ${cruft} || die
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
_fix_executables() {
|
||||
local _dir="${1}" _node_sb="#!$(get_electron_dir)"/node
|
||||
|
||||
(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
|
||||
| while IFS= read -r f; do
|
||||
IFS= read -r shebang < "${f}"
|
||||
|
||||
if [[ ${shebang} == '#!'* ]]; then
|
||||
fperms +x "${f#${ED}}"
|
||||
if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
|
||||
einfo "Fixing node shebang in ${f#${ED}}"
|
||||
sed --follow-symlinks -i \
|
||||
-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
|
||||
fi
|
||||
fi
|
||||
done || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local install_dir="$(get_install_dir)"
|
||||
local suffix="$(get_install_suffix)"
|
||||
local ctags_d="node_modules/symbols-view/vendor"
|
||||
|
||||
cd "${S}" || die
|
||||
|
||||
# Replace vendored ctags with a symlink to system ctags
|
||||
rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
|
||||
ln -s "/usr/bin/ctags" \
|
||||
"${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
|
||||
|
||||
insinto "${install_dir}"
|
||||
|
||||
doins build/app.asar
|
||||
doins -r build/app.asar.unpacked
|
||||
|
||||
insinto "${install_dir}/app"
|
||||
doins -r usr/share/atom/resources/app/apm
|
||||
|
||||
insinto /usr/share/applications/
|
||||
newins usr/share/applications/atom.desktop "atom${suffix}.desktop"
|
||||
|
||||
insinto /usr/share/icons/
|
||||
doins -r usr/share/icons/hicolor
|
||||
|
||||
exeinto "${install_dir}"
|
||||
newexe usr/share/atom/resources/app/atom.sh atom
|
||||
insinto /usr/share/licenses/"${PN}${suffix}"
|
||||
doins usr/share/atom/resources/LICENSE.md
|
||||
dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
|
||||
dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
|
||||
|
||||
_fix_executables "${install_dir}/app/apm/bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/.bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
|
||||
_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/build/app/src/config-schema.js b/build/app/src/config-schema.js
|
||||
index 1307db6..d6a1ba4 100644
|
||||
--- a/build/app/src/config-schema.js
|
||||
+++ b/build/app/src/config-schema.js
|
||||
@@ -21,6 +21,11 @@ var configSchema = {
|
||||
core: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
+ apmPath: {
|
||||
+ type: 'string',
|
||||
+ 'default': '/usr/bin/apm{{ATOM_SUFFIX}}',
|
||||
+ description: 'Path to apm executable.'
|
||||
+ },
|
||||
ignoredNames: {
|
||||
type: 'array',
|
||||
'default': ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db'],
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/src/config-schema.js b/src/config-schema.js
|
||||
index 39f0585..24ee2de 100644
|
||||
--- a/src/config-schema.js
|
||||
+++ b/src/config-schema.js
|
||||
@@ -5,6 +5,11 @@ const configSchema = {
|
||||
core: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
+ apmPath: {
|
||||
+ type: 'string',
|
||||
+ "default": '/usr/bin/apm{{ATOM_SUFFIX}}',
|
||||
+ description: 'Path to apm executable.'
|
||||
+ },
|
||||
ignoredNames: {
|
||||
type: 'array',
|
||||
default: ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db', 'desktop.ini'],
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/atom-application.js.orig b/atom-application.js
|
||||
index 92d985f..9a120e6 100644
|
||||
--- a/build/app/src/main-process/atom-application.js
|
||||
+++ b/build/app/src/main-process/atom-application.js
|
||||
@@ -1178,6 +1178,7 @@
|
||||
AtomApplication.prototype.restart = function() {
|
||||
var args;
|
||||
args = [];
|
||||
+ args.push("--app=" + this.resourcePath);
|
||||
if (this.safeMode) {
|
||||
args.push("--safe");
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/build/app/src/main-process/atom-application.js
|
||||
+++ b/build/app/src/main-process/atom-application.js
|
||||
@@ -406,7 +406,7 @@
|
||||
this.openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap');
|
||||
this.openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets');
|
||||
this.openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet');
|
||||
- this.openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'));
|
||||
+ this.openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md');
|
||||
this.disposable.add(ipcHelpers.on(app, 'before-quit', (function(_this) {
|
||||
return function(event) {
|
||||
if (!_this.quitting) {
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/build/app/node_modules/text-buffer/lib/marker-layer.js
|
||||
--- b/build/app/node_modules/text-buffer/lib/marker-layer.js
|
||||
@@ -192,7 +192,7 @@
|
||||
return function(markerId) {
|
||||
var marker;
|
||||
marker = _this.markersById[markerId];
|
||||
- if (!marker.matchesParams(params)) {
|
||||
+ if (marker == null || !marker.matchesParams(params)) {
|
||||
return;
|
||||
}
|
||||
return result.push(marker);
|
||||
@ -1,45 +0,0 @@
|
||||
From ea6d1be3558d7610ccc82b3a44dd30657a686639 Mon Sep 17 00:00:00 2001
|
||||
From: Elvis Pranskevichus <elvis@magic.io>
|
||||
Date: Thu, 27 Jul 2017 13:18:54 -0400
|
||||
Subject: [PATCH] Unbundle electron
|
||||
|
||||
---
|
||||
atom.sh | 13 ++++++-------
|
||||
1 file changed, 6 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/atom.sh b/atom.sh
|
||||
index 6b0e94430..ea8e0dc2e 100755
|
||||
--- a/atom.sh
|
||||
+++ b/atom.sh
|
||||
@@ -102,11 +102,10 @@ elif [ $OS == 'Linux' ]; then
|
||||
SCRIPT=$(readlink -f "$0")
|
||||
USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
|
||||
|
||||
- if [ -n "$BETA_VERSION" ]; then
|
||||
- ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
|
||||
- else
|
||||
- ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
|
||||
- fi
|
||||
+ export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}"
|
||||
+ export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}"
|
||||
+ export LOCAL_GIT_DIRECTORY="/usr"
|
||||
+ ATOM_PATH="{{ATOM_PATH}}"
|
||||
|
||||
ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
|
||||
mkdir -p "$ATOM_HOME"
|
||||
@@ -116,11 +115,11 @@ elif [ $OS == 'Linux' ]; then
|
||||
[ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
|
||||
|
||||
if [ $EXPECT_OUTPUT ]; then
|
||||
- "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
|
||||
+ "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
|
||||
exit $?
|
||||
else
|
||||
(
|
||||
- nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
|
||||
+ nohup "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
cat "$ATOM_HOME/nohup.out"
|
||||
exit $?
|
||||
--
|
||||
2.13.3
|
||||
Binary file not shown.
@ -1,122 +0,0 @@
|
||||
From e91ae73f593115dba1f77af6a3af30cf2219f880 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <e91ae73f593115dba1f77af6a3af30cf2219f880.1483650125.git.robbat2@gentoo.org>
|
||||
From: "Robin H. Johnson" <robbat2@gentoo.org>
|
||||
Date: Thu, 29 Sep 2016 08:57:28 -0700
|
||||
Subject: [PATCH-2.17] kvm: use_guest_agent: QEMU Guest Agent support
|
||||
|
||||
Implement the QEMU Guest Agent sockets, so that code/scripts on the
|
||||
hypervisors can communicate with guest operating systems easily.
|
||||
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
---
|
||||
lib/hypervisor/hv_kvm/__init__.py | 23 +++++++++++++++++++++++
|
||||
man/gnt-instance.rst | 7 +++++++
|
||||
src/Ganeti/Constants.hs | 5 +++++
|
||||
3 files changed, 35 insertions(+)
|
||||
|
||||
diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
|
||||
index ac02ff56c..b865d6f3a 100644
|
||||
--- a/lib/hypervisor/hv_kvm/__init__.py
|
||||
+++ b/lib/hypervisor/hv_kvm/__init__.py
|
||||
@@ -497,6 +497,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
|
||||
constants.HV_MIGRATION_BANDWIDTH: hv_base.REQ_NONNEGATIVE_INT_CHECK,
|
||||
constants.HV_MIGRATION_DOWNTIME: hv_base.REQ_NONNEGATIVE_INT_CHECK,
|
||||
constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
|
||||
+ constants.HV_USE_GUEST_AGENT: hv_base.NO_CHECK,
|
||||
constants.HV_USE_LOCALTIME: hv_base.NO_CHECK,
|
||||
constants.HV_DISK_CACHE:
|
||||
hv_base.ParamInSet(True, constants.HT_VALID_CACHE_TYPES),
|
||||
@@ -750,6 +751,13 @@ class KVMHypervisor(hv_base.BaseHypervisor):
|
||||
"""
|
||||
return utils.PathJoin(cls._CTRL_DIR, "%s.qmp" % instance_name)
|
||||
|
||||
+ @classmethod
|
||||
+ def _InstanceQemuGuestAgentMonitor(cls, instance_name):
|
||||
+ """Returns the instance serial QEMU Guest Agent socket name
|
||||
+
|
||||
+ """
|
||||
+ return utils.PathJoin(cls._CTRL_DIR, "%s.qga" % instance_name)
|
||||
+
|
||||
@classmethod
|
||||
def _InstanceKvmdMonitor(cls, instance_name):
|
||||
"""Returns the instance kvm daemon socket name
|
||||
@@ -836,6 +844,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
|
||||
utils.RemoveFile(cls._InstanceMonitor(instance_name))
|
||||
utils.RemoveFile(cls._InstanceSerial(instance_name))
|
||||
utils.RemoveFile(cls._InstanceQmpMonitor(instance_name))
|
||||
+ utils.RemoveFile(cls._InstanceQemuGuestAgentMonitor(instance_name))
|
||||
utils.RemoveFile(cls._InstanceKVMRuntime(instance_name))
|
||||
utils.RemoveFile(cls._InstanceKeymapFile(instance_name))
|
||||
uid_file = cls._InstanceUidFile(instance_name)
|
||||
@@ -1544,6 +1553,20 @@ class KVMHypervisor(hv_base.BaseHypervisor):
|
||||
if self._UUID_RE.search(kvmhelp):
|
||||
kvm_cmd.extend(["-uuid", instance.uuid])
|
||||
|
||||
+ # Add guest agent socket
|
||||
+ if hvp[constants.HV_USE_GUEST_AGENT]:
|
||||
+ qga_addr = utils.GetFreeSlot(bus_slots[_PCI_BUS], reserve=True)
|
||||
+ qga_pci_info = "bus=%s,addr=%s" % (_PCI_BUS, hex(qga_addr))
|
||||
+ qga_path = self._InstanceQemuGuestAgentMonitor(instance.name)
|
||||
+ logging.info("KVM: Guest Agent available at %s", qga_path)
|
||||
+ # The 'qga0' identified can change, but the 'org.qemu.guest_agent.0' string is
|
||||
+ # the default expected by the Guest Agent.
|
||||
+ kvm_cmd.extend([
|
||||
+ "-chardev", "socket,path=%s,server,nowait,id=qga0" % qga_path,
|
||||
+ "-device", "virtio-serial,id=qga0,%s" % qga_pci_info,
|
||||
+ "-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0",
|
||||
+ ])
|
||||
+
|
||||
if hvp[constants.HV_KVM_EXTRA]:
|
||||
kvm_cmd.extend(hvp[constants.HV_KVM_EXTRA].split(" "))
|
||||
|
||||
diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
|
||||
index 283392cc8..493ae929d 100644
|
||||
--- a/man/gnt-instance.rst
|
||||
+++ b/man/gnt-instance.rst
|
||||
@@ -545,6 +545,13 @@ viridian
|
||||
viridian (Hyper-V) for this instance. The default is false,
|
||||
disabling viridian support.
|
||||
|
||||
+use\_guest\_agent
|
||||
+ Valid for the KVM hypervisor.
|
||||
+
|
||||
+ A boolean option that specifies if the hypervisor should enable
|
||||
+ the QEMU Guest Agent protocol for this instance. By default, the
|
||||
+ Guest Agent is disabled.
|
||||
+
|
||||
use\_localtime
|
||||
Valid for the Xen HVM and KVM hypervisors.
|
||||
|
||||
diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
|
||||
index 13bff2e71..7f43f89f9 100644
|
||||
--- a/src/Ganeti/Constants.hs
|
||||
+++ b/src/Ganeti/Constants.hs
|
||||
@@ -1821,6 +1821,9 @@ hvUsbMouse = "usb_mouse"
|
||||
hvUseBootloader :: String
|
||||
hvUseBootloader = "use_bootloader"
|
||||
|
||||
+hvUseGuestAgent :: String
|
||||
+hvUseGuestAgent = "use_guest_agent"
|
||||
+
|
||||
hvUseLocaltime :: String
|
||||
hvUseLocaltime = "use_localtime"
|
||||
|
||||
@@ -1955,6 +1958,7 @@ hvsParameterTypes = Map.fromList
|
||||
, (hvUsbDevices, VTypeString)
|
||||
, (hvUsbMouse, VTypeString)
|
||||
, (hvUseBootloader, VTypeBool)
|
||||
+ , (hvUseGuestAgent, VTypeBool)
|
||||
, (hvUseLocaltime, VTypeBool)
|
||||
, (hvVga, VTypeString)
|
||||
, (hvVhostNet, VTypeBool)
|
||||
@@ -4111,6 +4115,7 @@ hvcDefaults =
|
||||
, (hvMigrationBandwidth, PyValueEx (32 :: Int))
|
||||
, (hvMigrationDowntime, PyValueEx (30 :: Int))
|
||||
, (hvMigrationMode, PyValueEx htMigrationLive)
|
||||
+ , (hvUseGuestAgent, PyValueEx False)
|
||||
, (hvUseLocaltime, PyValueEx False)
|
||||
, (hvDiskCache, PyValueEx htCacheDefault)
|
||||
, (hvSecurityModel, PyValueEx htSmNone)
|
||||
--
|
||||
2.11.0.rc2
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
depend() {
|
||||
after dbus
|
||||
}
|
||||
|
||||
PIDFILE="/var/run/spice-vdagentd/spice-vdagentd.pid"
|
||||
|
||||
start() {
|
||||
PORT="${PORT:-/dev/virtio-ports/com.redhat.spice.0}"
|
||||
DEVICE="${DEVICE:-/dev/uinput}"
|
||||
|
||||
ebegin "Checking for required modules and devices"
|
||||
|
||||
if [[ ! -d /sys/module/uinput ]]; then
|
||||
modprobe -q uinput
|
||||
fi
|
||||
|
||||
if [[ ! -d /sys/module/uinput ]]; then
|
||||
eerror "Module 'uinput' not loaded or not enabled in the kernel"
|
||||
eend 1
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ ! -c "${PORT}" ]] ; then
|
||||
eerror "Required virtio port does not exist. Make sure you"
|
||||
eerror "started the virtual machine with appropriate parameters."
|
||||
eend 1
|
||||
return 1
|
||||
fi
|
||||
eend 0
|
||||
|
||||
if [[ ! -c ${DEVICE} && -c /dev/input/uinput ]]; then
|
||||
DEVICE=/dev/input/uinput
|
||||
fi
|
||||
|
||||
# recreate the directory since /var/run may reside on a ramdisk
|
||||
mkdir -p /var/run/spice-vdagentd
|
||||
|
||||
# cleanup stalled socket
|
||||
rm -f /var/run/spice-vdagentd/spice-vdagent-sock
|
||||
|
||||
ebegin "Starting spice VD agent daemon"
|
||||
start-stop-daemon \
|
||||
--start \
|
||||
--pidfile "${PIDFILE}" \
|
||||
--exec /usr/sbin/spice-vdagentd \
|
||||
-- -u "${DEVICE}" ${SPICE_VDAGENT_ARGS}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping spice VD agent daemon"
|
||||
start-stop-daemon \
|
||||
--stop \
|
||||
--pidfile "${PIDFILE}"
|
||||
eend $?
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,20 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="Apple Cinema Display Control"
|
||||
HOMEPAGE="https://web.archive.org/web/20090725222711/http://technocage.com:80/~caskey/acdctl/"
|
||||
SRC_URI="http://www.technocage.com/~caskey/acdctl/download/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~ppc"
|
||||
|
||||
RDEPEND="virtual/libusb:0"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dobin "${PN}"
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST elasticsearch-5.5.2.tar.gz 33485703 BLAKE2B 96a9055041506c9e92d64f8922daeca5fcb45b0e1f34ff8a8aaf14024505bf7d2b8d786de40d267252c3354473ea6ca186cf75e8d994940b43459122a3931a0e SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9
|
||||
DIST elasticsearch-5.6.4.tar.gz 33776770 BLAKE2B c74df8a496c30be315abfd7d1a71f7f8eb75de1a64a7ddd22ff742bd547ec38d417c1ce4002ed6c90b2716837ee0425cf87c910d9f810999e837d118268dcd66 SHA512 37730f39cf1711b6a20861370ef7aff4b48e7f90ad82cb1c8c92643179194c4dcdf0180691d8065304bf61e7f5a2fb1ed5c84c384e0b2ff7ad0dc58ac7352f47
|
||||
DIST elasticsearch-6.0.0.tar.gz 28017602 BLAKE2B cea47a17109eb5d46b1d94c3763f19923d97392c4a39a8dffb157b8ce60cf959e4680c2a54c5a9d204db64393f3f22dc52c0de94888753e817d808575ff352fd SHA512 25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c
|
||||
DIST elasticsearch-5.5.3.tar.gz 33486646 BLAKE2B 4f28d843b2daa73af1160436f9eedd20b9d91ee8d4454a210ad59c736c0ac0bd91384d972583d4de7e7dbc228b3e37546343da68545312333379298042ad8214 SHA512 013e238a3ccdb795b9472a6111ae804b770435776dfb703b379c34498591d3804e45fb27a7c473348917b4d9e6fde367184474680f1f72bbca129bf9644fb527
|
||||
DIST elasticsearch-5.6.5.tar.gz 33780822 BLAKE2B 0541e27d7d9d18ec308495ab1cfb65c8f8e79960ef5d110ef5194a4033301b858a676c8c4d61f246e01ebc5679280c3eafe628e22ccfd84de9129f7a4606a041 SHA512 c3f31f561631c3f8df53cb49ac9a86dff3bcaa9e3ea2ac67dd959900ec1ddf676d307c9d8319ac51062072e506994934c61395049f6a6eac67e377d53517103f
|
||||
DIST elasticsearch-6.0.1.tar.gz 28026460 BLAKE2B a70cd36affaccccf1ea552167e585a35cc748de1137cf4b23387798ae31b851104ccc19f8be83ecc645bcebfba344b5e55a397a9cbb0b380c4a118f1f0ffecf2 SHA512 b86a04acd194e7e96e3a32de6ab4983d6569ffb1714f2af9e2b49623004987e13e57c5db055153a188f5d2d7eea63d649fa87769f7625f3fc4923e0cd5b8f3ee
|
||||
|
||||
Binary file not shown.
@ -1,15 +0,0 @@
|
||||
scribus/sclayer.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp
|
||||
index 502112b..4da7bd5 100644
|
||||
--- a/scribus/sclayer.cpp
|
||||
+++ b/scribus/sclayer.cpp
|
||||
@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place.
|
||||
|
||||
#include <QHash> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
|
||||
#include <QVector> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
|
||||
+#include <QObject>
|
||||
#include <QtAlgorithms>
|
||||
|
||||
ScLayer::ScLayer(void)
|
||||
@ -1,42 +0,0 @@
|
||||
CMakeLists.txt | 28 +++++++++++++++-------------
|
||||
1 file changed, 15 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 29d66f3..1c08cdd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -244,19 +244,21 @@ ELSE()
|
||||
ENDIF()
|
||||
|
||||
#SHARE - use the default on Apple as TAG_VERSION is empty
|
||||
-IF(WIN32 OR OS2)
|
||||
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
|
||||
-ELSE (WIN32 OR OS2)
|
||||
- IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
|
||||
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
|
||||
- ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
|
||||
- IF(NOT WANT_VERSIONING)
|
||||
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
|
||||
- ELSE(NOT WANT_VERSIONING)
|
||||
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
|
||||
- ENDIF(NOT WANT_VERSIONING)
|
||||
- ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
|
||||
-ENDIF (WIN32 OR OS2)
|
||||
+IF(NOT DOCDIR)
|
||||
+ IF(WIN32 OR OS2)
|
||||
+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
|
||||
+ ELSE (WIN32 OR OS2)
|
||||
+ IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
|
||||
+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
|
||||
+ ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
|
||||
+ IF(NOT WANT_VERSIONING)
|
||||
+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
|
||||
+ ELSE(NOT WANT_VERSIONING)
|
||||
+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
|
||||
+ ENDIF(NOT WANT_VERSIONING)
|
||||
+ ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
|
||||
+ ENDIF (WIN32 OR OS2)
|
||||
+ENDIF(NOT DOCDIR)
|
||||
IF(NOT IS_ABSOLUTE ${DOCDIR})
|
||||
ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
|
||||
ELSE()
|
||||
@ -1,178 +0,0 @@
|
||||
CMakeLists.txt | 15 +++++++++++++++
|
||||
scribus/colormgmt/CMakeLists.txt | 2 ++
|
||||
scribus/desaxe/CMakeLists.txt | 1 +
|
||||
scribus/fonts/CMakeLists.txt | 1 +
|
||||
scribus/styles/CMakeLists.txt | 2 ++
|
||||
scribus/text/CMakeLists.txt | 1 +
|
||||
scribus/third_party/lib2geom/CMakeLists.txt | 8 +-------
|
||||
scribus/third_party/pgf/CMakeLists.txt | 2 ++
|
||||
scribus/third_party/prc/CMakeLists.txt | 2 ++
|
||||
scribus/third_party/wpg/CMakeLists.txt | 7 ++++---
|
||||
scribus/third_party/zip/CMakeLists.txt | 2 ++
|
||||
11 files changed, 33 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 29d66f3..a92da7e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -131,6 +131,21 @@ IF (_machine_sparc64)
|
||||
SET(ARCH64BIT 1)
|
||||
ENDIF (_machine_sparc64)
|
||||
|
||||
+STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}")
|
||||
+IF (_machine_hppa)
|
||||
+ MESSAGE(STATUS "Found target Hppa")
|
||||
+ SET(ARCH_HPPA 1)
|
||||
+ENDIF (_machine_hppa)
|
||||
+
|
||||
+
|
||||
+# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
|
||||
+# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
|
||||
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
|
||||
+
|
||||
+IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
|
||||
+ SET(CMAKE_CXX_FLAGS_FPIC "-fPIC")
|
||||
+ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
|
||||
+
|
||||
## Do our Apple OSX version setup
|
||||
IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
|
||||
STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
|
||||
diff --git a/scribus/colormgmt/CMakeLists.txt b/scribus/colormgmt/CMakeLists.txt
|
||||
index 7298a28..87c4f5e 100644
|
||||
--- a/scribus/colormgmt/CMakeLists.txt
|
||||
+++ b/scribus/colormgmt/CMakeLists.txt
|
||||
@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/scribus
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )
|
||||
SET(SCRIBUS_LCMS_IMPL_SOURCES
|
||||
sclcms2colormgmtengineimpl.cpp
|
||||
diff --git a/scribus/desaxe/CMakeLists.txt b/scribus/desaxe/CMakeLists.txt
|
||||
index 0098028..85e76b6 100644
|
||||
--- a/scribus/desaxe/CMakeLists.txt
|
||||
+++ b/scribus/desaxe/CMakeLists.txt
|
||||
@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
|
||||
SET(SCRIBUS_DESAXE_LIB_SOURCES
|
||||
saxXML.cpp
|
||||
diff --git a/scribus/fonts/CMakeLists.txt b/scribus/fonts/CMakeLists.txt
|
||||
index 799e102..f04c680 100644
|
||||
--- a/scribus/fonts/CMakeLists.txt
|
||||
+++ b/scribus/fonts/CMakeLists.txt
|
||||
@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
|
||||
SET(SCRIBUS_FONTS_LIB_SOURCES
|
||||
scface.cpp
|
||||
diff --git a/scribus/styles/CMakeLists.txt b/scribus/styles/CMakeLists.txt
|
||||
index 6e0cf0a..2839689 100644
|
||||
--- a/scribus/styles/CMakeLists.txt
|
||||
+++ b/scribus/styles/CMakeLists.txt
|
||||
@@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES(
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(SCRIBUS_STYLES_MOC_CLASSES
|
||||
)
|
||||
|
||||
diff --git a/scribus/text/CMakeLists.txt b/scribus/text/CMakeLists.txt
|
||||
index 1cd112f..4f658e3 100644
|
||||
--- a/scribus/text/CMakeLists.txt
|
||||
+++ b/scribus/text/CMakeLists.txt
|
||||
@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES(
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
|
||||
SET(SCRIBUS_TEXT_MOC_CLASSES
|
||||
storytext.h
|
||||
diff --git a/scribus/third_party/lib2geom/CMakeLists.txt b/scribus/third_party/lib2geom/CMakeLists.txt
|
||||
index 6187d96..3106f6e 100755
|
||||
--- a/scribus/third_party/lib2geom/CMakeLists.txt
|
||||
+++ b/scribus/third_party/lib2geom/CMakeLists.txt
|
||||
@@ -5,13 +5,7 @@ ${CMAKE_SOURCE_DIR}/scribus
|
||||
|
||||
SET(2GEOM_VERSION 0.1.0)
|
||||
|
||||
-# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
|
||||
-# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
|
||||
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
|
||||
-
|
||||
-IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
-ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
|
||||
OPTION(2GEOM_BUILD_SHARED
|
||||
"Build lib2geom and libtoy as shared libraries."
|
||||
diff --git a/scribus/third_party/pgf/CMakeLists.txt b/scribus/third_party/pgf/CMakeLists.txt
|
||||
index f84b3d4..d3b1db6 100644
|
||||
--- a/scribus/third_party/pgf/CMakeLists.txt
|
||||
+++ b/scribus/third_party/pgf/CMakeLists.txt
|
||||
@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/scribus
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(SCRIBUS_PGF_LIB_SOURCES
|
||||
Decoder.cpp
|
||||
Encoder.cpp
|
||||
diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
|
||||
index 5f7c2c6..1da7177 100644
|
||||
--- a/scribus/third_party/prc/CMakeLists.txt
|
||||
+++ b/scribus/third_party/prc/CMakeLists.txt
|
||||
@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(SCRIBUS_PRC_LIB_SOURCES
|
||||
oPRCFile.cc
|
||||
PRCbitStream.cc
|
||||
diff --git a/scribus/third_party/wpg/CMakeLists.txt b/scribus/third_party/wpg/CMakeLists.txt
|
||||
index ff31e9f..fbc5cd4 100644
|
||||
--- a/scribus/third_party/wpg/CMakeLists.txt
|
||||
+++ b/scribus/third_party/wpg/CMakeLists.txt
|
||||
@@ -2,10 +2,11 @@ INCLUDE_DIRECTORIES(
|
||||
${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/scribus
|
||||
)
|
||||
+
|
||||
SET(LIB_TYPE STATIC)
|
||||
-IF (ARCH_X86_64 EQUAL 1)
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
-ENDIF (ARCH_X86_64 EQUAL 1)
|
||||
+
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(WPG_SOURCES
|
||||
WPG1Parser.cpp
|
||||
WPG2Parser.cpp
|
||||
diff --git a/scribus/third_party/zip/CMakeLists.txt b/scribus/third_party/zip/CMakeLists.txt
|
||||
index edf9683..f7676ab 100644
|
||||
--- a/scribus/third_party/zip/CMakeLists.txt
|
||||
+++ b/scribus/third_party/zip/CMakeLists.txt
|
||||
@@ -4,6 +4,8 @@ ${CMAKE_SOURCE_DIR}/scribus
|
||||
${ZLIB_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(SCRIBUS_ZIP_LIB_SOURCES
|
||||
unzip.cpp
|
||||
zip.cpp
|
||||
@ -1,31 +0,0 @@
|
||||
commit 413c8c8a0ded5aa4b0f8d85dbc335082e809f3b2
|
||||
Author: Craig Bradney <mrb@scribus.info>
|
||||
Date: Thu Jun 16 20:01:34 2016 +0000
|
||||
|
||||
Add better support for C++11/Qt 5.7.0. CMAKE minimum bumped to 3.2
|
||||
|
||||
git-svn-id: svn://scribus.net/trunk/Scribus@21377 11d20701-8431-0410-a711-e3c959e3b870
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index bc1ec57..9e92a38 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -3,8 +3,9 @@
|
||||
|
||||
#Set our CMake minimum version
|
||||
#Require 2.8.9 for Qt5
|
||||
+#Require 3.1.0 for Qt 5.7 C++ 11 easy support
|
||||
#Require 3.2.0 for add_custom_target with byproducts
|
||||
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9 FATAL_ERROR)
|
||||
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0 FATAL_ERROR)
|
||||
|
||||
#Pretty colors
|
||||
SET(CMAKE_COLOR_MAKEFILE ON)
|
||||
@@ -382,6 +383,7 @@ ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")
|
||||
#C++11 Support
|
||||
IF(WANT_CPP11)
|
||||
MESSAGE(STATUS "Enabling C++11 compiler features")
|
||||
+ set(CMAKE_CXX_STANDARD 11)
|
||||
ADD_DEFINITIONS("-std=c++11")
|
||||
ENDIF(WANT_CPP11)
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
commit 1a9bdbc7ab793b15e93f1ab29ce06dd69c061f58
|
||||
Author: Jean Ghali <jghali@libertysurf.fr>
|
||||
Date: Sat Jun 18 12:49:45 2016 +0000
|
||||
|
||||
fix build issue when not compiling with c++11 : std::isinf is c++11 only
|
||||
|
||||
git-svn-id: svn://scribus.net/trunk/Scribus@21382 11d20701-8431-0410-a711-e3c959e3b870
|
||||
|
||||
diff --git a/scribus/third_party/fparser/fpoptimizer.cc b/scribus/third_party/fparser/fpoptimizer.cc
|
||||
index 673e1b6..0c1bad5 100644
|
||||
--- a/scribus/third_party/fparser/fpoptimizer.cc
|
||||
+++ b/scribus/third_party/fparser/fpoptimizer.cc
|
||||
@@ -7296,7 +7296,11 @@ namespace FPoptimizer_CodeTree
|
||||
//if(imm >= 0.0)
|
||||
{
|
||||
double new_base_immed = std::pow(base_immed, imm);
|
||||
+#if __cplusplus < 201103L
|
||||
+ if(isinf(new_base_immed) || new_base_immed == 0.0)
|
||||
+#else
|
||||
if(std::isinf(new_base_immed) || new_base_immed == 0.0)
|
||||
+#endif
|
||||
{
|
||||
// It produced an infinity. Do not change.
|
||||
break;
|
||||
@ -1,16 +0,0 @@
|
||||
scribus/third_party/prc/CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
|
||||
index 5f7c2c6..1da7177 100644
|
||||
--- a/scribus/third_party/prc/CMakeLists.txt
|
||||
+++ b/scribus/third_party/prc/CMakeLists.txt
|
||||
@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
|
||||
+
|
||||
SET(SCRIBUS_PRC_LIB_SOURCES
|
||||
oPRCFile.cc
|
||||
PRCbitStream.cc
|
||||
@ -1,87 +0,0 @@
|
||||
commit bb3066704e987210c324ec7f3bfb2c8153d9710e
|
||||
Author: Jean Ghali <jghali@libertysurf.fr>
|
||||
Date: Sat Aug 20 12:18:31 2016 +0000
|
||||
|
||||
fix a few gcc 6 warnings related to auto_ptr deprecation in c++11 by replacing it with QScopedPointer
|
||||
|
||||
git-svn-id: svn://scribus.net/trunk/Scribus@21430 11d20701-8431-0410-a711-e3c959e3b870
|
||||
|
||||
diff --git a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h
|
||||
index 044d45a..a067b79 100644
|
||||
--- a/scribus/sclistboxpixmap.h
|
||||
+++ b/scribus/sclistboxpixmap.h
|
||||
@@ -13,6 +13,7 @@ for which a new license (GPL+exception) is in place.
|
||||
#include <QDebug>
|
||||
#include <QPainter>
|
||||
#include <QPixmap>
|
||||
+#include <QScopedPointer>
|
||||
#include <QVariant>
|
||||
|
||||
#include "scguardedptr.h"
|
||||
@@ -30,19 +31,19 @@ public:
|
||||
virtual QSize sizeHint (const QStyleOptionViewItem & option, const QModelIndex & index ) const;
|
||||
virtual void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
|
||||
protected:
|
||||
- static std::auto_ptr<QPixmap> pmap;
|
||||
+ static QScopedPointer<QPixmap> pmap;
|
||||
// The drawPixmap function must not modify pixmap size
|
||||
virtual void redraw(const QVariant&) const = 0;
|
||||
};
|
||||
|
||||
template<unsigned int pixWidth, unsigned int pixHeight>
|
||||
-std::auto_ptr<QPixmap> ScListBoxPixmap<pixWidth, pixHeight>::pmap;
|
||||
+QScopedPointer<QPixmap> ScListBoxPixmap<pixWidth, pixHeight>::pmap;
|
||||
|
||||
|
||||
template<unsigned int pixWidth, unsigned int pixHeight>
|
||||
ScListBoxPixmap<pixWidth, pixHeight>::ScListBoxPixmap(void) : QAbstractItemDelegate()
|
||||
{
|
||||
- if (!pmap.get())
|
||||
+ if (pmap.isNull())
|
||||
{
|
||||
pmap.reset( new QPixmap(pixWidth, pixHeight) );
|
||||
}
|
||||
diff --git a/scribus/ui/colorlistbox.cpp b/scribus/ui/colorlistbox.cpp
|
||||
index 9f3897b..99f280f 100644
|
||||
--- a/scribus/ui/colorlistbox.cpp
|
||||
+++ b/scribus/ui/colorlistbox.cpp
|
||||
@@ -83,7 +83,7 @@ public:
|
||||
|
||||
void ColorSmallItemDelegate::redraw(const QVariant& data) const
|
||||
{
|
||||
- QPixmap* pPixmap = ScListBoxPixmap<15,15>::pmap.get();
|
||||
+ QPixmap* pPixmap = ScListBoxPixmap<15,15>::pmap.data();
|
||||
pPixmap->fill(Qt::transparent);
|
||||
if (data.canConvert<ColorPixmapValue>())
|
||||
{
|
||||
@@ -101,7 +101,7 @@ void ColorSmallItemDelegate::redraw(const QVariant& data) const
|
||||
|
||||
void ColorWideItemDelegate::redraw(const QVariant& data) const
|
||||
{
|
||||
- QPixmap* pPixmap = ScListBoxPixmap<30,15>::pmap.get();
|
||||
+ QPixmap* pPixmap = ScListBoxPixmap<30,15>::pmap.data();
|
||||
pPixmap->fill(Qt::transparent);
|
||||
if (data.canConvert<ColorPixmapValue>())
|
||||
{
|
||||
@@ -134,7 +134,7 @@ void ColorFancyItemDelegate::redraw(const QVariant& data) const
|
||||
iconsInitialized = true;
|
||||
}
|
||||
|
||||
- QPixmap* pPixmap = ScListBoxPixmap<60,15>::pmap.get();
|
||||
+ QPixmap* pPixmap = ScListBoxPixmap<60,15>::pmap.data();
|
||||
pPixmap->fill(Qt::transparent);
|
||||
|
||||
if (data.canConvert<ColorPixmapValue>())
|
||||
diff --git a/scribus/ui/propertiespalette_utils.cpp b/scribus/ui/propertiespalette_utils.cpp
|
||||
index f76743c..cadbb11 100644
|
||||
--- a/scribus/ui/propertiespalette_utils.cpp
|
||||
+++ b/scribus/ui/propertiespalette_utils.cpp
|
||||
@@ -66,7 +66,7 @@ void LineFormatItemDelegate::redraw(const QVariant& data) const
|
||||
QColor tmpf;
|
||||
pmap->fill(Qt::white);
|
||||
QPainter p;
|
||||
- p.begin(pmap.get());
|
||||
+ p.begin(pmap.data());
|
||||
for (int its = item.m_Line.size()-1; its > -1; its--)
|
||||
{
|
||||
const ScColor& col = item.m_doc->PageColors[item.m_Line[its].Color];
|
||||
@ -1,21 +0,0 @@
|
||||
commit ddb5688ae4f4ff40ba1204a413fcf15279b35f2b
|
||||
Author: Franz Schmid <Franz.Schmid@altmuehlnet.de>
|
||||
Date: Sat Jun 18 09:14:21 2016 +0000
|
||||
|
||||
Compile Fix for compiling with Qt-5.7
|
||||
|
||||
git-svn-id: svn://scribus.net/trunk/Scribus@21381 11d20701-8431-0410-a711-e3c959e3b870
|
||||
|
||||
diff --git a/scribus/third_party/fparser/fpoptimizer.cc b/scribus/third_party/fparser/fpoptimizer.cc
|
||||
index ae8c0f6..673e1b6 100644
|
||||
--- a/scribus/third_party/fparser/fpoptimizer.cc
|
||||
+++ b/scribus/third_party/fparser/fpoptimizer.cc
|
||||
@@ -7296,7 +7296,7 @@ namespace FPoptimizer_CodeTree
|
||||
//if(imm >= 0.0)
|
||||
{
|
||||
double new_base_immed = std::pow(base_immed, imm);
|
||||
- if(isinf(new_base_immed) || new_base_immed == 0.0)
|
||||
+ if(std::isinf(new_base_immed) || new_base_immed == 0.0)
|
||||
{
|
||||
// It produced an infinity. Do not change.
|
||||
break;
|
||||
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST gentoolkit-0.3.3.tar.gz 3197037 BLAKE2B c2a45971f1f25e3008422b63b59042ca0f2b170b98e10fc4e449ee6be76c0422469cd8bce1b744830404d5a26ba87ded47aab679069965eea266719249475923 SHA512 ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691
|
||||
DIST gentoolkit-0.4.0.tar.gz 3215377 BLAKE2B 404f81e2f5bce5da4df122156bc76d225497456ad8ec78a50c41e1183390f8e452a6ce8a3473b5371a6712ce1599be33034c5eed64a1852d116c745bc5a775f4 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56
|
||||
DIST gentoolkit-0.4.1.tar.gz 3214527 BLAKE2B 1c6be826a099ba4d18ac8fa0bb38808cbf30ee1d93d26c26965d7fa332e6a87f8eee475126f56d68e2a1c0ff04f258f79f5684551b2fe5947d8ac6f6ff3e7079 SHA512 52b665e19dd8b871f4238d05d40a071d69ef114f36b589c29f46686b1439997e72f58896bb4f330ab256af6000a9559426c78cae08640e54b74db343b3b22945
|
||||
|
||||
@ -0,0 +1,66 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
|
||||
PYTHON_REQ_USE="xml(+),threads(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Collection of administration scripts for Gentoo"
|
||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
|
||||
SRC_URI="https://dev.gentoo.org/~fuzzyray/releases/gentoolkit/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${DEPEND}
|
||||
!app-portage/gentoolkit-dev
|
||||
sys-apps/gawk
|
||||
sys-apps/gentoo-functions"
|
||||
|
||||
python_prepare_all() {
|
||||
python_setup
|
||||
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
|
||||
VERSION="${PVR}" "${PYTHON}" setup.py set_version
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Create cache directory for revdep-rebuild
|
||||
mkdir -p -m 0755 "${EROOT%/}"/var/cache
|
||||
mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
|
||||
|
||||
einfo "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
|
||||
einfo "part of the gentoolkit package."
|
||||
einfo "The gentoolkit-dev package is now deprecated in favor of a single"
|
||||
einfo "gentoolkit package. The remaining tools from gentoolkit-dev"
|
||||
einfo "are now obsolete/unused with the git based tree."
|
||||
|
||||
# Only show the elog information on a new install
|
||||
if [[ ! ${REPLACING_VERSIONS} ]]; then
|
||||
elog
|
||||
elog "For further information on gentoolkit, please read the gentoolkit"
|
||||
elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
|
||||
elog
|
||||
elog "Another alternative to equery is app-portage/portage-utils"
|
||||
elog
|
||||
elog "Additional tools that may be of interest:"
|
||||
elog
|
||||
elog " app-admin/eclean-kernel"
|
||||
elog " app-portage/diffmask"
|
||||
elog " app-portage/flaggie"
|
||||
elog " app-portage/install-mask"
|
||||
elog " app-portage/portpeek"
|
||||
elog " app-portage/smart-live-rebuild"
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit toolchain-funcs flag-o-matic
|
||||
|
||||
DESCRIPTION="Converts DVI files to SVG"
|
||||
HOMEPAGE="http://dvisvgm.bplaced.net/"
|
||||
SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="test"
|
||||
# Tests don't work from $WORKDIR: kpathsea tries to search in relative
|
||||
# directories from where the binary is executed.
|
||||
# We cannot really use absolute paths in the kpathsea configuration since that
|
||||
# would make it harder for prefix installs.
|
||||
RESTRICT="test"
|
||||
|
||||
# TODO unbundle app-arch/brotli
|
||||
RDEPEND="virtual/tex-base
|
||||
app-text/ghostscript-gpl
|
||||
>=media-gfx/potrace-1.10-r1
|
||||
media-libs/freetype:2
|
||||
dev-libs/kpathsea
|
||||
sys-libs/zlib"
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/xmlto
|
||||
app-text/asciidoc
|
||||
dev-libs/libxslt
|
||||
virtual/pkgconfig
|
||||
test? ( dev-cpp/gtest )"
|
||||
|
||||
src_configure() {
|
||||
has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
|
||||
default
|
||||
}
|
||||
@ -1,146 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils toolchain-funcs xdg-utils
|
||||
|
||||
if [[ "${PV}" == "9999" ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
|
||||
SLOT="0/9999"
|
||||
else
|
||||
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0/68" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
|
||||
fi
|
||||
|
||||
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
|
||||
HOMEPAGE="https://poppler.freedesktop.org/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
|
||||
|
||||
# No test data provided
|
||||
RESTRICT="test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=media-libs/fontconfig-2.6.0
|
||||
>=media-libs/freetype-2.3.9
|
||||
sys-libs/zlib
|
||||
cairo? (
|
||||
dev-libs/glib:2
|
||||
>=x11-libs/cairo-1.10.0
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
|
||||
)
|
||||
curl? ( net-misc/curl )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
jpeg2k? ( media-libs/openjpeg:2= )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
nss? ( >=dev-libs/nss-3.19:0 )
|
||||
png? ( media-libs/libpng:0= )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtxml:5
|
||||
)
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
cjk? ( >=app-text/poppler-data-0.4.7 )
|
||||
"
|
||||
|
||||
DOCS=(AUTHORS NEWS README README-XPDF TODO)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
|
||||
"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
|
||||
"${FILESDIR}/${PN}-0.53.0-respect-cflags.patch"
|
||||
"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
|
||||
"${FILESDIR}/${PN}-0.40-FindQt4.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
# Clang doesn't grok this flag, the configure nicely tests that, but
|
||||
# cmake just uses it, so remove it if we use clang
|
||||
if [[ ${CC} == clang ]] ; then
|
||||
sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
|
||||
fi
|
||||
|
||||
if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
|
||||
sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
|
||||
-i CMakeLists.txt || die
|
||||
else
|
||||
einfo "policy(SET CMP0002 OLD) - workaround can be removed"
|
||||
fi
|
||||
|
||||
if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
|
||||
# we need to up the C++ version, bug #622526
|
||||
export CXX="$(tc-getCXX) -std=c++11"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
xdg_environment_reset
|
||||
local mycmakeargs=(
|
||||
-DBUILD_GTK_TESTS=OFF
|
||||
-DBUILD_QT4_TESTS=OFF
|
||||
-DBUILD_QT5_TESTS=OFF
|
||||
-DBUILD_CPP_TESTS=OFF
|
||||
-DENABLE_SPLASH=ON
|
||||
-DENABLE_ZLIB=ON
|
||||
-DENABLE_ZLIB_UNCOMPRESS=OFF
|
||||
-DENABLE_XPDF_HEADERS=ON
|
||||
-DENABLE_LIBCURL="$(usex curl)"
|
||||
-DENABLE_CPP="$(usex cxx)"
|
||||
-DENABLE_UTILS="$(usex utils)"
|
||||
-DSPLASH_CMYK=OFF
|
||||
-DUSE_FIXEDPOINT=OFF
|
||||
-DUSE_FLOAT=OFF
|
||||
-DWITH_Cairo="$(usex cairo)"
|
||||
-DWITH_GObjectIntrospection="$(usex introspection)"
|
||||
-DWITH_JPEG="$(usex jpeg)"
|
||||
-DWITH_NSS3="$(usex nss)"
|
||||
-DWITH_PNG="$(usex png)"
|
||||
-DWITH_Qt4="$(usex qt4)"
|
||||
$(cmake-utils_use_find_package qt5 Qt5Core)
|
||||
-DWITH_TIFF="$(usex tiff)"
|
||||
)
|
||||
if use jpeg; then
|
||||
mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_DCTDECODER=none)
|
||||
fi
|
||||
if use jpeg2k; then
|
||||
mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
|
||||
fi
|
||||
if use lcms; then
|
||||
mycmakeargs+=(-DENABLE_CMS=lcms2)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_CMS=)
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# live version doesn't provide html documentation
|
||||
if use cairo && use doc && [[ ${PV} != 9999 ]]; then
|
||||
# For now install gtk-doc there
|
||||
insinto /usr/share/gtk-doc/html/poppler
|
||||
doins -r "${S}"/glib/reference/html/*
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit prefix
|
||||
|
||||
DESCRIPTION="Base ISO character entities and utilities for SGML"
|
||||
HOMEPAGE="http://www.iso.org/standard/16387.html"
|
||||
SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-prefix.patch )
|
||||
|
||||
src_prepare() {
|
||||
# We use a hacked version of install-catalog that supports the ROOT
|
||||
# variable, puts quotes around the CATALOG files, and can be prefixed.
|
||||
cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in" \
|
||||
|| die "Copy of install-catalog.in failed"
|
||||
|
||||
default
|
||||
eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
local installer="${EROOT%/}/usr/bin/install-catalog"
|
||||
if [[ ! -x ${installer} ]]; then
|
||||
eerror "install-catalog not found! Something went wrong!"
|
||||
die "install-catalog not found! Something went wrong!"
|
||||
fi
|
||||
|
||||
einfo "Installing Catalogs..."
|
||||
"$installer" --add \
|
||||
"${EROOT%/}"/etc/sgml/sgml-ent.cat \
|
||||
"${EROOT%/}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
|
||||
"$installer" --add \
|
||||
"${EROOT%/}"/etc/sgml/sgml-docbook.cat \
|
||||
"${EROOT%/}"/etc/sgml/sgml-ent.cat
|
||||
|
||||
local file
|
||||
while IFS="" read -d $'\0' -r file; do
|
||||
einfo "Fixing ${file}"
|
||||
awk '/"$/ { print $1 " " $2 }
|
||||
! /"$/ { print $1 " \"" $2 "\"" }' ${file} > ${file}.new || die "awk failed"
|
||||
mv ${file}.new ${file} || die "mv failed"
|
||||
done < <(find "${EROOT%/}/etc/sgml/" -name "*.cat" -o -name "catalog" -print0)
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
cp "${EROOT%/}/usr/bin/install-catalog" "${T}" || die "cp failed"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
if [[ ! -x ${T}/install-catalog ]]; then
|
||||
return
|
||||
fi
|
||||
|
||||
einfo "Removing Catalogs..."
|
||||
if [[ -e ${EROOT%/}/etc/sgml/sgml-ent.cat ]]; then
|
||||
"${T}"/install-catalog --remove \
|
||||
"${EROOT%/}"/etc/sgml/sgml-ent.cat \
|
||||
"${EROOT%/}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog \
|
||||
|| die "install-catalog failed"
|
||||
fi
|
||||
|
||||
if [[ -e ${EROOT%/}/etc/sgml/sgml-docbook.cat ]]; then
|
||||
"${T}"/install-catalog --remove \
|
||||
"${EROOT%/}"/etc/sgml/sgml-docbook.cat \
|
||||
"${EROOT%/}"/etc/sgml/sgml-ent.cat \
|
||||
|| die "install-catalog failed"
|
||||
fi
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue