summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-pda/libplist')
-rw-r--r--app-pda/libplist/ChangeLog6
-rw-r--r--app-pda/libplist/Manifest5
-rw-r--r--app-pda/libplist/files/libplist-0.12-rpath.patch11
-rw-r--r--app-pda/libplist/libplist-0.12.ebuild20
4 files changed, 18 insertions, 24 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/Manifest b/app-pda/libplist/Manifest
index d4bdf76a1f9b..9d6e3b7a0032 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,5 +1,4 @@
-AUX libplist-0.12-rpath.patch 387 RMD160 3a887bda1203eb2e6d24b8752f947c8ea23d6c7f SHA1 c651d1dca4a75b12fd27c52d30fc5d813ac40b0c SHA256 3541c2e3a376a5227fe518b3293a98c81a2cb6656bc28c76d4531756737015a1
DIST libplist-0.12.tar.bz2 59133 RMD160 a162d39f46f4b2f8fed8644a66e8cef273935404 SHA1 bdcaff582eaf82910df580631cd1a07f22b351ca SHA256 7b8170bb26759cec0945ca28c9f77e278025f051399e3c29124be21e248f1f3c
-EBUILD libplist-0.12.ebuild 1173 RMD160 c58cf25f5bf3902ce9e4c27536cb778089eb24f7 SHA1 918a254548084b32a6cbc9d0ef4c556450cc1b33 SHA256 29f997667c39aeeb9f235afcf1ebdab0a018cd23e990e1095b1f9d2fb5360bf8
-MISC ChangeLog 449 RMD160 312111f41415a84778bd525867882aff83e45656 SHA1 312c0294bdf3c60a7893335375ee242ac6d45e27 SHA256 df0d2c51138447c2b8530228732c0e2c8cd25e51c61d230ca7af7bd41ec94e0d
+EBUILD libplist-0.12.ebuild 1052 RMD160 bf8932d2ca85dae585429c8ce102c8bae796ec78 SHA1 07a423c4c1371b2b9578e9f4363436d4547871ef SHA256 ece8b6c9d21094412a745c507c145f001eb02e93137814bc2895d34506a5b563
+MISC ChangeLog 614 RMD160 121b5520ff39c011ac18457108409d14ca703a5a SHA1 556806fcfd6fc833ed49f53717c7264b4b4dbe57 SHA256 e7f0612401cced4bae62a84a1dfaae35ad013d7dabde4d381bdc525d0bb72e62
MISC metadata.xml 250 RMD160 9b84b76c4212b2007d665eb817954438bc119f02 SHA1 3f69a31fb93ce89476bce6d689586f611017d8b4 SHA256 771f2b9efd3e845ceaef0f34ed1b40c268916e590445b2ef3dc90f7766d9aa7b
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() {