Removing patch that was applied upstream (bug #297777)

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 19 insertions, 115 deletions

diff --git a/dev-python/boostpythongenerator/ChangeLog b/dev-python/boostpythongenerator/ChangeLog
index 009aa6e2fd87..31bf04e604c2 100644
--- a/dev-python/boostpythongenerator/ChangeLog
+++ b/dev-python/boostpythongenerator/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/boostpythongenerator
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/boostpythongenerator/ChangeLog,v 1.1 2009/12/20 16:26:59 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/boostpythongenerator/ChangeLog,v 1.2 2009/12/24 08:08:32 ayoy Exp $
+
+*boostpythongenerator-0.3.2 (24 Dec 2009)
+
+  24 Dec 2009; Dominik Kapusta <ayoy@gentoo.org>
+  +boostpythongenerator-0.3.2.ebuild,
+  -boostpythongenerator-0.3.2_p20091124.ebuild,
+  -files/boostpythongenerator-0.3.2_p20091124.patch:
+  Removing patch that was applied upstream (bug #297777)
 
 *boostpythongenerator-0.3.2_p20091124 (20 Dec 2009)
 
diff --git a/dev-python/boostpythongenerator/Manifest b/dev-python/boostpythongenerator/Manifest
index 98b3720fcd5b..cead89e05888 100644
--- a/dev-python/boostpythongenerator/Manifest
+++ b/dev-python/boostpythongenerator/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX boostpythongenerator-0.3.2_p20091124.patch 4100 RMD160 90a8692a0a39fdcbee4354fb262fdd3cf2622042 SHA1 7074d896439f4933e8e9009980298e68037bedf9 SHA256 51ad4859e3cfb78e07f109bebfdee786e25bdab23ccde3cc3e65b2aca0e32040
-DIST boostpythongenerator-0.3.2.tar.bz2 31512 RMD160 4ddc38b44794a5e1e4d4043c70c520ecb2807510 SHA1 e0676e454e95ad015e4566e3882fc3ccdf138e40 SHA256 7274e1df67bcaa420a5e9c9df1fe3b5ced7fbe9cf02300333c83e21e97503f67
-EBUILD boostpythongenerator-0.3.2_p20091124.ebuild 844 RMD160 2ba2036dcc94ba9781f95e5f78b5a6342fcdd7c1 SHA1 7af1e1e0f37c86b8e5295624ff8bccf1e6568b20 SHA256 5d3a82e9b1676ee1b1af8ad47f2ec1b3255db27198b522a200c4edb449777cce
-MISC ChangeLog 535 RMD160 5bd079326b5654332395da849093ca84b03ac179 SHA1 d59f067bb220162b10c29a0ec775c50c82bf0d5c SHA256 7db7812060d22b6972592053d9a918b8b5e1ebff7a29267b936dc452378ec34b
+DIST boostpythongenerator-0.3.2.tar.bz2 31507 RMD160 31d4260548c13260e6401343119495d1cc54bbab SHA1 d7605904458e08bdbe21c5a96d09cf0e274e6305 SHA256 e4b5c6c55c1954ec92a2f310c29732b35bacc06ec160d1a8f7985b0408aea55d
+EBUILD boostpythongenerator-0.3.2.ebuild 708 RMD160 d34bfc728e47c884dac18753370bf030b16dcf8c SHA1 3aaf718fc15c72b33301be90fe405dbbc90053d7 SHA256 b044449a913acaaab0db80d055d7b9cb7fe44cef07aec73a1c1a79520c93d1dc
+MISC ChangeLog 824 RMD160 c473a03f2e1f6e423e59f5447b61ea8c2e841ff9 SHA1 9a679971a105108e69a59ea5841787bcacb12727 SHA256 63fb0d0dbb2af3e76e3b05e1336bcd3cb8247d76223c3f19eee6d8c8c7f3d8b9
 MISC metadata.xml 299 RMD160 2817d6e5370fefb9f2696eb770c9ff49399d6744 SHA1 f7badb6c31b2bf048766ad33bfda5b957fb32c2f SHA256 3c3fbe2f47e5a8e7ff708d354dd82f18b10e8dfd84dfa1673a8f95dd4a07eac2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksuUF0ACgkQ+CZEqwt+F6Z4wQCeK9yr9hwIsRDMakR4nAkNS7ss
-NYwAoJMAGQA4cQYJ7DEq1Zu9oLqHg9O5
-=B+Uu
+iEYEARECAAYFAkszIYkACgkQ+CZEqwt+F6YZswCeJ36cF11myrapoHcUzLihwCt9
+sl4An3b75+vrMlm4hwCJwAAB6JGthiPn
+=rAco
 -----END PGP SIGNATURE-----
diff --git a/dev-python/boostpythongenerator/boostpythongenerator-0.3.2_p20091124.ebuild b/dev-python/boostpythongenerator/boostpythongenerator-0.3.2.ebuild
index 86540f5cd646..8f23084f295c 100644
--- a/dev-python/boostpythongenerator/boostpythongenerator-0.3.2_p20091124.ebuild
+++ b/dev-python/boostpythongenerator/boostpythongenerator-0.3.2.ebuild
@@ -1,34 +1,25 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/boostpythongenerator/boostpythongenerator-0.3.2_p20091124.ebuild,v 1.1 2009/12/20 16:26:59 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/boostpythongenerator/boostpythongenerator-0.3.2.ebuild,v 1.1 2009/12/24 08:08:32 ayoy Exp $
 
 EAPI="2"
 
 inherit cmake-utils
 
-MY_PV="${PV/_*/}"
-MY_P="${PN}-${MY_PV}"
-
 DESCRIPTION="A tool for creating Python bindings for C++ libraries"
 HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
+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-${MY_PV}
-	~dev-python/generatorrunner-${MY_PV}
+DEPEND="~dev-python/apiextractor-${PV}
+	~dev-python/generatorrunner-${PV}
 	>=x11-libs/qt-core-4.5.0"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}.patch"
-}
-
 src_install() {
 	cmake-utils_src_install
 	dodoc AUTHORS ChangeLog || die "dodoc failed"
diff --git a/dev-python/boostpythongenerator/files/boostpythongenerator-0.3.2_p20091124.patch b/dev-python/boostpythongenerator/files/boostpythongenerator-0.3.2_p20091124.patch
deleted file mode 100644
index 4998ee524e01..000000000000
--- a/dev-python/boostpythongenerator/files/boostpythongenerator-0.3.2_p20091124.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c27f621..af10096 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -28,7 +28,7 @@ target_link_libraries(boostpython_generator
-                       ${QT_QTXML_LIBRARY})
- 
- 
--install(TARGETS boostpython_generator DESTINATION ${GENERATORRUNNER_PLUGIN_DIR})
-+install(TARGETS boostpython_generator DESTINATION "${GENERATORRUNNER_PLUGIN_DIR}")
- install(TARGETS boostpythongenerator DESTINATION bin)
- 
- add_dependencies(boostpythongenerator boostpython_generator)
-diff --git a/src/convertergenerator.cpp b/src/convertergenerator.cpp
-index 23a5d36..ec4a1f9 100644
---- a/src/convertergenerator.cpp
-+++ b/src/convertergenerator.cpp
-@@ -56,7 +56,6 @@ void ConverterGenerator::finishGeneration()
-             continue;
- 
-         if (fileOutPath.isNull()) {
--            m_packageName = cls->package();
-             fileOutPath = outputDirectory() + '/' + subDirectoryForClass(cls)
-                           + "/converter_register_" + moduleName().toLower() + ".hpp";
-         }
-@@ -108,10 +107,6 @@ void ConverterGenerator::finishGeneration()
-     writeConverterRegistration(s, "register_multimap_converter", "QMultiMap", m_qmultiMapTypes);
-     s << "}\n\n";
-     s << "#endif\n\n";
--
--    m_numGeneratedWritten = m_qpairTypes.size() + m_qlistTypes.size() +
--                              m_qvectorTypes.size() + m_qmapTypes.size() +
--                              m_qhashTypes.size();
- }
- 
- void ConverterGenerator::writeConverterRegistration(QTextStream& out,
-diff --git a/src/cppgenerator.cpp b/src/cppgenerator.cpp
-index e9d6939..ceb285a 100644
---- a/src/cppgenerator.cpp
-+++ b/src/cppgenerator.cpp
-@@ -1415,9 +1415,6 @@ void CppGenerator::finishGeneration()
-         if (!shouldGenerate(cls) || cls->enclosingClass())
-             continue;
- 
--        if (m_packageName.isEmpty())
--            m_packageName = cls->package();
--
-         QString wrapperName = getWrapperName(cls);
-         QString boostFilename;
-         boostFilename += wrapperName + ".hpp";
-@@ -1429,7 +1426,7 @@ void CppGenerator::finishGeneration()
-         sClassPythonDefines << INDENT << define_str << endl;
-     }
- 
--    QString moduleFileName(outputDirectory() + "/" + subDirectoryForPackage(m_packageName));
-+    QString moduleFileName(outputDirectory() + "/" + subDirectoryForPackage(packageName()));
-     moduleFileName += "/" + moduleName().toLower() + "_module_wrapper.cpp";
- 
-     QFile file(moduleFileName);
-@@ -1480,7 +1477,7 @@ void CppGenerator::writeGlobalFunctions()
- {
-     QString fileName = moduleName().toLower() + "_globals_wrapper.cpp";
- 
--    FileOut fileOut(outputDirectory() + "/" + subDirectoryForPackage(m_packageName) + "/" + fileName);
-+    FileOut fileOut(outputDirectory() + "/" + subDirectoryForPackage(packageName()) + "/" + fileName);
- 
-     QSet<QString> includes;
-     QString defsStr;
-@@ -1526,7 +1523,7 @@ void CppGenerator::writeGlobalFunctions()
- 
-     // Add module level code snippets to 'Global' class
-     TypeSystemTypeEntry *moduleEntry = dynamic_cast<TypeSystemTypeEntry *>(
--                                            TypeDatabase::instance()->findType(m_packageName));
-+                                            TypeDatabase::instance()->findType(packageName()));
-     QString sEnd;
-     QTextStream snipEnd(&sEnd);
-     if (moduleEntry && moduleEntry->codeSnips().size() > 0) {
-diff --git a/src/hppgenerator.cpp b/src/hppgenerator.cpp
-index 427add0..21a9bc9 100644
---- a/src/hppgenerator.cpp
-+++ b/src/hppgenerator.cpp
-@@ -191,7 +191,11 @@ void HppGenerator::writeDefaultImplementation(QTextStream& s, const AbstractMeta
- {
-     QString returnValue;
-     if (func->type()) {
--        if (func->type()->isObject() || func->type()->isQObject() || func->type()->name() == "void")
-+        if (func->type()->isObject() ||
-+            func->type()->isQObject()  ||
-+            func->type()->isValuePointer() ||
-+            func->type()->isNativePointer() ||
-+            func->type()->name() == "void" )
-             returnValue = "0";
-         else
-             returnValue = functionReturnType(func) + "()";