[proaudio] [2527] x11-libs/ntk: fix python_pkg_setup, patch to not call ldconfig in src_install, update EAPI, cleanup

[subversion@xxxxxxxxxxxxx]

Revision: 2527
Author:   lilrc
Date:     2013-03-11 10:39:07 +0100 (Mon, 11 Mar 2013)
Log Message:
-----------
x11-libs/ntk: fix python_pkg_setup, patch to not call ldconfig in src_install, update EAPI, cleanup

Modified Paths:
--------------
    trunk/overlays/proaudio/x11-libs/ntk/ChangeLog
    trunk/overlays/proaudio/x11-libs/ntk/Manifest
    trunk/overlays/proaudio/x11-libs/ntk/metadata.xml
    trunk/overlays/proaudio/x11-libs/ntk/ntk-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/x11-libs/ntk/files/
    trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-noldconfig.patch

Modified: trunk/overlays/proaudio/x11-libs/ntk/ChangeLog
===================================================================
--- trunk/overlays/proaudio/x11-libs/ntk/ChangeLog	2013-03-10 22:07:39 UTC (rev 2526)
+++ trunk/overlays/proaudio/x11-libs/ntk/ChangeLog	2013-03-11 09:39:07 UTC (rev 2527)
@@ -1,7 +1,16 @@
 # ChangeLog for x11-libs/ntk
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  ntk-9999.ebuild, +files/ntk-9999-noldconfig.patch, metadata.xml:
+  Update EAPI.
+  Fix python_pkg_setup.
+  Added patch to not call ldconfig from within src_install. (This is 
+  handled by portage)
+  Cleanup.
+  Remove no-herd from metadata.xml.
+
   18 Nov 2012: Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxx>
   ntk-9999.enuild: waf szpport from Tina Cochet's ebuild with some cleanup
 

Modified: trunk/overlays/proaudio/x11-libs/ntk/Manifest
===================================================================
--- trunk/overlays/proaudio/x11-libs/ntk/Manifest	2013-03-10 22:07:39 UTC (rev 2526)
+++ trunk/overlays/proaudio/x11-libs/ntk/Manifest	2013-03-11 09:39:07 UTC (rev 2527)
@@ -1,3 +1,4 @@
-EBUILD ntk-9999.ebuild 937 SHA256 1ef2194fe86f0a1cf7810404f67ae545e058cbbe4f3061e82af78483f4f6304e SHA512 c0b3fbdcc1220f1ff169e96a12ec0818a42db934646d7f41d760936c27b439a0b192bdaa355847859499d7abe5f0a84769ea5a85b8851b15f469a6f26afd2bda WHIRLPOOL 0f56780321bc8497a8514f681b7dad80c05a59f014b09b960b7ce37cef2e01bc947daa796aecd578623a36b92cb3d92c77d9fe11955e7b1a7f78d5079ea1f7e6
-MISC ChangeLog 407 SHA256 84554871c5739304bf05efa850e54ce62d238523d27af7e5448345ce3247567a SHA512 8db476dd67e6374d7c6430074486ae6c2988b77eac70f50af73bbc42a603d7820eb55170a0e749a2d7df403aa0915202e099869360be8335e2731497ed3821b9 WHIRLPOOL 040d9d727fe44a36dcc4e27c0aab886649194b49f48f11a0ad204ef73c9079dc200f1532f06fb602fbf407ac239ef48f6c1a95d7e0b441e2858cd16a050b483d
-MISC metadata.xml 268 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 SHA512 3d709a016692f887d642d19b2644c10a09f666133f1f035b8a4c10e5772fbb39fa84a856a496d392594ccf850739fbf46ffa78ecc74214e8342ee97676b375e9 WHIRLPOOL 17c886c5b97925bd9223c0210170a63e55a2c2a238ae81ebf8efa14109d790406f45d0773d63bea825c1e40b058bd9e20a5d9c264da4db7c8fd2e556ecd83b2a
+AUX ntk-9999-noldconfig.patch 1048 SHA256 642cf2b5ce71962776eff33f2cd78c0cb9d3fd743b8249e9ac9240077671addd SHA512 19ce44d9b44ddddf607c9160425ddf5827388c742ac95746020c1780237a9b4b45516d89b897ed395cada25a14d72661cb4035b5c13b18967a004d4741ee2e32 WHIRLPOOL 74f7f382df665a7a73b5a90b111da7304c63efe36b5bfb682b86cee6eab222cb032f7fa4baa1b3b4af691325d4120bc79a4f796f0265a774d6913bde261e73ac
+EBUILD ntk-9999.ebuild 843 SHA256 965c272f3488d62f40a454b2aa0b39e995671a5641262a07634ab0db7510bfcd SHA512 b946b3ffeb51ebe38a70f569bd86847b7dfde902c12befb10cc4be5865ff24baf44a65cff5db30d46e8c593ac2ae504aba3f91df871cd11b9eeecbebde7aaec9 WHIRLPOOL 7d2b94de949defe328ae3c84d5f62ac14524fb5e7f70ef34e7bb9ecbdf5080ad62098a97799e9fd671fe8d01287b5b4e2fd8b0324590dfeaf4474932cbd5c1b8
+MISC ChangeLog 718 SHA256 83c54fa944fa52a2e9aa235b2d1eb1e971bbe5372a8fcaeb35b236223c198934 SHA512 b24eaf781f83d2d4801d48e21b67ed72c1babf9d10fb6d5b2e939b466dd5b0eb52e146749afa4577d128a1785c83ef10114255a07217a4fb304055373301d166 WHIRLPOOL 466ce55a9300f51d55462798006474e72dccdb80af3744fe5650f5178436d859e8dbf2ed6bd179a68855fa412837e9450589978e666221dfa309d550daf31c60
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Added: trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-noldconfig.patch
===================================================================
--- trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-noldconfig.patch	                        (rev 0)
+++ trunk/overlays/proaudio/x11-libs/ntk/files/ntk-9999-noldconfig.patch	2013-03-11 09:39:07 UTC (rev 2527)
@@ -0,0 +1,30 @@
+--- fltk.orig/wscript	2013-03-11 10:28:31.359946766 +0100
++++ fltk/wscript	2013-03-11 10:29:28.421944884 +0100
+@@ -48,19 +48,6 @@
+     kw['name'] = kw['target'] + '_shared'
+     bld.stlib(*k,**kw)
+ 
+-# from autowaf
+-def run_ldconfig(ctx):
+-    if (ctx.cmd == 'install'
+-        and not ctx.env['RAN_LDCONFIG']
+-        and ctx.env['LIBDIR']
+-        and not os.environ.get('DESTDIR')):
+-        try:
+-            Logs.info("Waf: Running `/sbin/ldconfig %s'" % ctx.env['LIBDIR'])
+-            subprocess.call(['/sbin/ldconfig', ctx.env['LIBDIR']])
+-            ctx.env['RAN_LDCONFIG'] = True
+-        except:
+-            pass
+-    
+ def options(opt):
+     opt.load('compiler_c')
+     opt.load('compiler_cxx')
+@@ -510,7 +497,5 @@
+     bld.install_files( bld.env.INCLUDEDIR + '/ntk/FL', start_dir.ant_glob('*.H *.h'),
+                        cwd=start_dir, relative_trick=True)
+ 
+-    bld.add_post_fun( run_ldconfig )
+-
+     #  bld.install_files( string.join( [ '${DATADIR}/doc', APPNAME ], '/' ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) )
+     

