From 811b862e6fecb5ca21b68d91df1776a71891a611 Mon Sep 17 00:00:00 2001
From: Dominik Kapusta <ayoy@gentoo.org>
Date: Wed, 3 Nov 2010 05:34:53 +0000
Subject: Fix pkgconfig file (bug #343573).

(Portage version: 2.1.9.24/cvs/Linux x86_64)
---
 dev-python/shiboken/ChangeLog                      |  8 +++++-
 .../shiboken/files/shiboken-fix-pkgconfig.patch    | 20 +++++++++++++++
 dev-python/shiboken/shiboken-0.5.0-r1.ebuild       | 29 ++++++++++++++++++++++
 dev-python/shiboken/shiboken-0.5.0.ebuild          | 27 --------------------
 4 files changed, 56 insertions(+), 28 deletions(-)
 create mode 100644 dev-python/shiboken/files/shiboken-fix-pkgconfig.patch
 create mode 100644 dev-python/shiboken/shiboken-0.5.0-r1.ebuild
 delete mode 100644 dev-python/shiboken/shiboken-0.5.0.ebuild

(limited to 'dev-python')

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-r1.ebuild b/dev-python/shiboken/shiboken-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..ad13b1f0ed5e
--- /dev/null
+++ b/dev-python/shiboken/shiboken-0.5.0-r1.ebuild
@@ -0,0 +1,29 @@
+# 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-r1.ebuild,v 1.1 2010/11/03 05:34:53 ayoy Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="A tool for creating Python bindings for C++ libraries"
+HOMEPAGE="http://www.pyside.org/"
+SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=dev-python/apiextractor-0.8.0
+	>=dev-python/generatorrunner-0.6.1
+	>=x11-libs/qt-core-4.5.0"
+RDEPEND="${DEPEND}
+	!dev-python/boostpythongenerator"
+
+PATCHES=( "${FILESDIR}/${PN}-fix-pkgconfig.patch" )
+
+src_install() {
+	cmake-utils_src_install
+	dodoc ChangeLog || die "dodoc failed"
+}
diff --git a/dev-python/shiboken/shiboken-0.5.0.ebuild b/dev-python/shiboken/shiboken-0.5.0.ebuild
deleted file mode 100644
index ea3ef68f9c21..000000000000
--- a/dev-python/shiboken/shiboken-0.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A tool for creating Python bindings for C++ libraries"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=">=dev-python/apiextractor-0.8.0
-	>=dev-python/generatorrunner-0.6.1
-	>=x11-libs/qt-core-4.5.0"
-RDEPEND="${DEPEND}
-	!dev-python/boostpythongenerator"
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog || die "dodoc failed"
-}
-- 
cgit v1.2.3-65-gdbad