From 865c91867c2d8b5acdf649245828d275293b99e1 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 11 Oct 2012 21:18:18 -0400 Subject: [PATCH] sci-libs/comedilib: update demo/Makefile patch and allow Python 3 bindings. --- ChangeLog | 7 +++++++ Manifest | 8 ++++---- comedilib-9999.ebuild | 4 ++-- files/comedilib-9999-demo-Makefile.patch | 26 ++++++++++++------------ 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index c024b97..3c4ff0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*comedilib-9999 (11 Oct 2012) + + 11 Oct 2012; W. Trevor King + comedilib-9999.ebuild, comedilib-9999-demo-Makefile.patch: + Update demo/Makefile patch after Bernd Porr's pwm and tut3 additions. + Update ebuild to allow Python 3 bindings. + *comedilib-9999 (08 Mar 2012) 08 Mar 2012; W. Trevor King comedilib-9999.ebuild diff --git a/Manifest b/Manifest index db457a1..219da12 100644 --- a/Manifest +++ b/Manifest @@ -1,4 +1,4 @@ -AUX comedilib-9999-demo-Makefile.patch 2512 RMD160 4f827f6ff33f3a74eda57b5298c39d725d5dcddc SHA1 e40a18d3a8084b297079f6de3bf84f7221083d2c SHA256 510fba930ae097c5bd9cf850381a7217e30a026180b68bea316fb2c2085a5a7d -EBUILD comedilib-9999.ebuild 3662 RMD160 e50394d49b8ee04a39cbf4d34e91c281a3255d1c SHA1 8dbd35a4e42a8bd700a0000f758b16bd4b9b6598 SHA256 2b2669b617e254dfdd7fbb6fd0e4cffceffa2028f730a79e65dae5828a64b327 -MISC ChangeLog 3631 RMD160 076cd06afc97cc592b15590b96cfe324121cbcde SHA1 0d2f83f6a91e6f109aa9453c6a080bff61f4db19 SHA256 371af166d00b049f3a6071ae2ef4833e730f201bc5fe4e1ae571ba850a591382 -MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72 +AUX comedilib-9999-demo-Makefile.patch 2457 SHA256 35bc78b20819a201a8c8b9c02564ce8c039de1f53530908c4bd7bc489c2154e9 SHA512 d15859a56d38b39759a2a714f45d66f45f499cf80114d2d91698af16c507c7efc002e3be6212417203aa0608228159dc22a3e30ac29c327e7b20d6786ce51c62 WHIRLPOOL 3b5573b6e706811fe9d86207c5004fb3cb87d4b64390870858b7fdcccf279a51bdd4b1cff7606624fa0e6080c767de0ec9c5691598541f3da06bf620f287013f +EBUILD comedilib-9999.ebuild 3665 SHA256 80c696e69e02c8130269406c6155330c58a7890c93a8db28904600dc978b0a52 SHA512 304ca2381f8acd762a6900e0e3f669ea3482431bcb9c70ee99bd69c381e023be6381f07b3bce3a9958db37d2ad8d79d103371f5df4182a48dd3ec17fa0681296 WHIRLPOOL dfd12395d4a9fd66648d4a6e23c57e381cdee44991212f8281e73b12b0c58d89c6a4ed9e29a931a667113cd32079c093a84a3d4b47deef24276c9d0e41846653 +MISC ChangeLog 3889 SHA256 f82bea10c93fdf5bc64aaa99aacb7e34fe4f629fc63135b7c8ae8d2b6a7834a6 SHA512 890e263dae7457aadb4d955dd236c1212b9d649dde85ed240892b60c8c9301986a2294fc1a1cdc905500f30311292a3a45fc7043fa932e3b72273491ffd40fa1 WHIRLPOOL d514f655cc942d860e7dc279ccb2e44c82dd0c8e9092774dfb327004d65378b2347c7c53e68ed0449f12600664588c87f8c0a36a0826fd71e8e4d2018d48fe07 +MISC metadata.xml 247 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72 SHA512 93784fa413a106d1e9f9c97a86c25634d983abf96b57d282bf4acc091d98c6ef32d2525aeb13f68e163c13a5daaa97258cd53c76f5ffe717f5c0dad5956fba6c WHIRLPOOL af0e4209d10a3e8c658f7a46bdc0342d91c84cafbd35f944f6d8827bceeb3f02dfb530b1476a8329676faa738ed4061d322043c2dc089bbb58b41d3ded690ff4 diff --git a/comedilib-9999.ebuild b/comedilib-9999.ebuild index 1089c49..00e584d 100644 --- a/comedilib-9999.ebuild +++ b/comedilib-9999.ebuild @@ -4,8 +4,8 @@ EAPI="4" -PYTHON_DEPEND="python? 2" -RESTRICT_PYTHON_ABIS="3.*" +PYTHON_DEPEND="python? 2:2.7 3" +SUPPORT_PYTHON_ABIS="1" inherit distutils eutils diff --git a/files/comedilib-9999-demo-Makefile.patch b/files/comedilib-9999-demo-Makefile.patch index e865fbc..6745249 100644 --- a/files/comedilib-9999-demo-Makefile.patch +++ b/files/comedilib-9999-demo-Makefile.patch @@ -1,27 +1,27 @@ ---- a/demo/Makefile 2010-12-11 09:58:59.000000000 -0500 -+++ b/demo/Makefile 2010-12-11 10:29:17.000000000 -0500 -@@ -267,7 +267,7 @@ - tut2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(tut2_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +--- a/demo/Makefile ++++ b/demo/Makefile +@@ -296,7 +296,7 @@ + tut3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(tut3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir) +DEFAULT_INCLUDES = -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f -@@ -319,9 +319,9 @@ - CCDEPMODE = depmode=gcc3 - CFLAGS = -g -O2 +@@ -355,9 +355,9 @@ + CCDEPMODE = depmode=none + CFLAGS = -O2 -march=native -pipe COMEDILIB_AGE = 10 -COMEDILIB_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wall +COMEDILIB_CFLAGS = -Wall $(shell pkg-config --cflags comedilib) COMEDILIB_CURRENT = 10 -COMEDILIB_LIBS = $(top_builddir)/lib/libcomedi.la -lm +COMEDILIB_LIBS = $(shell pkg-config --libs comedilib) - COMEDILIB_LIBVERSION = 10:0:10 - COMEDILIB_LT_LDFLAGS = -version-info 10:0:10 - COMEDILIB_REVISION = 0 -@@ -354,7 +354,7 @@ + COMEDILIB_LIBVERSION = 10:1:10 + COMEDILIB_LT_LDFLAGS = -version-info 10:1:10 + COMEDILIB_REVISION = 1 +@@ -391,7 +391,7 @@ LEX_OUTPUT_ROOT = lex.yy LIBOBJS = LIBS = @@ -30,7 +30,7 @@ LIPO = LN_S = ln -s LTLIBOBJS = -@@ -558,34 +558,18 @@ +@@ -602,34 +602,18 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) -- 2.26.2