diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-07-24 20:15:37 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-07-24 20:15:37 +0000 |
| commit | fe545d0f69b8affbe80e242a475a84cec48dd2c3 (patch) | |
| tree | 673ca9f029a13f9c5f75b326198708c09ea75a8d /dev-libs | |
| parent | Stabilizing -r1 for sensord, matches other r1 policies (diff) | |
| download | gentoo-2-fe545d0f69b8affbe80e242a475a84cec48dd2c3.tar.gz gentoo-2-fe545d0f69b8affbe80e242a475a84cec48dd2c3.tar.bz2 gentoo-2-fe545d0f69b8affbe80e242a475a84cec48dd2c3.zip | |
Fix S declaration, respect LDFLAGS on one more lib, fix mandir placement.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libsolv/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/libsolv/libsolv-0.3.0.ebuild | 17 |
2 files changed, 17 insertions, 5 deletions
diff --git a/dev-libs/libsolv/ChangeLog b/dev-libs/libsolv/ChangeLog index d0665698aa5f..b4ac1c5f0834 100644 --- a/dev-libs/libsolv/ChangeLog +++ b/dev-libs/libsolv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libsolv # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsolv/ChangeLog,v 1.3 2013/07/23 17:43:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsolv/ChangeLog,v 1.4 2013/07/24 20:15:37 scarabeus Exp $ + + 24 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> libsolv-0.3.0.ebuild: + Fix S declaration, respect LDFLAGS on one more lib, fix mandir placement. 23 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> libsolv-0.3.0.ebuild: Allow the scripting extensions to build, add comment about the second sed. diff --git a/dev-libs/libsolv/libsolv-0.3.0.ebuild b/dev-libs/libsolv/libsolv-0.3.0.ebuild index 771c7f8dcaca..4d4b9c5be506 100644 --- a/dev-libs/libsolv/libsolv-0.3.0.ebuild +++ b/dev-libs/libsolv/libsolv-0.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsolv/libsolv-0.3.0.ebuild,v 1.3 2013/07/23 17:43:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsolv/libsolv-0.3.0.ebuild,v 1.4 2013/07/24 20:15:37 scarabeus Exp $ EAPI=5 @@ -43,6 +43,9 @@ DEPEND="${DEPEND} sys-devel/gettext " +# ruby eclass :/ +S="${WORKDIR}/${P}/" + pkg_setup() { use python && python-any-r1_pkg_setup use perl && perl-module_pkg_setup @@ -50,14 +53,20 @@ pkg_setup() { } src_prepare() { - # enabling suse features also mess up headers detection + # Enabling suse features also mess up headers detection + # Can't be fixed upstream sed -i \ -e "s:include <rpm/db.h>:include <db.h>:g" \ ext/repo_rpmdb.c || die # respect ldflags ; fixed in next release - sed -i \ + sed \ -e 's:LINK_FLAGS}:LINK_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}:g' \ - src/CMakeLists.txt || die + -i src/CMakeLists.txt \ + -i ext/CMakeLists.txt || die + # mandir install ; won't be fixed upstream :-/ + sed -i \ + -e 's:MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man":MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man":g' \ + CMakeLists.txt || die } src_configure() { |