commit: 4502d1d3627999a8a3f593bfe819ba21ba43ea57 Author: Michael Weber <michael <AT> xmw <DOT> de> AuthorDate: Mon Jun 13 20:23:02 2016 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Mon Jun 13 20:23:02 2016 +0000 URL: https://gitweb.gentoo.org/dev/xmw.git/commit/?id=4502d1d3
media-video/dcpomatic: drop ldconfig, use PATCHES Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0x71D573A82F434065 media-video/dcpomatic/dcpomatic-2.8.0.ebuild | 11 +++++++---- .../dcpomatic/files/dcpomatic-2.8.0-no-ldconfig.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/media-video/dcpomatic/dcpomatic-2.8.0.ebuild b/media-video/dcpomatic/dcpomatic-2.8.0.ebuild index 9452d1b..e4e1fc6 100644 --- a/media-video/dcpomatic/dcpomatic-2.8.0.ebuild +++ b/media-video/dcpomatic/dcpomatic-2.8.0.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) PYTHON_REQ_USE="threads(+)" -inherit eutils python-any-r1 waf-utils wxwidgets +inherit python-any-r1 waf-utils wxwidgets DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files" HOMEPAGE="http://dcpomatic.com/"; @@ -28,7 +28,7 @@ RDEPEND="dev-cpp/cairomm dev-libs/libcxml dev-libs/libzip dev-libs/openssl:0 - media-gfx/imagemagick + || ( media-gfx/graphicsmagick media-gfx/imagemagick ) media-libs/fontconfig:1.0 media-libs/libdcp:1.0 media-libs/libsamplerate @@ -42,9 +42,12 @@ RDEPEND="dev-cpp/cairomm DEPEND="${RDEPEND} virtual/pkgconfig" -src_prepare() { - epatch "${FILESDIR}"/${P}-wxGTK3.patch +PATCHES=( + "${FILESDIR}"/${P}-wxGTK3.patch + "${FILESDIR}"/${P}-no-ldconfig.patch + ) +src_prepare() { cp -v ../waf*/waf . default diff --git a/media-video/dcpomatic/files/dcpomatic-2.8.0-no-ldconfig.patch b/media-video/dcpomatic/files/dcpomatic-2.8.0-no-ldconfig.patch new file mode 100644 index 0000000..106e239 --- /dev/null +++ b/media-video/dcpomatic/files/dcpomatic-2.8.0-no-ldconfig.patch @@ -0,0 +1,12 @@ +--- dcpomatic-2.8.0/wscript ++++ dcpomatic-2.8.0/wscript +@@ -503,8 +503,7 @@ + sys.exit(-1) + + def post(ctx): +- if ctx.cmd == 'install': +- ctx.exec_command('/sbin/ldconfig') ++ pass + + def pot(bld): + bld.recurse('src')
