Version bump, remove old and update patch

(Portage version: 2.2_rc90/cvs/Linux i686)

5 files changed, 17 insertions, 64 deletions

diff --git a/dev-python/shiboken/ChangeLog b/dev-python/shiboken/ChangeLog
index ebbc74f97ff6..fb9df5353e15 100644
--- a/dev-python/shiboken/ChangeLog
+++ b/dev-python/shiboken/ChangeLog
@@ -1,6 +1,14 @@
 # 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.5 2010/11/03 05:34:53 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/ChangeLog,v 1.6 2010/11/25 01:18:06 chiiph Exp $
+
+*shiboken-0.5.1 (25 Nov 2010)
+
+  25 Nov 2010; Tomas Touceda <chiiph@gentoo.org> -shiboken-0.3.2.ebuild,
+  -shiboken-0.4.0.ebuild, -shiboken-0.5.0-r1.ebuild, +shiboken-0.5.1.ebuild,
+  +files/shiboken-0.5.1-fix-pkgconfig.patch,
+  -files/shiboken-fix-pkgconfig.patch:
+  Version bump, remove old and update patch
 
 *shiboken-0.5.0-r1 (03 Nov 2010)
 
diff --git a/dev-python/shiboken/files/shiboken-fix-pkgconfig.patch b/dev-python/shiboken/files/shiboken-0.5.1-fix-pkgconfig.patch
index 8aa1f123a12d..251adf06c304 100644
--- a/dev-python/shiboken/files/shiboken-fix-pkgconfig.patch
+++ b/dev-python/shiboken/files/shiboken-0.5.1-fix-pkgconfig.patch
@@ -1,7 +1,6 @@
-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
+diff -Naur shiboken-0.5.1.orig/data/shiboken.pc.in shiboken-0.5.1/data/shiboken.pc.in
+--- shiboken-0.5.1.orig/data/shiboken.pc.in	2010-10-11 19:23:01.000000000 -0300
++++ shiboken-0.5.1/data/shiboken.pc.in	2010-11-24 22:01:54.000000000 -0300
 @@ -1,12 +1,13 @@
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=@CMAKE_INSTALL_PREFIX@
@@ -14,7 +13,7 @@ index ed1cc6c..528fd26 100644
  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}
+ Libs: -L${libdir} -lpython -lshiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
+-Cflags: -I${includedir}/shiboken@shiboken_SUFFIX@
 +Cflags: -I${includedir}
  
diff --git a/dev-python/shiboken/shiboken-0.3.2.ebuild b/dev-python/shiboken/shiboken-0.3.2.ebuild
deleted file mode 100644
index 2eae7a5197f5..000000000000
--- a/dev-python/shiboken/shiboken-0.3.2.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.3.2.ebuild,v 1.2 2010/06/16 19:36:37 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.6.0
-	>=dev-python/generatorrunner-0.5.0
-	>=x11-libs/qt-core-4.5.0"
-RDEPEND="${DEPEND}
-	!dev-python/boostpythongenerator"
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/dev-python/shiboken/shiboken-0.4.0.ebuild b/dev-python/shiboken/shiboken-0.4.0.ebuild
deleted file mode 100644
index 56002635fee7..000000000000
--- a/dev-python/shiboken/shiboken-0.4.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.4.0.ebuild,v 1.1 2010/08/24 19:46:29 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.7.0
-	>=dev-python/generatorrunner-0.6.0
-	>=x11-libs/qt-core-4.5.0"
-RDEPEND="${DEPEND}
-	!dev-python/boostpythongenerator"
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/dev-python/shiboken/shiboken-0.5.0-r1.ebuild b/dev-python/shiboken/shiboken-0.5.1.ebuild
index ad13b1f0ed5e..8792e323f702 100644
--- a/dev-python/shiboken/shiboken-0.5.0-r1.ebuild
+++ b/dev-python/shiboken/shiboken-0.5.1.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-r1.ebuild,v 1.1 2010/11/03 05:34:53 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-0.5.1.ebuild,v 1.1 2010/11/25 01:18:06 chiiph Exp $
 
 EAPI="2"
 
@@ -15,13 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND=">=dev-python/apiextractor-0.8.0
+DEPEND=">=dev-python/apiextractor-0.8.1
 	>=dev-python/generatorrunner-0.6.1
 	>=x11-libs/qt-core-4.5.0"
 RDEPEND="${DEPEND}
 	!dev-python/boostpythongenerator"
 
-PATCHES=( "${FILESDIR}/${PN}-fix-pkgconfig.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix-pkgconfig.patch" )
 
 src_install() {
 	cmake-utils_src_install