From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- media-gfx/openscad/Manifest | 12 +-- .../files/openscad-2015.03_p2_uic_tr_fix.patch | 14 --- ...penscad-2015.03_p3_fix-boost-1.70.0-build.patch | 13 --- ...ad-2019.05-0001-Fix-build-with-boost-1.73.patch | 28 ++++++ ...2-Gentoo-specific-Disable-ccache-building.patch | 35 +++++++ ...2-Gentoo-specific-Disable-ccache-building.patch | 35 +++++++ media-gfx/openscad/metadata.xml | 5 + media-gfx/openscad/openscad-2015.03_p3-r2.ebuild | 80 --------------- media-gfx/openscad/openscad-2019.05-r3.ebuild | 108 +++++++++++++++++++++ media-gfx/openscad/openscad-9999.ebuild | 58 ++++++++--- 10 files changed, 263 insertions(+), 125 deletions(-) delete mode 100644 media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch delete mode 100644 media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch create mode 100644 media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch create mode 100644 media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch create mode 100644 media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch delete mode 100644 media-gfx/openscad/openscad-2015.03_p3-r2.ebuild create mode 100644 media-gfx/openscad/openscad-2019.05-r3.ebuild (limited to 'media-gfx/openscad') diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index 1a1a1ab57fe3..d1584fd95e70 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -1,10 +1,10 @@ AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e -AUX openscad-2015.03_p2_uic_tr_fix.patch 345 BLAKE2B 46f19ba25f9a19b2b6841493877d14a0c6c3c8dcf7d8e5ec65d4d0d8fc5c79b15467b71dd29bfeb38decd4f100d06e9fe185c1670f336672998ef02e9e59794c SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2 -AUX openscad-2015.03_p3_fix-boost-1.70.0-build.patch 697 BLAKE2B 093b04177e9222e6b41cae806bd8feedf1135ffe26f966f291accb1f72e1683cab4b7339827c8720873e6d45475faabb680a3e5b40dee9e4d03f356cc49888b7 SHA512 4640dac7ee1c8dc8078c33141c08948ec45144275db84c07a079d624210516ed4795d7ff0cbea4842aac9342e07fa0ec6ad938d0fd637a2f1bee2e1055e6baf4 +AUX openscad-2019.05-0001-Fix-build-with-boost-1.73.patch 827 BLAKE2B 3450919d7c92e20fccbe61174dcfb56c96930e43a75baa1632bcb706c3c61d2c77bf290098337a6b6cfcdd7f97f47419c62d8153081b3d5951935be07ab34b1b SHA512 8cea77da618ba6a258357640fc1ab479cc3b10a42ce9b2d0f70dbafde959de68a889b6234143b6f43a3b15c8abc0765e658f5cc81cc22572f9a228f089c0eb23 +AUX openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch 820 BLAKE2B abfa2f4067dca1bdd2a1169cb3d9e1b4a804fa27bf8ec3a6a98106861713a3273f401a4e51c2fb8afab397b6326960609ae2700d0755b3b819ede749bc202b5e SHA512 87031a2f1b132434b349ead74e1e6d247f51ed48b0f2f8970dc99d9c47a441022ea169728302f680142325888433f07f4888a52727b31fda8e26e28d8b5d2100 AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c -DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee +AUX openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch 822 BLAKE2B ae4c7dc441e5a7391ecd2e704c644877fa7d73f8900fbe6082e070a3d9ecce74f368ead39be3f0321fb47095becf60057fafdee2a5e961106402dffff73687be SHA512 7bae2af4c627cc2f465e75890284bcca8e738dcbe5accf0511fcca2ee845ce9ef5602b752d61ecab7afd92f3a45975287db4e42379ede7875123a8c0a721f2c3 DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13 -EBUILD openscad-2015.03_p3-r2.ebuild 1632 BLAKE2B 6a44bb34413a6019cf4f51266096dc61deb58d1cbc8767405fcc72fcbadff2df6ea2e1b141c2caa697890428fae86afc4a9ed7c7c0e93da09829e51ad8172c0b SHA512 d1c3a4deb951cae887efe2014d0fa3426e08a8f6ff01f41936824b61c128252baf8123cfbe6237729599a521244db99af297618bba8e3539f365831f3b01139a EBUILD openscad-2019.05-r2.ebuild 1589 BLAKE2B e5537b0658a553fb95b55aa972f16e2eead4540f2e50d1cb04c094adc8aed115d092fd525e6cdbdadaa8bc54fc9f77953927a13650e2e8971614c74efd1122a0 SHA512 e6303ba15e877affd22a03d848f7b08e80d61ac9580993c01c0a3c39d51b3d4319b51067a178c9cd48dcd657f9397005794d2d820662b06f97c34e09899883d5 -EBUILD openscad-9999.ebuild 1388 BLAKE2B 3104011bd4978eaefc7ec2a4594007c5fa1ace3d1d4a9d531f56edc4d453e4b8866a4ddb4bb1848fd203a6cad4a3bcd750e3b06a08963dd71e33b34dec5a8f93 SHA512 9f7ddb533d6cfac1193e288c468e499ae77c855ca47ff5c456d479998e3a12143308eda15feabdb70b8e28b537d30a357d48dfa9c2445cc47e532ec5bc403995 -MISC metadata.xml 1025 BLAKE2B f1d33e8f6f5f045c0993882d461e9bd8457fc33ee5c32b115540abe18e66b8020ae2ba0f6a593b3e7feb3e48c1d85554bb8340ee0606541964770a40dafc76b6 SHA512 951f3c8d8f68fa60d56f2c01014ab757fc4a72a7d1c98518c3d4c80db55878740a8c267b87e734cc29284fe2bd05e0b54a13c0b09eb9fd8f10fb67a051b687be +EBUILD openscad-2019.05-r3.ebuild 2061 BLAKE2B 8f0bd7a761adb86a9b627030f2f00a8ebfcf763b4d0a8a7b716db6394ef242d2b8e719faa31e123cc5229a66a92e208d5bee0ffb32c29ec7f03b467ac1508141 SHA512 2085a1a5cdd1617e5e97fe3ac917c4e19745fa1320f03d0c557c2e57337fca6074428c758dfe22bf825fcd384c7a0397561784d5c203b0d805bb9b03fbadf4e0 +EBUILD openscad-9999.ebuild 1979 BLAKE2B 1a7ce40f0f06244a8b420814935dadfacc025a2d899305314bdb827be8152ef85c16069f3e036cb3df263801bc56db729f10d5410fac9b82f8d75583fab549ee SHA512 3a05e021b61e353bd25857d1e238a85f1aa1bf3d34a36ebba2d9b1ce7da578584c19a2b366247088524b1c8e6b7ad447d37d0bab380b5819162b91bcce7f0748 +MISC metadata.xml 1123 BLAKE2B d182b2b81115ec212b553802174d5305dd37af439aaafb25dd05368b1431b960cb4e35e65bec0519438e9c1ed767124fc686e293d07e5d44807bbf4ca8d74ea2 SHA512 10fda921c2d18d8e3a12d986cd2de9eebf47d9d2f843381b4ea2874d2483a42b84c6aa6c216ceb4c1ecf4183bbc8d43d7202bafbfcddc15de1bcd6b0f297f29c diff --git a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch deleted file mode 100644 index ef0bcc421eb7..000000000000 --- a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/qtgettext.h 2017-03-22 00:17:29.808058905 -0400 -+++ b/src/qtgettext.h 2017-03-22 00:18:55.251184835 -0400 -@@ -22,5 +22,10 @@ - return QString::fromUtf8( _( msgid ) ); - } - --#endif -+inline QString _( const char *msgid, const char *disambiguation ) -+{ -+ Q_UNUSED( disambiguation ); -+ return QString::fromUtf8( _( msgid ) ); -+} - -+#endif diff --git a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch deleted file mode 100644 index 7684eba92e82..000000000000 --- a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc -index 6416f29..b3753cf 100644 ---- a/src/CSGTermEvaluator.cc -+++ b/src/CSGTermEvaluator.cc -@@ -109,7 +109,7 @@ static shared_ptr evaluate_csg_term_from_geometry(const State &state, - shared_ptr ps = dynamic_pointer_cast(geom); - // Since is_convex() doesn't handle non-planar faces, we need to tessellate - // also in the indeterminate state so we cannot just use a boolean comparison. See #1061 -- bool convex = ps->convexValue(); -+ bool convex{ps->convexValue()}; - if (ps && !convex) { - assert(ps->getDimension() == 3); - PolySet *ps_tri = new PolySet(3, ps->convexValue()); diff --git a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch new file mode 100644 index 000000000000..74f48b4c1aed --- /dev/null +++ b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch @@ -0,0 +1,28 @@ +From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Fri, 15 May 2020 19:09:10 +0200 +Subject: [PATCH] Fix build with boost-1.73 + +Thanks to William T Wilson for reporting and providing the patch. + +Signed-off-by: Bernd Waibel +--- + src/import.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/import.cc b/src/import.cc +index eef1323..08e46ff 100644 +--- a/src/import.cc ++++ b/src/import.cc +@@ -50,7 +50,7 @@ namespace fs = boost::filesystem; + #include + using namespace boost::assign; // bring 'operator+=()' into scope + +-#include ++#include + #include + + extern PolySet * import_amf(std::string, const Location &loc); +-- +2.26.2 + diff --git a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch new file mode 100644 index 000000000000..1a4903828e80 --- /dev/null +++ b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch @@ -0,0 +1,35 @@ +From 2940d8e5c74faa5dcd5279c8166064ade3da5695 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Sun, 17 May 2020 21:13:44 +0200 +Subject: [PATCH] [Gentoo-specific] Disable ccache building + +On Gentoo we use a USE flag to determine whether to use +ccache for building or not. + +Signed-off-by: Bernd Waibel +--- + openscad.pro | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/openscad.pro b/openscad.pro +index 2d190dd..9c4e67b 100755 +--- a/openscad.pro ++++ b/openscad.pro +@@ -214,10 +214,10 @@ mdi { + DEFINES += ENABLE_MDI + } + +-system("ccache -V >/dev/null 2>/dev/null") { +- CONFIG += ccache +- message("Using ccache") +-} ++#system("ccache -V >/dev/null 2>/dev/null") { ++# CONFIG += ccache ++# message("Using ccache") ++#} + + include(common.pri) + +-- +2.26.2 + diff --git a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch new file mode 100644 index 000000000000..ca21b9322e8e --- /dev/null +++ b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch @@ -0,0 +1,35 @@ +From 8d6fd9c0896e513eec2da3c97cfd33a5ec09c148 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Sun, 17 May 2020 21:38:45 +0200 +Subject: [PATCH] [Gentoo-specific] Disable ccache building + +On Gentoo we use a USE flag to determine whether to use +ccache for building or not. + +Signed-off-by: Bernd Waibel +--- + openscad.pro | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/openscad.pro b/openscad.pro +index cc7f3569..8fbd3a5b 100755 +--- a/openscad.pro ++++ b/openscad.pro +@@ -208,10 +208,10 @@ mdi { + DEFINES += ENABLE_MDI + } + +-system("ccache -V >/dev/null 2>/dev/null") { +- CONFIG += ccache +- message("Using ccache") +-} ++#system("ccache -V >/dev/null 2>/dev/null") { ++# CONFIG += ccache ++# message("Using ccache") ++#} + + include(common.pri) + +-- +2.26.2 + diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml index 7b83ba148002..5ed7ed33c62b 100644 --- a/media-gfx/openscad/metadata.xml +++ b/media-gfx/openscad/metadata.xml @@ -20,6 +20,11 @@ OpenSCAD is free software and available for Linux/UNIX, MS Windows and Mac OS X. + + + Use dev-util/ccache to speed up rebuilds + + openscad/openscad diff --git a/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild deleted file mode 100644 index c8c9432ff43a..000000000000 --- a/media-gfx/openscad/openscad-2015.03_p3-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit elisp-common qmake-utils xdg - -# 2015.03-3 -MY_VER=$(ver_cut 1-2) # version component -MY_REL=$(ver_cut 4) # release component, 'p' being the third component -MY_PV=${MY_VER}-${MY_REL} -SITEFILE="50${PN}-gentoo.el" - -DESCRIPTION="The Programmers Solid 3D CAD Modeller" -HOMEPAGE="http://www.openscad.org/" -SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="emacs" - -DEPEND=" - dev-cpp/eigen:3 - dev-libs/boost:= - dev-libs/glib:2 - dev-libs/gmp:0= - dev-libs/mpfr:0= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtopengl:5 - media-gfx/opencsg - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=media-libs/glew-2.0.0:* - media-libs/harfbuzz - sci-mathematics/cgal:= - >=x11-libs/qscintilla-2.9.4:=[qt5(+)] - emacs? ( >=app-editors/emacs-23.1:* ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch" - "${FILESDIR}/${PN}-2015.03_p3_fix-boost-1.70.0-build.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - default - - #Use our CFLAGS (specifically don't force x86) - sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro || die - sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die -} - -src_configure() { - eqmake5 "${PN}.pro" -} - -src_compile() { - default - - if use emacs ; then - elisp-compile contrib/*.el - fi -} - -src_install() { - emake install INSTALL_ROOT="${D}" - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - elisp-install ${PN} contrib/*.el contrib/*.elc - fi - - einstalldocs -} diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild new file mode 100644 index 000000000000..73d706525135 --- /dev/null +++ b/media-gfx/openscad/openscad-2019.05-r3.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit elisp-common qmake-utils xdg + +SITEFILE="50${PN}-gentoo.el" + +DESCRIPTION="The Programmers Solid 3D CAD Modeller" +HOMEPAGE="https://www.openscad.org/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ccache emacs" +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${P}_fix-boost-1.72.0-build.patch" + "${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch" +) + +RDEPEND=" + dev-cpp/eigen:3 + dev-libs/boost:= + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/gmp:0= + dev-libs/hidapi + dev-libs/libspnav + dev-libs/libzip:= + dev-libs/mpfr:0= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5[-gles2-only] + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + media-gfx/opencsg + media-libs/fontconfig + media-libs/freetype + >=media-libs/glew-2.0.0:0= + media-libs/harfbuzz:= + media-libs/lib3mf + sci-mathematics/cgal:= + >=x11-libs/qscintilla-2.10.3:= + emacs? ( >=app-editors/emacs-23.1:* ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/itstool + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + ccache? ( dev-util/ccache ) +" + +src_prepare() { + default + + # fix path prefix + sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die + + # disable ccache + if ! use ccache; then + eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch" + fi +} + +src_configure() { + eqmake5 "${PN}.pro" +} + +src_compile() { + default + + if use emacs ; then + elisp-compile contrib/*.el + fi +} + +src_install() { + emake install INSTALL_ROOT="${D}" + + if use emacs; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + elisp-install ${PN} contrib/*.el contrib/*.elc + fi + + einstalldocs +} + +pkg_postinst() { + use emacs && elisp-site-regen + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + use emacs && elisp-site-regen + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild index 6ce960b60bc8..4dc6fbc2617d 100644 --- a/media-gfx/openscad/openscad-9999.ebuild +++ b/media-gfx/openscad/openscad-9999.ebuild @@ -8,45 +8,67 @@ inherit elisp-common git-r3 qmake-utils xdg SITEFILE="50${PN}-gentoo.el" DESCRIPTION="The Programmers Solid 3D CAD Modeller" -HOMEPAGE="http://www.openscad.org/" +HOMEPAGE="https://www.openscad.org/" EGIT_REPO_URI="https://github.com/openscad/openscad.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="emacs" +IUSE="ccache emacs" +RESTRICT="test" -DEPEND=" +PATCHES=( + "${FILESDIR}/${PN}-2019.05-0001-Fix-build-with-boost-1.73.patch" +) + +RDEPEND=" dev-cpp/eigen:3 dev-libs/boost:= + dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/gmp:0= + dev-libs/hidapi + dev-libs/libspnav dev-libs/libzip:= dev-libs/mpfr:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[-gles2-only] - dev-qt/qtmultimedia:5[-gles2-only] + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 media-gfx/opencsg - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=media-libs/glew-2.0.0:* - media-libs/harfbuzz + media-libs/fontconfig + media-libs/freetype + >=media-libs/glew-2.0.0:0= + media-libs/harfbuzz:= + media-libs/lib3mf sci-mathematics/cgal:= - >=x11-libs/qscintilla-2.9.4:=[qt5(+)] + >=x11-libs/qscintilla-2.10.3:= emacs? ( >=app-editors/emacs-23.1:* ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/itstool + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + ccache? ( dev-util/ccache ) +" src_prepare() { default + # fix path prefix sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die - # tries to call ccache even if it's not present otherwise - sed -i '/CONFIG += ccache/d' ${PN}.pro || die + # disable ccache + if ! use ccache; then + eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch" + fi } src_configure() { @@ -71,3 +93,15 @@ src_install() { einstalldocs } + +pkg_postinst() { + use emacs && elisp-site-regen + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + use emacs && elisp-site-regen + xdg_desktop_database_update + xdg_mimeinfo_database_update +} -- cgit v1.2.3