summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Kapusta <ayoy@gentoo.org>2010-11-03 05:34:53 +0000
committerDominik Kapusta <ayoy@gentoo.org>2010-11-03 05:34:53 +0000
commit811b862e6fecb5ca21b68d91df1776a71891a611 (patch)
treea1bf98f489f0d52b882e10747f77d62d38674785
parentRetiring kanaka from metadata - bug 42662. (diff)
downloadgentoo-2-811b862e6fecb5ca21b68d91df1776a71891a611.tar.gz
gentoo-2-811b862e6fecb5ca21b68d91df1776a71891a611.tar.bz2
gentoo-2-811b862e6fecb5ca21b68d91df1776a71891a611.zip
Fix pkgconfig file (bug #343573).
(Portage version: 2.1.9.24/cvs/Linux x86_64)
-rw-r--r--dev-python/shiboken/ChangeLog8
-rw-r--r--dev-python/shiboken/files/shiboken-fix-pkgconfig.patch20
-rw-r--r--dev-python/shiboken/shiboken-0.5.0-r1.ebuild (renamed from dev-python/shiboken/shiboken-0.5.0.ebuild)4
3 files changed, 30 insertions, 2 deletions
diff --git a/dev-python/shiboken/ChangeLog b/dev-python/shiboken/ChangeLog
index 55e1fa56ef8a..ebbc74f97ff6 100644
--- a/dev-python/shiboken/ChangeLog
+++ b/dev-python/shiboken/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/shiboken
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/ChangeLog,v 1.4 2010/10/06 22:04:39 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/ChangeLog,v 1.5 2010/11/03 05:34:53 ayoy Exp $
+
+*shiboken-0.5.0-r1 (03 Nov 2010)
+
+ 03 Nov 2010; Dominik Kapusta <ayoy@gentoo.org> -shiboken-0.5.0.ebuild,
+ +shiboken-0.5.0-r1.ebuild, +files/shiboken-fix-pkgconfig.patch:
+ Fix pkgconfig file (bug #343573).
*shiboken-0.5.0 (06 Oct 2010)
diff --git a/dev-python/shiboken/files/shiboken-fix-pkgconfig.patch b/dev-python/shiboken/files/shiboken-fix-pkgconfig.patch
new file mode 100644
index 000000000000..8aa1f123a12d
--- /dev/null
+++ b/dev-python/shiboken/files/shiboken-fix-pkgconfig.patch
@@ -0,0 +1,20 @@
+diff --git a/data/shiboken.pc.in b/data/shiboken.pc.in
+index ed1cc6c..528fd26 100644
+--- a/data/shiboken.pc.in
++++ b/data/shiboken.pc.in
+@@ -1,12 +1,13 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=@LIB_INSTALL_DIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken
++shiboken_SUFFIX=@shiboken_SUFFIX@
++includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken${shiboken_SUFFIX}
+ generator_location=@CMAKE_INSTALL_PREFIX@/bin/shiboken
+
+ Name: shiboken
+ Description: Support library for Python bindings created with Shiboken generator.
+ Version: @shiboken_VERSION@
+ Libs: -L${libdir} -lpython -lshiboken${shiboken_SUFFIX}
+-Cflags: -I${includedir}/shiboken${shiboken_SUFFIX}
++Cflags: -I${includedir}
+
diff --git a/dev-python/shiboken/shiboken-0.5.0.ebuild b/dev-python/shiboken/shiboken-0.5.0-r1.ebuild
index ea3ef68f9c21..ad13b1f0ed5e 100644
--- a/dev-python/shiboken/shiboken-0.5.0.ebuild
+++ b/dev-python/shiboken/shiboken-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-0.5.0.ebuild,v 1.1 2010/10/06 22:04:39 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-0.5.0-r1.ebuild,v 1.1 2010/11/03 05:34:53 ayoy Exp $
EAPI="2"
@@ -21,6 +21,8 @@ DEPEND=">=dev-python/apiextractor-0.8.0
RDEPEND="${DEPEND}
!dev-python/boostpythongenerator"
+PATCHES=( "${FILESDIR}/${PN}-fix-pkgconfig.patch" )
+
src_install() {
cmake-utils_src_install
dodoc ChangeLog || die "dodoc failed"