From: Ian Delaney Date: Wed, 14 Jan 2015 05:30:52 +0000 (+0000) Subject: bump; clean old impl, rm disused patches & old versions X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d72317561d97256b357e30febd40cc16ef93c5a;p=gentoo.git bump; clean old impl, rm disused patches & old versions Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- diff --git a/dev-python/pycxx/ChangeLog b/dev-python/pycxx/ChangeLog index 206fa80e389d..427195f419f0 100644 --- a/dev-python/pycxx/ChangeLog +++ b/dev-python/pycxx/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-python/pycxx -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/ChangeLog,v 1.51 2014/08/14 23:58:14 idella4 Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/ChangeLog,v 1.52 2015/01/14 05:30:22 idella4 Exp $ + +*pycxx-6.2.6 (14 Jan 2015) + + 14 Jan 2015; Ian Delaney +pycxx-6.2.6.ebuild, + -files/pycxx-6.2.3-python-3.2-Py_hash_t.patch, + -files/pycxx-6.2.3-python-3.2.patch, -files/pycxx-6.2.3-python-3.patch, + -pycxx-6.2.3-r2.ebuild, -pycxx-6.2.3-r3.ebuild, -pycxx-6.2.4-r1.ebuild, + -pycxx-6.2.4.ebuild, pycxx-6.2.5.ebuild: + bump; clean old impl, rm disused patches & old versions 14 Aug 2014; Ian Delaney pycxx-6.2.5.ebuild: drop py2.6 pypy add py3_4 diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest index 0047db068e0a..01ecbad77a86 100644 --- a/dev-python/pycxx/Manifest +++ b/dev-python/pycxx/Manifest @@ -2,23 +2,16 @@ Hash: SHA256 AUX pycxx-6.2.3-installation.patch 1248 SHA256 f6c47b1d613b01511e55cefbc0e0564c402374fc0a4340848f712011b416f7de SHA512 34eaf885611dddb4b7a650d9b2d162fbe559b5f0fcf19f514e1d9cf65e15944c43a9e0c988da815c00a92652495ef9a94a98634d11d9291d28b1f41289fb9d81 WHIRLPOOL bf2eb66f995a28f27cc55b52093610511802ff126e563c21660da64c5ac5a3af32abd6c90e2f9408d661396d5b740aacef247b388fa15110e8dd7138b24e63ee -AUX pycxx-6.2.3-python-3.2-Py_hash_t.patch 872 SHA256 3ebb1b94fa362b845e395bcefdf016382797c2b8847fb4026e002755721f6076 SHA512 d31d6cc2f91991419d62b642d7758f1e6f2f46cee9a64d2340128a04f17973869fab13c9c61974edd17d6a5e1fae79db76e60ac95d223f06bc306350b44bd4fc WHIRLPOOL 3c8805242644d8fd0e077bf9958c7c3c05f4dcd1f09dd47f2ea2bdcd4e150662603d9f53250e4388789a1e6aa3af4cfd61994e5137b1134d036c404c72b3311b -AUX pycxx-6.2.3-python-3.2.patch 10198 SHA256 9a7cd9946a815d27631cb92afead183adf2652798df5c92058518f999164dbbc SHA512 add5756864133acf21cf649c85466eba5af882b7f1d38f9137d9c12e673fab34f9daa46c3e3c3e2d222eea54063eb2df502e6f8f2cf19593cee0ecc0dc80c11b WHIRLPOOL 2a725d6865cbf7d02ee9d77e1ea21f77a8be76f781a63e1bf641e26759945778021c21c836bf562c381cb94ec6233cf11c542af38e0135d02bc72f6f963e7b16 -AUX pycxx-6.2.3-python-3.patch 1063 SHA256 3a06d5841d2f8e1dfa65b7d7197e8d72df652688956bc22d724aa89064612792 SHA512 85a2e47dfdd54b6434490af48befdcd05bbf6b30edc3f258397df4bff294284c26295797ccb3a402ba5a7d5a4648734eeaba56dacfa3814abb6ba530cf4dc223 WHIRLPOOL b48f4776747c3c842b93475798d9eacf840413d65692e63a92a4506f2dfcb1d548f6d768a8fe24e1cfe415de2c3b83587ad428ba1cc5dbcfaf244d7f3c5e07d1 -DIST pycxx-6.2.3.tar.gz 140787 SHA256 74b89aec29f3fc40ce08b402f05bb6955f6546a796d2aeb3193737a268f6a4f2 SHA512 e1fdf74fb99df41be38d6b854400bed1c58a62e9fa457e8d2c7014f9f86799f5ad600cdd0af06e92eb4009d8c611135b09f3da282f7a1983e6a02186c47d75ce WHIRLPOOL 265e5115630139b6f3ab035b56aaff8fd466eb734e84265ed292d31f41d960ee0afac4e30a77ca249e29eed8159bc5c37e920fd1b1f178f9017d1c9c1fb4b79e -DIST pycxx-6.2.4.tar.gz 140844 SHA256 362d8eec746abca8436299f4926fbafd9ce2faacca39eaa90f53ffc383b41f18 SHA512 d52e953f68b235ac8812fd3d8ce4801a8deb11648e8aaa0aecf42165badc1159c41df2feb330ce681082d2fb3df79ccbeefeb0e12d72e5f82dcc2628c699e049 WHIRLPOOL 100c93db7e52d1e9e4157f2e31f3ba1e29526cd0413990cb96baaf9c7cf6e0edb09786f13041527143ec56236467a40dea0d10225c62f61c2ae8441f308c6903 DIST pycxx-6.2.5.tar.gz 141302 SHA256 f125c1b569d32dcfc5bdca565be0311306a2d759196460a5cac665cb515b014c SHA512 c7a5eeacdcb3f68e0a2336a33e6a84d6a7b240e4d232ce0f2676c4a467bf2c8b109eebd63ee42b655efa1f1993fe66a590459a9fbe7315b6c0a57501c73ff3b4 WHIRLPOOL 0792cf9050a21a3774d13124838300663f3b0fe458a243d9aadff2177772e5be0516e0c8a806c572401c28d59c98a252162267c65fc9010a6ea0af0bbdb6c254 -EBUILD pycxx-6.2.3-r2.ebuild 1132 SHA256 254137f264ed7a93e8ce451db639f0fc52f86cbe5df99d1ecabf62fd3a382a92 SHA512 31b2968f0ece2d8e450ffe99fd9521a7012b3fbd8ad9f8359082a4fefb5fd234095a2fd0854fda3f95f8df3cf9ef2a6db4691acdc1bd73219426fc2c6b739044 WHIRLPOOL 2f7f7c28327cebcc7bd5df8f3de7472ed26b96976b608556450039a761e5b999484a71ceead382298070ed736c03cd1b4c6de221f5e13445cc5bdbaa689ecf00 -EBUILD pycxx-6.2.3-r3.ebuild 1289 SHA256 64543420c3701789a32864b1f172dc990b76c8703811f9a956677b1a2681e613 SHA512 cd4d9bd4b3c58f0ccb4b090b9287827e48d7dcdad35d130688d47f6482dadd1ae4d8a9a8e69f00967c6b744990bf7308ffeab092b94bf2de5c20ebbc79d76203 WHIRLPOOL 65e724daf41033ab997ef2e6ab2070e505d6062b12036dc8b3bccc3f148485919f16ac4082cf91b30e3d9d96b7db73f3f3eaa46e20283bfe6740f124056cfbde -EBUILD pycxx-6.2.4-r1.ebuild 1190 SHA256 82f09a7c29c7386d3a51528f1ea683e291d0582a2601289aaa0ef029d54f016d SHA512 bb899446fb4e94352124a822a6d412f42c0ebdbafdfe41fa6bbb8471ab54bf7a75c890777740c149faf09cf10b0492ca14bfc5de9442c1e7e0601174af7aaa65 WHIRLPOOL 945f265a25e71fd395ab342749345dd259c52c7ea5dd65f50e7e7ad99281daa60539bb23af1fb7320cc61df9a66ee9972345a4066a59657c5cbd96cc814770f3 -EBUILD pycxx-6.2.4.ebuild 1025 SHA256 dda316f14c464d7288d3da2ed150528af6fc6db173468b43f437f4b498550bd6 SHA512 7c3b17bf78ae84b1655c340a88f1852a5d4375595703dba4fb2b4b9024c69a294786d05168b24543d9611237620bd9f38caf2557e6c6270b543131dc6c092e07 WHIRLPOOL fdf12f07da36de754edea968e7caa3f15bbe540cbcf425de8cd384e3f51f050b37f969521194578e1c25a75b477b3c7f0c012ae1d8c68bfd35944e916ea0f915 -EBUILD pycxx-6.2.5.ebuild 1098 SHA256 8c91bb84e4ebfee3feba177a5ac296667e28ba69739f1388b96d4bdea4a653c7 SHA512 1321845b447208f15aae796af99a051aeeecb483938e0fd6611236dec626fb645fee6c765b302f3d4a4bf20544265fa0c173afdf66b05cd27f08e85216787e76 WHIRLPOOL 42af5eec832ff2c5137749dd086bb24f0af7e309d698c47a7077ebad6cebc549d02394ab82e6b7c0376d3092b6a739ad497f9ad281a6eefce8e303d0fa9aad64 -MISC ChangeLog 6814 SHA256 818d3d7cb190c26d90765fb21f71ddb18d498bc7f336a3310cf9e749301371fa SHA512 46d2a4a18f3972367ebe13d1177fb2cd6ebf9c2a12d5e74e5ce51673e00ee03c5553f1a1268fd8a333c6a06e6336986c72b57ba3b53c1b77fbb27fdb37180811 WHIRLPOOL 80f8f058f0266cd15e381a162165f8fd2710770512f54b8a9450b6345d9cb1e2560c10b7080fe1940f907b80ab1d41fb45ebd0e335057368192c52ed60266be6 +DIST pycxx-6.2.6.tar.gz 141547 SHA256 3e960db53dea640473410ea20063afe7fcfcb61c107334d7ff6af96d384c11fe SHA512 9a6c30acb99c112497c02fb0826dc0197bbf4b813d25eab3f7d6537dfd83db8150c94f617f79810bbcca64496b8d6e67b1a41446523d66031c54c21e0425ea0c WHIRLPOOL 570cc1ccd12748481c74aefe863a2cef2d2d048ddbeceeeea01477a6d1765f38582f3c9112c8d5fddf6f534b91c74aea11b38aab8da04ced18280047a0821090 +EBUILD pycxx-6.2.5.ebuild 1098 SHA256 d8f7535b74ef55a4d615a8dcc17225893a5d5718e66721bb264e986baa2d0007 SHA512 cce681e411e70f8b1c85703d9be95cecbbfb04e17c5c101d1145c1c58b865cf639935354dc13f1ac43182bca9e90404ce0c44a78ca101fb855eefd970c9002a0 WHIRLPOOL f15ac39f2ce6e101d42f32c3b6feea9b5d20c11fb40538439f0e439b5aec79fcb2a14a16592ca56d4db6007f02924548113637833f4258197f2f5da90cf95f94 +EBUILD pycxx-6.2.6.ebuild 1099 SHA256 547f6a89ae6116f77dafffa429324c207fea1dcdcf7e6fa84b396b0255a41c84 SHA512 20e0640a5e283aea54cf9284a8a056543d8f23a6aaf25f2b9ed571cd0db7a86cd83ecbef7ad9e22c0c1979cb8ce8c0c461650b2cb5ebb431d16d2cab1943665f WHIRLPOOL 27ee02f30f10638f97723c4a73edf13b6b9021244d9b841ef5f4d7980de22571d2c766de3816ba92a9537e1e5895101b434522110781d564c89a346843e3a90f +MISC ChangeLog 7210 SHA256 3af5d94e3c16b41dbed7f775499ac24ec8cee5191beed57687d0dd7c6298b44f SHA512 deb857d7f4c31370a8ac0ed337a67bd4574fb88955c9ba65fead0acebfdbee097465273407f328559df0458c022201d12ae66de5ed808011f3f599b43ff35ecb WHIRLPOOL 29546b8ea0f6c00c420ad785f46c3b0634ec7ec254e1fd2d4f0e4477d3ad5df8df2bfb24ce1ac933d6d51021c81efe0bb26b556b624a7e1ad044942bd46c57b5 MISC metadata.xml 556 SHA256 cb33179b683664b2fdfce0dbc687c7816bc2d15417aeb7025db6c50063cdc3ab SHA512 b14b677e812eb8f653101f6e0754e349c99f5e33847f3c824d0b6ac4c05f13495fbc2b6ca3db29afabfd79df57a52912fcb5b05b729099313ba68e18aec12b1e WHIRLPOOL d274dba1203c377697f387634a9339f74dfed4a414e5bf245381c0699f08cf0f325be73527945128c0981b03309d7ca3547fb71370439b567dbfe3506d7ca3f9 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlPtSwMACgkQso7CE7gHKw1+2QCggIGw4vHq50gJPLvp4qMv6bgn -ZcIAnAxhB/Jnvmr8kLziUDgVdtWlV/+P -=ezyc +iEYEAREIAAYFAlS1/wEACgkQso7CE7gHKw3QAwCeIPEhPiEuPugxaCYQB31vKBZC +RO4An1n9geSfF493SD7DRYvwN6KGCECs +=5CNS -----END PGP SIGNATURE----- diff --git a/dev-python/pycxx/files/pycxx-6.2.3-python-3.2-Py_hash_t.patch b/dev-python/pycxx/files/pycxx-6.2.3-python-3.2-Py_hash_t.patch deleted file mode 100644 index c2bb0b78fdb4..000000000000 --- a/dev-python/pycxx/files/pycxx-6.2.3-python-3.2-Py_hash_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://sourceforge.net/tracker/?func=detail&aid=3464317&group_id=3180&atid=303180 ---- Src/Python3/cxx_extensions.cxx -+++ Src/Python3/cxx_extensions.cxx -@@ -225,7 +225,11 @@ - static PyObject *rich_compare_handler( PyObject *, PyObject *, int ); - static PyObject *repr_handler( PyObject * ); - static PyObject *str_handler( PyObject * ); -+#if PY_VERSION_HEX >= 0x03020000 -+ static Py_hash_t hash_handler( PyObject * ); -+#else - static long hash_handler( PyObject * ); -+#endif - static PyObject *call_handler( PyObject *, PyObject *, PyObject * ); - static PyObject *iter_handler( PyObject * ); - static PyObject *iternext_handler( PyObject * ); -@@ -714,7 +718,11 @@ - } - } - -+#if PY_VERSION_HEX >= 0x03020000 -+extern "C" Py_hash_t hash_handler( PyObject *self ) -+#else - extern "C" long hash_handler( PyObject *self ) -+#endif - { - try - { diff --git a/dev-python/pycxx/files/pycxx-6.2.3-python-3.2.patch b/dev-python/pycxx/files/pycxx-6.2.3-python-3.2.patch deleted file mode 100644 index 84c02f4aee49..000000000000 --- a/dev-python/pycxx/files/pycxx-6.2.3-python-3.2.patch +++ /dev/null @@ -1,232 +0,0 @@ -http://cxx.svn.sourceforge.net/viewvc?view=revision&revision=266 - ---- CXX/Python3/ExtensionModule.hxx -+++ CXX/Python3/ExtensionModule.hxx -@@ -82,8 +82,6 @@ - extern "C" PyObject *method_varargs_call_handler( PyObject *_self_and_name_tuple, PyObject *_args ); - extern "C" PyObject *method_keyword_call_handler( PyObject *_self_and_name_tuple, PyObject *_args, PyObject *_keywords ); - -- extern "C" void do_not_dealloc( void * ); -- - template - class ExtensionModule : public ExtensionModuleBase - { -@@ -134,11 +132,11 @@ - { - MethodDefExt *method_def = (*i).second; - -- static PyObject *self = PyCObject_FromVoidPtr( this, do_not_dealloc ); -+ static PyObject *self = PyCapsule_New( this, NULL, NULL ); - - Tuple args( 2 ); - args[0] = Object( self ); -- args[1] = Object( PyCObject_FromVoidPtr( method_def, do_not_dealloc ) ); -+ args[1] = Object( PyCapsule_New( method_def, NULL, NULL ) ); - - PyObject *func = PyCFunction_New - ( ---- CXX/Python3/ExtensionOldType.hxx -+++ CXX/Python3/ExtensionOldType.hxx -@@ -178,7 +178,7 @@ - Tuple self( 2 ); - - self[0] = Object( this ); -- self[1] = Object( PyCObject_FromVoidPtr( method_def, do_not_dealloc ) ); -+ self[1] = Object( PyCapsule_New( method_def, NULL, NULL ) ); - - PyObject *func = PyCFunction_New( &method_def->ext_meth_def, self.ptr() ); - -@@ -237,7 +237,7 @@ - T *self = static_cast( self_in_cobject ); - - MethodDefExt *meth_def = reinterpret_cast *>( -- PyCObject_AsVoidPtr( self_and_name_tuple[1].ptr() ) ); -+ PyCapsule_GetPointer( self_and_name_tuple[1].ptr(), NULL ) ); - - Object result; - -@@ -273,7 +273,7 @@ - PyObject *self_in_cobject = self_and_name_tuple[0].ptr(); - T *self = static_cast( self_in_cobject ); - MethodDefExt *meth_def = reinterpret_cast *>( -- PyCObject_AsVoidPtr( self_and_name_tuple[1].ptr() ) ); -+ PyCapsule_GetPointer( self_and_name_tuple[1].ptr(), NULL ) ); - - Tuple args( _args ); - -@@ -310,7 +310,7 @@ - PyObject *self_in_cobject = self_and_name_tuple[0].ptr(); - T *self = static_cast( self_in_cobject ); - MethodDefExt *meth_def = reinterpret_cast *>( -- PyCObject_AsVoidPtr( self_and_name_tuple[1].ptr() ) ); -+ PyCapsule_GetPointer( self_and_name_tuple[1].ptr(), NULL ) ); - - Tuple args( _args ); - ---- CXX/Python3/IndirectPythonInterface.hxx -+++ CXX/Python3/IndirectPythonInterface.hxx -@@ -109,9 +109,6 @@ - PyTypeObject * _Method_Type(); - bool _Method_Check( PyObject *op ); - --PyTypeObject * _CObject_Type(); --bool _CObject_Check( PyObject *op ); -- - PyTypeObject * _Complex_Type(); - bool _Complex_Check( PyObject *op ); - ---- Src/IndirectPythonInterface.cxx -+++ Src/IndirectPythonInterface.cxx -@@ -40,7 +40,6 @@ - namespace Py - { - bool _CFunction_Check( PyObject *op ) { return op->ob_type == _CFunction_Type(); } --bool _CObject_Check( PyObject *op ) { return op->ob_type == _CObject_Type(); } - bool _Complex_Check( PyObject *op ) { return op->ob_type == _Complex_Type(); } - bool _Dict_Check( PyObject *op ) { return op->ob_type == _Dict_Type(); } - bool _Float_Check( PyObject *op ) { return op->ob_type == _Float_Type(); } -@@ -59,6 +58,7 @@ - #if PY_MAJOR_VERSION == 2 - bool _String_Check( PyObject *op ) { return op->ob_type == _String_Type(); } - bool _Int_Check( PyObject *op ) { return op->ob_type == _Int_Type(); } -+bool _CObject_Check( PyObject *op ) { return op->ob_type == _CObject_Type(); } - #endif - #if PY_MAJOR_VERSION >= 3 - bool _Bytes_Check( PyObject *op ) { return op->ob_type == _Bytes_Type(); } -@@ -111,7 +111,6 @@ - static PyObject *ptr__PyFalse = NULL; - static PyObject *ptr__PyTrue = NULL; - static PyTypeObject *ptr__CFunction_Type = NULL; --static PyTypeObject *ptr__CObject_Type = NULL; - static PyTypeObject *ptr__Complex_Type = NULL; - static PyTypeObject *ptr__Dict_Type = NULL; - static PyTypeObject *ptr__Float_Type = NULL; -@@ -129,6 +128,7 @@ - #if PY_MAJOR_VERSION == 2 - static PyTypeObject *ptr__Int_Type = NULL; - static PyTypeObject *ptr__String_Type = NULL; -+static PyTypeObject *ptr__CObject_Type = NULL; - #endif - #if PY_MAJOR_VERSION >= 3 - static PyTypeObject *ptr__Bytes_Type = NULL; -@@ -284,7 +284,6 @@ - ptr__PyTrue = GetPyObject_As_PyObjectPointer( "_Py_TrueStruct" ); - - ptr__CFunction_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyCFunction_Type" ); -- ptr__CObject_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyCObject_Type" ); - ptr__Complex_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyComplex_Type" ); - ptr__Dict_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyDict_Type" ); - ptr__Float_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyFloat_Type" ); -@@ -303,6 +302,7 @@ - #if PY_MAJOR_VERSION == 2 - ptr__String_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyString_Type" ); - ptr__Int_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyInt_Type" ); -+ ptr__CObject_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyCObject_Type" ); - #endif - #if PY_MAJOR_VERSION >= 3 - ptr__Bytes_Type = GetPyTypeObject_As_PyTypeObjectPointer( "PyBytes_Type" ); -@@ -367,7 +367,6 @@ - PyObject *_True() { return ptr__PyTrue; } - - PyTypeObject *_CFunction_Type() { return ptr__CFunction_Type; } --PyTypeObject *_CObject_Type() { return ptr__CObject_Type; } - PyTypeObject *_Complex_Type() { return ptr__Complex_Type; } - PyTypeObject *_Dict_Type() { return ptr__Dict_Type; } - PyTypeObject *_Float_Type() { return ptr__Float_Type; } -@@ -386,6 +385,7 @@ - #if PY_MAJOR_VERSION == 2 - PyTypeObject *_String_Type() { return ptr__String_Type; } - PyTypeObject *_Int_Type() { return ptr__Int_Type; } -+PyTypeObject *_CObject_Type() { return ptr__CObject_Type; } - #endif - #if PY_MAJOR_VERSION >= 3 - PyTypeObject *_Bytes_Type() { return ptr__Bytes_Type; } -@@ -506,7 +506,6 @@ - PyObject *_True() { return Py_True; } - - PyTypeObject *_CFunction_Type() { return &PyCFunction_Type; } --PyTypeObject *_CObject_Type() { return &PyCObject_Type; } - PyTypeObject *_Complex_Type() { return &PyComplex_Type; } - PyTypeObject *_Dict_Type() { return &PyDict_Type; } - PyTypeObject *_Float_Type() { return &PyFloat_Type; } -@@ -525,6 +524,7 @@ - #if PY_MAJOR_VERSION == 2 - PyTypeObject *_String_Type() { return &PyString_Type; } - PyTypeObject *_Int_Type() { return &PyInt_Type; } -+PyTypeObject *_CObject_Type() { return &PyCObject_Type; } - #endif - #if PY_MAJOR_VERSION >= 3 - PyTypeObject *_Bytes_Type() { return &PyBytes_Type; } ---- Src/Python3/cxx_extensions.cxx -+++ Src/Python3/cxx_extensions.cxx -@@ -1471,13 +1471,13 @@ - Tuple self_and_name_tuple( _self_and_name_tuple ); - - PyObject *self_in_cobject = self_and_name_tuple[0].ptr(); -- void *self_as_void = PyCObject_AsVoidPtr( self_in_cobject ); -+ void *self_as_void = PyCapsule_GetPointer( self_in_cobject, NULL ); - if( self_as_void == NULL ) - return NULL; - - ExtensionModuleBase *self = static_cast( self_as_void ); - -- Object result( self->invoke_method_noargs( PyCObject_AsVoidPtr( self_and_name_tuple[1].ptr() ) ) ); -+ Object result( self->invoke_method_noargs( PyCapsule_GetPointer( self_and_name_tuple[1].ptr(), NULL ) ) ); - - return new_reference_to( result.ptr() ); - } -@@ -1494,7 +1494,7 @@ - Tuple self_and_name_tuple( _self_and_name_tuple ); - - PyObject *self_in_cobject = self_and_name_tuple[0].ptr(); -- void *self_as_void = PyCObject_AsVoidPtr( self_in_cobject ); -+ void *self_as_void = PyCapsule_GetPointer( self_in_cobject, NULL ); - if( self_as_void == NULL ) - return NULL; - -@@ -1504,7 +1504,7 @@ - ( - self->invoke_method_varargs - ( -- PyCObject_AsVoidPtr( self_and_name_tuple[1].ptr() ), -+ PyCapsule_GetPointer( self_and_name_tuple[1].ptr(), NULL ), - args - ) - ); -@@ -1524,7 +1524,7 @@ - Tuple self_and_name_tuple( _self_and_name_tuple ); - - PyObject *self_in_cobject = self_and_name_tuple[0].ptr(); -- void *self_as_void = PyCObject_AsVoidPtr( self_in_cobject ); -+ void *self_as_void = PyCapsule_GetPointer( self_in_cobject, NULL ); - if( self_as_void == NULL ) - return NULL; - -@@ -1540,7 +1540,7 @@ - ( - self->invoke_method_keyword - ( -- PyCObject_AsVoidPtr( self_and_name_tuple[1].ptr() ), -+ PyCapsule_GetPointer( self_and_name_tuple[1].ptr(), NULL ), - args, - keywords - ) -@@ -1556,7 +1556,7 @@ - ( - self->invoke_method_keyword - ( -- PyCObject_AsVoidPtr( self_and_name_tuple[1].ptr() ), -+ PyCapsule_GetPointer( self_and_name_tuple[1].ptr(), NULL ), - args, - keywords - ) -@@ -1571,9 +1571,6 @@ - } - } - --extern "C" void do_not_dealloc( void * ) --{} -- - - //-------------------------------------------------------------------------------- - // diff --git a/dev-python/pycxx/files/pycxx-6.2.3-python-3.patch b/dev-python/pycxx/files/pycxx-6.2.3-python-3.patch deleted file mode 100644 index c5d6ac0f4d0f..000000000000 --- a/dev-python/pycxx/files/pycxx-6.2.3-python-3.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- Lib/__init__.py -+++ Lib/__init__.py -@@ -34,8 +34,8 @@ - # DAMAGE. - # - #----------------------------------------------------------------------------- --print """CXX is installed. -+print("""CXX is installed. - The support files you need are in the PYTHON/etc/CXX directory. - The include files are in the distutils include path already. - Just refer to them as "CXX/CXX_Objects.h", etc. --""" -+""") ---- setup.py -+++ setup.py -@@ -12,13 +12,13 @@ - class my_install (install): - - def finalize_options (self): -- if not self.install_data or (len(self.install_data) < 8) : -- self.install_data = "$base/share/python$py_version_short" -+ if not self.install_data or (len(self.install_data) < 8) : -+ self.install_data = "$base/share/python$py_version_short" - install.finalize_options (self) - - def run (self): -- self.distribution.data_files = [("CXX", sources)] -- self.distribution.headers = headers -+ self.distribution.data_files = [("CXX", sources)] -+ self.distribution.headers = headers - install.run (self) - - diff --git a/dev-python/pycxx/pycxx-6.2.3-r2.ebuild b/dev-python/pycxx/pycxx-6.2.3-r2.ebuild deleted file mode 100644 index 3a9a33b2ce73..000000000000 --- a/dev-python/pycxx/pycxx-6.2.3-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/pycxx-6.2.3-r2.ebuild,v 1.5 2011/11/29 11:04:25 naota Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython" - -inherit eutils distutils - -DESCRIPTION="Set of facilities to extend Python with C++" -HOMEPAGE="http://cxx.sourceforge.net" -SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="doc examples" - -PYTHON_MODNAME="CXX" - -src_prepare() { - epatch "${FILESDIR}/${P}-python-3.patch" - epatch "${FILESDIR}/${P}-installation.patch" - epatch "${FILESDIR}/${P}-python-3.2.patch" - - sed -e "/^#include/s:/Python[23]/:/:" -i CXX/*/*.hxx || die "sed failed" -} - -src_install() { - distutils_src_install - - if use doc; then - dohtml -r Doc/ || die "dohtml failed" - fi - - if use examples; then - docinto examples/python-2 - dodoc Demo/Python2/* || die "dodoc failed" - docinto examples/python-3 - dodoc Demo/Python3/* || die "dodoc failed" - fi -} diff --git a/dev-python/pycxx/pycxx-6.2.3-r3.ebuild b/dev-python/pycxx/pycxx-6.2.3-r3.ebuild deleted file mode 100644 index 3308d41beb7e..000000000000 --- a/dev-python/pycxx/pycxx-6.2.3-r3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/pycxx-6.2.3-r3.ebuild,v 1.5 2012/04/04 21:14:26 jdhore Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython" - -inherit eutils distutils - -DESCRIPTION="Set of facilities to extend Python with C++" -HOMEPAGE="http://cxx.sourceforge.net" -SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="doc examples" - -PYTHON_MODNAME="CXX" - -src_prepare() { - epatch "${FILESDIR}/${P}-python-3.patch" - epatch "${FILESDIR}/${P}-installation.patch" - epatch "${FILESDIR}/${P}-python-3.2.patch" - - # Bug 369329. - # https://sourceforge.net/tracker/?func=detail&aid=3464317&group_id=3180&atid=303180 - epatch "${FILESDIR}/${P}-python-3.2-Py_hash_t.patch" - - sed -e "/^#include/s:/Python[23]/:/:" -i CXX/*/*.hxx || die "sed failed" -} - -src_install() { - distutils_src_install - - if use doc; then - dohtml -r Doc/ || die "dohtml failed" - fi - - if use examples; then - docinto examples/python-2 - dodoc Demo/Python2/* || die "dodoc failed" - docinto examples/python-3 - dodoc Demo/Python3/* || die "dodoc failed" - fi -} diff --git a/dev-python/pycxx/pycxx-6.2.4-r1.ebuild b/dev-python/pycxx/pycxx-6.2.4-r1.ebuild deleted file mode 100644 index 0ed009904fea..000000000000 --- a/dev-python/pycxx/pycxx-6.2.4-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/pycxx-6.2.4-r1.ebuild,v 1.4 2012/06/08 11:34:54 phajdan.jr Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython" - -inherit eutils distutils - -DESCRIPTION="Set of facilities to extend Python with C++" -HOMEPAGE="http://cxx.sourceforge.net" -SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="doc examples" - -PYTHON_MODNAME="CXX" - -src_prepare() { - epatch "${FILESDIR}/${PN}-6.2.3-python-3.patch" - epatch "${FILESDIR}/${PN}-6.2.3-installation.patch" - - # Without this, pysvn fails. - # CXX/Python2/Config.hxx: No such file or directory - sed -e "/^#include/s:/Python[23]/:/:" -i CXX/*/*.hxx || die "sed failed" -} - -src_install() { - distutils_src_install - - if use doc; then - dohtml -r Doc/ || die "dohtml failed" - fi - - if use examples; then - docinto examples/python-2 - dodoc Demo/Python2/* || die "dodoc failed" - docinto examples/python-3 - dodoc Demo/Python3/* || die "dodoc failed" - fi -} diff --git a/dev-python/pycxx/pycxx-6.2.4.ebuild b/dev-python/pycxx/pycxx-6.2.4.ebuild deleted file mode 100644 index ef8eb74124db..000000000000 --- a/dev-python/pycxx/pycxx-6.2.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/pycxx-6.2.4.ebuild,v 1.1 2012/03/29 10:52:46 djc Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython" - -inherit eutils distutils - -DESCRIPTION="Set of facilities to extend Python with C++" -HOMEPAGE="http://cxx.sourceforge.net" -SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="doc examples" - -PYTHON_MODNAME="CXX" - -src_prepare() { - epatch "${FILESDIR}/${PN}-6.2.3-python-3.patch" - epatch "${FILESDIR}/${PN}-6.2.3-installation.patch" -} - -src_install() { - distutils_src_install - - if use doc; then - dohtml -r Doc/ || die "dohtml failed" - fi - - if use examples; then - docinto examples/python-2 - dodoc Demo/Python2/* || die "dodoc failed" - docinto examples/python-3 - dodoc Demo/Python3/* || die "dodoc failed" - fi -} diff --git a/dev-python/pycxx/pycxx-6.2.5.ebuild b/dev-python/pycxx/pycxx-6.2.5.ebuild index 204a65b6105b..87eaa3bd9ec3 100644 --- a/dev-python/pycxx/pycxx-6.2.5.ebuild +++ b/dev-python/pycxx/pycxx-6.2.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/pycxx-6.2.5.ebuild,v 1.6 2014/08/14 23:58:14 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/pycxx-6.2.5.ebuild,v 1.7 2015/01/14 05:30:22 idella4 Exp $ EAPI="5" PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy ) diff --git a/dev-python/pycxx/pycxx-6.2.6.ebuild b/dev-python/pycxx/pycxx-6.2.6.ebuild new file mode 100644 index 000000000000..4f736bdb3f1a --- /dev/null +++ b/dev-python/pycxx/pycxx-6.2.6.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycxx/pycxx-6.2.6.ebuild,v 1.1 2015/01/14 05:30:22 idella4 Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit eutils distutils-r1 + +DESCRIPTION="Set of facilities to extend Python with C++" +HOMEPAGE="http://cxx.sourceforge.net" +SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +IUSE="doc examples" + +python_prepare_all() { + # Without this, pysvn fails. + # CXX/Python2/Config.hxx: No such file or directory + sed -e "/^#include/s:/Python[23]/:/:" -i CXX/*/*.hxx || die "sed failed" + + # Remove python2 print statement + echo > Lib/__init__.py || die + + local PATCHES=( + "${FILESDIR}/${PN}-6.2.3-installation.patch" + ) + distutils-r1_python_prepare_all +} + +python_install_all() { + use doc && local HTML_DOCS=( Doc/. ) + use examples && local EXAMPLES=( Demo/Python{2,3}/. ) + distutils-r1_python_install_all +}