diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-06-09 16:28:52 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-06-09 16:28:52 +0000 |
| commit | 87b0873cf4b58e10f1d9c6509a4653b57e6df268 (patch) | |
| tree | 9be90ef3816ebeefddb7fb7bce04e6de599066e1 /app-pda/libplist | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-87b0873cf4b58e10f1d9c6509a4653b57e6df268.tar.gz gentoo-2-87b0873cf4b58e10f1d9c6509a4653b57e6df268.tar.bz2 gentoo-2-87b0873cf4b58e10f1d9c6509a4653b57e6df268.zip | |
Clean up the build to use cmake features directly.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-pda/libplist')
| -rw-r--r-- | app-pda/libplist/ChangeLog | 6 | ||||
| -rw-r--r-- | app-pda/libplist/files/libplist-0.12-rpath.patch | 11 | ||||
| -rw-r--r-- | app-pda/libplist/libplist-0.12.ebuild | 20 |
3 files changed, 16 insertions, 21 deletions
diff --git a/app-pda/libplist/ChangeLog b/app-pda/libplist/ChangeLog index 92a0a107c57a..a6516a4fc5d7 100644 --- a/app-pda/libplist/ChangeLog +++ b/app-pda/libplist/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-pda/libplist # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/ChangeLog,v 1.1 2009/06/08 22:57:56 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/ChangeLog,v 1.2 2009/06/09 16:28:52 scarabeus Exp $ + + 09 Jun 2009; Tomas Chvatal <scarabeus@gentoo.org> libplist-0.12.ebuild, + -files/libplist-0.12-rpath.patch: + Clean up the build to use cmake features directly. *libplist-0.12 (08 Jun 2009) diff --git a/app-pda/libplist/files/libplist-0.12-rpath.patch b/app-pda/libplist/files/libplist-0.12-rpath.patch deleted file mode 100644 index d44ed0d9ec3b..000000000000 --- a/app-pda/libplist/files/libplist-0.12-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur libplist-0.12.orig/CMakeLists.txt libplist-0.12/CMakeLists.txt ---- libplist-0.12.orig/CMakeLists.txt 2009-05-05 00:09:22.000000000 +0300 -+++ libplist-0.12/CMakeLists.txt 2009-06-09 01:47:35.000000000 +0300 -@@ -1,5 +1,7 @@ - PROJECT( libplist ) - -+SET( CMAKE_SKIP_RPATH TRUE ) -+ - SET( LIBPLIST_VERSION_MAJOR "0" ) - SET( LIBPLIST_VERSION_MINOR "12" ) - SET( LIBPLIST_SOVERSION "0" )
\ No newline at end of file diff --git a/app-pda/libplist/libplist-0.12.ebuild b/app-pda/libplist/libplist-0.12.ebuild index d908b1792712..3486163a0cc9 100644 --- a/app-pda/libplist/libplist-0.12.ebuild +++ b/app-pda/libplist/libplist-0.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/libplist-0.12.ebuild,v 1.3 2009/06/08 23:38:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/libplist-0.12.ebuild,v 1.4 2009/06/09 16:28:52 scarabeus Exp $ EAPI=2 inherit cmake-utils eutils multilib python @@ -20,15 +20,17 @@ DEPEND="${RDEPEND} dev-lang/swig" src_prepare() { - epatch "${FILESDIR}"/${P}-rpath.patch - python_version sed -e 's:-Werror::g' \ - -e "s:\${PYTHON_VERSION}:${PYVER}:g" \ - -e "s:\${CMAKE_INSTALL_LIBDIR}:/usr/$(get_libdir):g" \ - -i swig/CMakeLists.txt -i src/CMakeLists.txt \ - -i CMakeLists.txt || die "sed failed" - sed -i -e "s:\${CMAKE_INSTALL_LIBDIR}:$(get_libdir):" \ - libplist.pc.in || die "sed failed" + -i swig/CMakeLists.txt || die "sed failed" +} + +src_configure() { + python_version + mycmakeargs="-DCMAKE_SKIP_RPATH=ON + -DCMAKE_INSTALL_LIBDIR=$(get_libdir) + -DPYTHON_VERSION=${PYVER} + " + cmake-utils_src_configure } pkg_postinst() { |