diff options
| author |   eroen <eroen@occam.eroen.eu> | 2014-08-17 20:23:49 +0200 |
|---|---|---|
| committer | eroen <eroen@occam.eroen.eu> | 2014-08-17 22:32:07 +0200 |
| commit | f30a121b932167c37103dd993cacc684bedb8506 (patch) | |
| tree | 3e2920c644ffe435b3dfabcd1a6c5c901e675900 | |
| parent | wine-1.7.21 - teso patch (diff) | |
| download | eroen-f30a121b932167c37103dd993cacc684bedb8506.tar.gz eroen-f30a121b932167c37103dd993cacc684bedb8506.tar.bz2 eroen-f30a121b932167c37103dd993cacc684bedb8506.zip | |
libgraphics - never install in system libdir
| -rw-r--r-- | dev-libs/libgraphics/libgraphics-40.06.ebuild | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/dev-libs/libgraphics/libgraphics-40.06.ebuild b/dev-libs/libgraphics/libgraphics-40.06.ebuild index 0d0a7e4..abfa36b 100644 --- a/dev-libs/libgraphics/libgraphics-40.06.ebuild +++ b/dev-libs/libgraphics/libgraphics-40.06.ebuild @@ -32,15 +32,9 @@ LIBDEPEND=" sys-libs/ncurses[abi_x86_32] sys-libs/zlib[abi_x86_32] x11-libs/gtk+:2[abi_x86_32] - egg? ( =games-util/dfhack-0.${PV}*[egg] ) - " -BLOCKDEPEND="!egg? ( - !<${CATEGORY}/${PF}[-egg] - !>${CATEGORY}/${PF}[-egg] - )" -RDEPEND="${LIBDEPEND} - ${BLOCKDEPEND} + egg? ( games-util/dfhack:${SLOT}[egg] ) " +RDEPEND="${LIBDEPEND}" DEPEND="${HDEPEND} ${LIBDEPEND} " @@ -51,7 +45,7 @@ pkg_setup() { multilib_toolchain_setup x86 games_pkg_setup - df_LIBPATH=$(games_get_libdir)/dwarffortress-${PV} + df_LIBPATH=$(games_get_libdir)/dwarffortress-${SLOT} } src_prepare() { @@ -74,14 +68,10 @@ src_compile() { } src_install() { - if use egg; then - exeinto "${df_LIBPATH}" - doexe "libs/libgraphics.so" - prepgamesdirs - # userpriv: portage user will need to link against libraries here. - fperms o+rx "${df_LIBPATH}" - else - dogameslib.so "libs/libgraphics.so" - prepgamesdirs - fi + # libgraphics lacks SONAME, so we keep it out of system libdir. + exeinto "${df_LIBPATH}" + doexe "libs/libgraphics.so" + prepgamesdirs + # userpriv: portage user will need to link against libraries here. + fperms o+rx "${df_LIBPATH}" } |