diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2012-06-13 23:21:50 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2012-06-13 23:21:50 +0000 |
| commit | fee7f959ecfb9342451bc091ba65ff2ac9c95224 (patch) | |
| tree | dc998f88c6e84e979d88a6257a4114540b79d017 /app-text | |
| parent | ppc stable (bug 385267) (diff) | |
| download | gentoo-2-fee7f959ecfb9342451bc091ba65ff2ac9c95224.tar.gz gentoo-2-fee7f959ecfb9342451bc091ba65ff2ac9c95224.tar.bz2 gentoo-2-fee7f959ecfb9342451bc091ba65ff2ac9c95224.zip | |
Revert 'rpath' commit. Not the way to go.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/poppler/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/poppler/files/rpath.cmake | 10 | ||||
| -rw-r--r-- | app-text/poppler/poppler-0.18.4-r1.ebuild | 12 |
3 files changed, 6 insertions, 22 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index 75bb7e0e73b1..3fc0924ea1e8 100644 --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/poppler # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.321 2012/06/01 08:54:26 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.322 2012/06/13 23:21:49 reavertm Exp $ + + 13 Jun 2012; Maciej Mrozowski <reavertm@gentoo.org> -files/rpath.cmake, + poppler-0.18.4-r1.ebuild: + Revert 'rpath' commit. Not the way to go. 01 Jun 2012; Justin Lecher <jlec@gentoo.org> poppler-0.18.4-r1.ebuild, +files/rpath.cmake: diff --git a/app-text/poppler/files/rpath.cmake b/app-text/poppler/files/rpath.cmake deleted file mode 100644 index b896c8789185..000000000000 --- a/app-text/poppler/files/rpath.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# use, i.e. don't skip the full RPATH for the build tree -SET(CMAKE_SKIP_BUILD_RPATH FALSE) - -# when building, don't use the install RPATH already -# (but later on when installing) -SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - -# add the automatically determined parts of the RPATH -# which point to directories outside the build tree to the install RPATH -SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) diff --git a/app-text/poppler/poppler-0.18.4-r1.ebuild b/app-text/poppler/poppler-0.18.4-r1.ebuild index 834abb294179..028158b90363 100644 --- a/app-text/poppler/poppler-0.18.4-r1.ebuild +++ b/app-text/poppler/poppler-0.18.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.4-r1.ebuild,v 1.10 2012/06/01 08:54:26 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.4-r1.ebuild,v 1.11 2012/06/13 23:21:49 reavertm Exp $ EAPI="4" @@ -54,16 +54,6 @@ PATCHES=( "${FILESDIR}/${P}-newline.patch" ) DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO) -src_prepare() { - if use prefix && use qt4; then - cp "${FILESDIR}"/rpath.cmake . - sed \ - -i '1iinclude(rpath.cmake)' \ - CMakeLists.txt || die - fi - base_src_prepare -} - src_configure() { mycmakeargs=( -DBUILD_GTK_TESTS=OFF |