Modified: trunk/overlays/proaudio/x11-libs/ntk/metadata.xml
===================================================================
(Binary files differ)

Modified: trunk/overlays/proaudio/x11-libs/ntk/ntk-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/x11-libs/ntk/ntk-9999.ebuild	2013-03-10 22:07:39 UTC (rev 2526)
+++ trunk/overlays/proaudio/x11-libs/ntk/ntk-9999.ebuild	2013-03-11 09:39:07 UTC (rev 2527)
@@ -1,20 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
 PYTHON_DEPEND="2"
 inherit waf-utils git-2 python
 
 DESCRIPTION="The Non Things: Non-DAW, Non-Mixer, Non-Sequencer and Non-Session-Manager"
 HOMEPAGE="http://non.tuxfamily.org";
-#EGIT_REPO_URI="git://git.tuxfamily.org/gitroot/non/non.git"
 EGIT_REPO_URI="git://git.tuxfamily.org/gitroot/non/fltk.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="-debug"
+IUSE="debug"
 
 RDEPEND=">=media-sound/jack-audio-connection-kit-0.103.0
 	>=media-libs/liblrdf-0.1.0
@@ -22,25 +21,16 @@
 	>=dev-libs/libsigc++-2.2.0"
 DEPEND="${RDEPEND}"
 
+DOCS=( CREDITS README )
+PATCHES=( "${FILESDIR}/${P}-noldconfig.patch" )
+
 pkg_setup(){
 	python_set_active_version 2
-	pxthon_pkg_setup
+	python_pkg_setup
 }
 
 src_configure() {
-	myconf=""
-	if use debug ; then
-		waf-utils_src_configure --enable-debug
-	else
-		waf-utils_src_configure
-	fi
+	local mywafconfargs=()
+	use debug && mywafconfargs+=--enable-debug
+	waf-utils_src_configure ${mywafconfargs}
 }
-
-src_compile() {
-	waf-utils_src_compile
-}
-
-src_install() {
-	waf-utils_src_install
-	dodoc CREDITS README
-}