diff options
20 files changed, 143 insertions, 561 deletions
diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest index 6b6bf0e9a682..4eab16323f77 100644 --- a/dev-embedded/gpsim/Manifest +++ b/dev-embedded/gpsim/Manifest @@ -1,3 +1,2 @@ -DIST gpsim-0.26.1.tar.gz 2350841 SHA256 509120f13971108f2f3e75706a354fb91cc777ad6b05244f26bded5e40a8b974 SHA512 ab710d57e5699e680674b97fb6c4eed19e45ee0bac05e40c2f8b4d58338b1023735e96aa7f9ce0c21048478d291a14fa41f216709b23d85d047d7c2b3e5e7d15 WHIRLPOOL 770f822c4547ef60e3dacc83b9d60db5bd7c0fb7819f3fc2e57b2841b4bbb53fd5f10da4d6da660c945be3497eee2f534c617b064c67a76d2c3f7c3d79524c66 -DIST gpsim-0.27.0.tar.gz 2465642 SHA256 204ed2a8aaf1b3021617544330997f4a508b811afce71fb9628b94406d5e59a2 SHA512 769a49d069cf24f0555ed6b34241139e69398fae1e01981298cd49a6096b8f196dfd9e6d8dfebf3f93294b3ca2acf9c4b1b21be600b5d0dd65dd99b6b159f06b WHIRLPOOL 2146a2cfa79a93b84d5caa014c7c639a4b9d97fbe179f18af697fadee7454aa4c4f379d4d0fe1e48c446bf411faffeef5aa6c4caeb268aa7c37c1f5b8953ba63 DIST gpsim-0.29.0.tar.gz 3301050 SHA256 9ed078038da80dab117e803467d3df3818fa84af7a4a289aaac295913a30615d SHA512 f24997e7bc360afbc87f9cc1e36cf5fa25aecf23c21ba043eabb333b5de9ddfa24b1373fdaa48ba8043a7fcda72558d54691db2579345255dd453e94b3752920 WHIRLPOOL bc49858b811751cebdd54e5e5b2e5b3f29fd3ac8eabbebba659fed50fdd7e9b47f87d3279be3190522fea1fd45edff21c0d0078a9f51ab0228796a949b986085 +DIST gpsim-0.30.0.tar.gz 3385728 SHA256 e1927312c37119bc26d6abf2c250072a279a9c764c49ae9d71b4ccebb8154f86 SHA512 8681f06e73569b801d2961858c8676490d93f7ef40e99f07e7a5eff16955850b66bcd8182aa22ba0edca0b10723cb3a5b7b8bf52fdb0cc94955c3072352292df WHIRLPOOL 7341c7352edcfe3966c3422816a0e53226c3a2095e04c521ca21023a3ff52c934c69cca4c616ce38954e965c54c0dfeb57fea28d2e81effbf093062b212f5ed1 diff --git a/dev-embedded/gpsim/files/gpsim-0.26.1-glib-single-include.patch b/dev-embedded/gpsim/files/gpsim-0.26.1-glib-single-include.patch deleted file mode 100644 index cd0f798281b5..000000000000 --- a/dev-embedded/gpsim/files/gpsim-0.26.1-glib-single-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://gpsim.svn.sourceforge.net/viewvc/gpsim/trunk/src/bitlog.h?r1=2107&r2=2182 - ---- trunk/src/bitlog.h 2010/06/05 06:41:12 2107 -+++ trunk/src/bitlog.h 2012/01/03 02:54:49 2182 -@@ -25,7 +25,7 @@ - - // include the absolute minimum portion of GLIB to get the definitions - // for guint64, etc. --#include <glibconfig.h> -+#include <glib.h> - - /********************************************************************** - * boolean event logging diff --git a/dev-embedded/gpsim/files/gpsim-0.26.1-gtkextra.patch b/dev-embedded/gpsim/files/gpsim-0.26.1-gtkextra.patch deleted file mode 100644 index 913290970516..000000000000 --- a/dev-embedded/gpsim/files/gpsim-0.26.1-gtkextra.patch +++ /dev/null @@ -1,29 +0,0 @@ -=== modified file 'configure.ac' ---- configure.ac 2012-06-02 20:11:32 +0000 -+++ configure.ac 2012-06-02 20:11:44 +0000 -@@ -79,15 +79,20 @@ - else - dnl gtk2 checks - -- $PKGCONFIG --exists gtkextra-2.0 -+ GTKEXTRAMOD="gtkextra-2.0" -+ $PKGCONFIG --exists $GTKEXTRAMOD - if test $? != 0; then -- AC_MSG_ERROR(Cannot find gtkextra-2.0 package) -+ GTKEXTRAMOD="gtkextra-3.0" -+ $PKGCONFIG --exists $GTKEXTRAMOD -+ if test $? != 0; then -+ AC_MSG_ERROR(Cannot find gtkextra-2.0 or gtkextra-3.0 package) -+ fi - fi - - X_LDFLAGS=`$PKGCONFIG --libs gtk+-2.0 gthread-2.0` - X_CFLAGS=`$PKGCONFIG --cflags gtk+-2.0` -- Y_LDFLAGS=`$PKGCONFIG --libs gtkextra-2.0` -- Y_CFLAGS=`$PKGCONFIG --cflags gtkextra-2.0` -+ Y_LDFLAGS=`$PKGCONFIG --libs $GTKEXTRAMOD` -+ Y_CFLAGS=`$PKGCONFIG --cflags $GTKEXTRAMOD` - GTK_VERSION_T=`$PKGCONFIG --modversion gtk+-2.0` - echo linking with gtk-$GTK_VERSION_T - AC_DEFINE_UNQUOTED([GTK_VERSION],"$GTK_VERSION_T",[gtk version]) - diff --git a/dev-embedded/gpsim/gpsim-0.26.1.ebuild b/dev-embedded/gpsim/gpsim-0.26.1.ebuild deleted file mode 100644 index 3d9b23710387..000000000000 --- a/dev-embedded/gpsim/gpsim-0.26.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit autotools eutils - -DESCRIPTION="A simulator for the Microchip PIC microcontrollers" -HOMEPAGE="http://gpsim.sourceforge.net" -SRC_URI="mirror://sourceforge/gpsim/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="doc gtk static-libs" - -RDEPEND=">=dev-embedded/gputils-0.12 - !dev-embedded/gpsim-lcd - dev-libs/glib:2 - dev-libs/popt - sys-libs/readline - gtk? ( >=x11-libs/gtk+extra-2 )" -DEPEND="${RDEPEND} - sys-devel/flex - virtual/pkgconfig - virtual/yacc" - -DOCS="ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-glib-single-include.patch \ - "${FILESDIR}"/${P}-gtkextra.patch - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable gtk gui) \ - $(use_enable static-libs static) -} - -src_install() { - default - use doc && dodoc doc/gpsim.pdf - - prune_libtool_files -} diff --git a/dev-embedded/gpsim/gpsim-0.27.0.ebuild b/dev-embedded/gpsim/gpsim-0.30.0.ebuild index 5b10341ce33b..7c6e310bd228 100644 --- a/dev-embedded/gpsim/gpsim-0.27.0.ebuild +++ b/dev-embedded/gpsim/gpsim-0.30.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit autotools eutils +EAPI=6 +inherit ltprune DESCRIPTION="A simulator for the Microchip PIC microcontrollers" HOMEPAGE="http://gpsim.sourceforge.net" -SRC_URI="mirror://sourceforge/gpsim/${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -14,17 +14,16 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="doc gtk static-libs" RDEPEND=">=dev-embedded/gputils-0.12 - !dev-embedded/gpsim-lcd dev-libs/glib:2 dev-libs/popt - sys-libs/readline + sys-libs/readline:0= gtk? ( >=x11-libs/gtk+extra-2 )" DEPEND="${RDEPEND} sys-devel/flex virtual/pkgconfig virtual/yacc" -DOCS="ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO" +DOCS=( ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO ) src_configure() { econf \ @@ -35,6 +34,5 @@ src_configure() { src_install() { default use doc && dodoc doc/gpsim.pdf - prune_libtool_files } diff --git a/dev-embedded/gputils/gputils-1.5.0.ebuild b/dev-embedded/gputils/gputils-1.5.0.ebuild index b6eec9feb864..7e4c0030eed2 100644 --- a/dev-embedded/gputils/gputils-1.5.0.ebuild +++ b/dev-embedded/gputils/gputils-1.5.0.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit toolchain-funcs DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers" -HOMEPAGE="http://gputils.sourceforge.net/" +HOMEPAGE="https://gputils.sourceforge.io" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest index 66f381e2eced..4286e5011161 100644 --- a/dev-python/graph-tool/Manifest +++ b/dev-python/graph-tool/Manifest @@ -1 +1,2 @@ DIST graph-tool-2.19.tar.bz2 15147961 SHA256 eba1090f94b0434890beedaf0c100dd0fc77e41ebfe29b4725d76cadb82099af SHA512 dc0bd93ccf21bb6616035dbfe33b0d9406eb894791e615795d486dc8f9d9991a6b93cf835cf4e59197005c14faedf105f3384cccd42db544104840cf857b2a84 WHIRLPOOL 3a398c98487a1e29952fea4c3ff8671e5aaf3d4f9e8df26aae9f6a856e61c290954f4c662e48ae424cbe0b916833a8f3bc7a6eefe6c6c3a08540de58ed6b9de0 +DIST graph-tool-2.22.tar.bz2 15100673 SHA256 57121b562763c79c138b3a385b8cddb59e7dec375c61e00ca7e9e96fd1a5e080 SHA512 e5ffb6913ba76c1b3dea597950b8d50edd55cb997bf8b02c105ffab314b4978ac861db0c57507e51598f731b6b8fa9f1251e21d5feb9eb89158bc4c1921dc51f WHIRLPOOL d4f2cf19ef885ad22837ba693e65ebe5f2fc379bcafe2d23eb42327d1aad49fb2a73b4b0eb24eb4cde3d6a77b9b6dc2c05dfd01aec83d53d5c3ebbdf1be82aae diff --git a/dev-python/graph-tool/graph-tool-2.22.ebuild b/dev-python/graph-tool/graph-tool-2.22.ebuild new file mode 100644 index 000000000000..cf9f4302985a --- /dev/null +++ b/dev-python/graph-tool/graph-tool-2.22.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit check-reqs python-r1 toolchain-funcs + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/count0/graph-tool.git" + inherit autotools git-r3 +else + SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs" +HOMEPAGE="https://graph-tool.skewed.de/" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+cairo openmp" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + dev-libs/boost:=[context,python,${PYTHON_USEDEP}] + dev-libs/expat + dev-python/numpy[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + >=sci-mathematics/cgal-4.9 + cairo? ( + dev-cpp/cairomm + dev-python/pycairo[${PYTHON_USEDEP}] + ) + dev-python/matplotlib[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-cpp/sparsehash + virtual/pkgconfig" + +# bug 453544 +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + check-reqs_pkg_pretend +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + [[ ${PV} == *9999 ]] && eautoreconf + python_copy_sources +} + +src_configure() { + local threads + has_version 'dev-libs/boost[threads]' && threads="-mt" + + configure() { + econf \ + --disable-static \ + $(use_enable openmp) \ + $(use_enable cairo) \ + --with-boost-python="${EPYTHON: -3}${threads}" + } + python_foreach_impl run_in_build_dir configure +} + +src_compile() { + # most machines don't have enough ram for parallel builds + python_foreach_impl run_in_build_dir emake -j1 +} + +src_install() { + python_foreach_impl run_in_build_dir default + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild index f6a94cb3f9b6..cf9f4302985a 100644 --- a/dev-python/graph-tool/graph-tool-9999.ebuild +++ b/dev-python/graph-tool/graph-tool-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit check-reqs python-r1 toolchain-funcs @@ -25,11 +25,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-libs/boost:=[context,python,${PYTHON_USEDEP}] dev-libs/expat dev-python/numpy[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}] - sci-mathematics/cgal + >=sci-mathematics/cgal-4.9 cairo? ( dev-cpp/cairomm dev-python/pycairo[${PYTHON_USEDEP}] @@ -64,7 +64,6 @@ src_configure() { configure() { econf \ --disable-static \ - --disable-optimization \ $(use_enable openmp) \ $(use_enable cairo) \ --with-boost-python="${EPYTHON: -3}${threads}" diff --git a/media-sound/snd/Manifest b/media-sound/snd/Manifest index a8d65035b199..dec8b706c1af 100644 --- a/media-sound/snd/Manifest +++ b/media-sound/snd/Manifest @@ -1,3 +1 @@ -DIST snd-12.8.tar.gz 15546751 SHA256 1ff683615ec6d0c7e2c8359e921117f4fd78695675bb06eb765667edb55a1939 SHA512 99a8600a175a889ad597053e9f52af69124cab8feca693c852cb03d34df5b80bcc50994ea66d070fe61e318eca715fdfe095a458b22da80d95f88a1d695baebd WHIRLPOOL b8903b138ab31f2ee51aeabe66068943c24e15e2cd82e628bc446224ebb0e697365c0070ec99d126379a02c1ef7544a1c6195e0bb3a0c8ecb167751eb3c673ef -DIST snd-16.3.tar.gz 14824756 SHA256 7314fd8c73da9d3afa0ed2c7b5a10cda94eaf1e7fb6ab9f6ac2e085c18f50934 SHA512 b58971e95411839b2f1cafde4cdd66784f41510c67588f3816408290fc826b6c24054a03423ca3a59b11dddd45c058cb592fb97cd90d1333eeec36dd125a7821 WHIRLPOOL ad00d30d80e8dbf9b533824a382864725f14ad8a587803a8df6bedb8fe59cc36ae442e345599ebf08d67b9503d6e79e643c066b33be92d50d832d03677da8792 DIST snd-17.4.tar.gz 15096338 SHA256 efa311586661a5e73bb0fe894a366e2320a494d975424928b563dab450d0fb48 SHA512 cbbc546fe4a3ef758c5372edbdae4db29457c559eafa08854819917e153ce850f5ab302da68dee826f99c26f10769aae8c6df6ea8434614f084f21d0dbbc5c88 WHIRLPOOL ec7fc7848edf84d91312fbb7316d5f96ba8fa30d7b39bc12a0b71f5bb771cb31cacf1044401177f35ae665df59513951166b7654c955e0cf53e2ae0e5d8847e2 diff --git a/media-sound/snd/files/snd-12.6-as-needed.patch b/media-sound/snd/files/snd-12.6-as-needed.patch deleted file mode 100644 index af20208652b6..000000000000 --- a/media-sound/snd/files/snd-12.6-as-needed.patch +++ /dev/null @@ -1,77 +0,0 @@ -Fix underlinking due to missing -ldl linking: -* snd-xen.o:snd-xen.c:function g_dlinit_w: error: undefined reference to 'dlsym' -* snd-xen.o:snd-xen.c:function g_dlinit_w: error: undefined reference to 'dlerror' -https://bugs.gentoo.org/show_bug.cgi?id=540594 - -Fix --as-needed issues due to linking flags in LDFLAGS - ---- snd-12.8/configure.ac -+++ snd-12.8/configure.ac -@@ -172,6 +172,13 @@ - #-------------------------------------------------------------------------------- - - LIBS="" -+AC_SEARCH_LIBS([dlopen], [dl dld], [], [ -+ AC_MSG_ERROR([unable to find the dlopen() function]) -+]) -+LIBDL_LIBS="$LIBS" -+AC_SUBST([LIBDL_LIBS]) -+ -+LIBS="" - AC_CHECK_LIB(m,main) - AC_CHECK_LIB(c,main) - # AC_CHECK_LIB(dl,main) -@@ -1469,7 +1476,7 @@ - LDSO_FLAGS="-shared" - LIBS="$LIBS -lm" - if test "$ac_cv_header_dlfcn_h" = yes ; then -- LDFLAGS="$LDFLAGS -ldl" -+ LIBS="$LIBS -ldl" - fi - if test "$GCC" = yes ; then - SO_FLAGS="-fPIC $SO_FLAGS" -@@ -1980,7 +1987,7 @@ - if test "$ac_snd_have_extension_language" = yes ; then - if test "$ac_snd_have_gui" = yes ; then - if test "$ac_cv_header_pthread_h" = yes ; then -- LDFLAGS="$LDFLAGS -lpthread" -+ LIBS="$LIBS -pthread" - fi - fi - fi -@@ -1988,14 +1995,14 @@ - if test "$ac_snd_have_extension_language" = no ; then - if test "$ac_snd_have_gui" = no ; then - if test "$ac_cv_header_dlfcn_h" = yes ; then -- LDFLAGS="$LDFLAGS -ldl" -+ LIBS="$LIBS -ldl" - fi - AC_MSG_WARN([Snd needs either an extension language (s7, Fth, or Ruby), or a graphics toolkit (Gtk or Motif), or preferably both. As currently configured, this version of Snd is useless.]) - fi - fi - - if test "$ac_snd_have_extension_language" = yes && test "$with_audio" = no && test "$ac_cv_header_dlfcn_h" = yes ; then -- LDFLAGS="$LDFLAGS -ldl" -+ LIBS="$LIBS -ldl" - fi - - ---- snd-12.8/makefile.in -+++ snd-12.8/makefile.in -@@ -20,6 +20,7 @@ - LDFLAGS = @LDFLAGS@ - - LIBS = @LIBS@ -+LIBDL_LIBS = @LIBDL_LIBS@ - XEN_LIBS = @XEN_LIBS@ - GTK_LIBS = @GTK_LIBS@ - GTK_LD_LIBS = @GTK_LD_LIBS@ -@@ -96,7 +97,7 @@ - main_target: @MAKE_TARGET@ - - snd: $(SNDLIB_HEADERS) $(SND_HEADERS) $(GX_HEADERS) $(S7_HEADERS) $(S7_O_FILES) $(SNDLIB_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -- $(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(MOTIF_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(FAM_LIB) $(GMP_LIBS) $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(MOTIF_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(FAM_LIB) $(GMP_LIBS) $(LIBDL_LIBS) $(LIBS) - - xm: xen.h mus-config.h $(S7_HEADERS) - $(CC) -c xm.c -DUSE_SND=0 $(DEFS) $(SO_FLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(MOTIF_FLAGS) $(GSL_FLAGS) $(JACK_FLAGS) $(GL_FLAGS) diff --git a/media-sound/snd/files/snd-16.3-portaudio.patch b/media-sound/snd/files/snd-16.3-portaudio.patch deleted file mode 100644 index 3be684372a24..000000000000 --- a/media-sound/snd/files/snd-16.3-portaudio.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- snd-16.3/configure.ac -+++ snd-16.3/configure.ac -@@ -527,8 +527,9 @@ - - if test "$with_portaudio" = yes ; then - AC_DEFINE(MUS_PORTAUDIO) -+ PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0]) - AUDIO_SYSTEM=portaudio -- AUDIO_LIB="-lportaudio" -+ AUDIO_LIB="${PORTAUDIO_LIBS}" - fi - - if test "$with_jack" = yes ; then ---- snd-16.3/makefile.in -+++ snd-16.3/makefile.in -@@ -11,6 +11,7 @@ - GL_FLAGS = @GL_FLAGS@ - GSL_FLAGS = @GSL_CFLAGS@ - JACK_FLAGS = @JACK_FLAGS@ -+PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ - - ORIGINAL_LDFLAGS = @ORIGINAL_LDFLAGS@ - LDFLAGS = @LDFLAGS@ -@@ -26,6 +27,7 @@ - FFTW_LIBS = @FFTW_LIBS@ - JACK_LIBS = @JACK_LIBS@ - GMP_LIBS = @GMP_LIBS@ -+PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ - - LDSO_FLAGS = @LDSO_FLAGS@ - SO_FLAGS = @SO_FLAGS@ -@@ -51,7 +53,7 @@ - .SUFFIXES: .c .o - - .c.o: -- $(CC) -c $(DEFS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(GL_FLAGS) $(JACK_FLAGS) $(FFTW_CFLAGS) $< -+ $(CC) -c $(DEFS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(GL_FLAGS) $(JACK_FLAGS) $(FFTW_CFLAGS) $(PORTAUDIO_CFLAGS) $< - - SND_SCRIPTS = *.scm *.fs *.rb *.fsm - SNDLIB_HEADERS = mus-config.h sndlib.h _sndlib.h sndlib-strings.h clm.h vct.h sndlib2xen.h clm2xen.h xen.h clm-strings.h -@@ -82,7 +84,7 @@ - main_target: @MAKE_TARGET@ - - snd: $(SNDLIB_HEADERS) $(SND_HEADERS) $(GX_HEADERS) $(S7_HEADERS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -- $(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(GMP_LIBS) $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(GMP_LIBS) $(PORTAUDIO_LIBS) $(LIBS) - - xm: xen.h mus-config.h $(S7_HEADERS) - $(CC) -c xm.c -DUSE_SND=0 $(DEFS) $(SO_FLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(JACK_FLAGS) $(GL_FLAGS) diff --git a/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch b/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch new file mode 100644 index 000000000000..6199a7b183fd --- /dev/null +++ b/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch @@ -0,0 +1,21 @@ +Always compile the `oss_sample_types` function +Bug: https://bugs.gentoo.org/show_bug.cgi?id=621758 + +--- a/audio.c ++++ b/audio.c +@@ -743,7 +743,6 @@ + } + + +-#if (!HAVE_ALSA) + static int oss_sample_types(int ur_dev, mus_sample_t *val) + { + int fd, samp_types = 0, sys, ind; +@@ -774,7 +773,6 @@ + val[0] = (mus_sample_t)(ind - 1); + return(MUS_NO_ERROR); + } +-#endif + + + diff --git a/media-sound/snd/snd-12.8.ebuild b/media-sound/snd/snd-12.8.ebuild deleted file mode 100644 index 2cdfa7d0911e..000000000000 --- a/media-sound/snd/snd-12.8.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit autotools eutils flag-o-matic multilib - -DESCRIPTION="Snd is a sound editor" -HOMEPAGE="http://ccrma.stanford.edu/software/snd/" -SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz" - -LICENSE="Snd BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+ ruby? ( free-noncomm ) s7? ( free-noncomm )" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="alsa doc fam fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7" - -RDEPEND="media-libs/audiofile - alsa? ( media-libs/alsa-lib ) - fam? ( virtual/fam ) - fftw? ( sci-libs/fftw ) - gmp? ( dev-libs/gmp - dev-libs/mpc - dev-libs/mpfr ) - gsl? ( sci-libs/gsl ) - gtk? ( x11-libs/gtk+:3 - x11-libs/pango - x11-libs/cairo - opengl? ( x11-libs/gtkglext ) ) - jack? ( media-sound/jack-audio-connection-kit ) - ladspa? ( media-libs/ladspa-sdk ) - motif? ( >=x11-libs/motif-2.3:0 ) - opengl? ( virtual/opengl ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - readline? ( sys-libs/readline ) - ruby? ( dev-lang/ruby )" - -REQUIRED_USE=" - portaudio? ( !pulseaudio ) - pulseaudio? ( !portaudio ) - ^^ ( - ( !ruby !s7 ) - ( ruby !s7 ) - ( !ruby s7 ) - )" - -pkg_setup() { - if ! use gtk && ! use motif ; then - ewarn "Warning: no graphic toolkit selected (gtk or motif)." - ewarn "Upstream suggests to enable one of the toolkits (or both)" - ewarn "or only the command line utilities will be helpful." - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-12.6-as-needed.patch - sed -i -e "s:-O2 ::" configure.ac || die - eautoreconf -} - -src_configure() { - # Workaround executable sections QA warning (bug #348754) - append-ldflags -Wl,-z,noexecstack - - local myconf - if use opengl ; then - myconf+=" --with-just-gl" - else - myconf+=" --without-gl" - fi - - if ! use ruby && ! use s7 ; then - myconf+=" --without-extension-language" - fi - - econf \ - $(use_with alsa) \ - $(use_with fam) \ - $(use_with fftw) \ - $(use_with gmp) \ - $(use_with gsl) \ - $(use_with gtk) \ - $(use_with jack) \ - $(use_with ladspa) \ - $(use_with motif) \ - $(use_with oss) \ - $(use_with portaudio) \ - $(use_with pulseaudio) \ - $(use_enable readline) \ - $(use_with ruby) \ - $(use_with s7) \ - --with-float-samples \ - ${myconf} - -} - -src_compile() { - emake snd - - # Do not compile ruby extensions for command line programs since they fail - sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h || die - - for i in sndinfo audinfo sndplay ; do - emake ${i} - done -} - -src_install () { - dobin snd sndplay sndinfo audinfo - - if use ruby ; then - insinto /usr/share/snd - doins *.rb - fi - - if use s7 ; then - insinto /usr/share/snd - doins *.scm - fi - - dodoc README.Snd HISTORY.Snd NEWS - use doc && dohtml -r *.html pix/*.png tutorial -} diff --git a/media-sound/snd/snd-16.3.ebuild b/media-sound/snd/snd-16.3.ebuild deleted file mode 100644 index 9748bcf075b4..000000000000 --- a/media-sound/snd/snd-16.3.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic - -DESCRIPTION="Snd is a sound editor" -HOMEPAGE="http://ccrma.stanford.edu/software/snd/" -SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz" - -LICENSE="Snd BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+ ruby? ( free-noncomm ) s7? ( free-noncomm )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="alsa doc fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7" - -RDEPEND="media-libs/audiofile - alsa? ( media-libs/alsa-lib ) - fftw? ( sci-libs/fftw ) - gmp? ( dev-libs/gmp - dev-libs/mpc - dev-libs/mpfr ) - gsl? ( sci-libs/gsl ) - gtk? ( x11-libs/gtk+:3 - x11-libs/pango - x11-libs/cairo - opengl? ( x11-libs/gtkglext ) ) - jack? ( media-sound/jack-audio-connection-kit ) - ladspa? ( media-libs/ladspa-sdk ) - motif? ( >=x11-libs/motif-2.3:0 ) - opengl? ( virtual/opengl ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - readline? ( sys-libs/readline ) - ruby? ( dev-lang/ruby )" - -REQUIRED_USE=" - portaudio? ( !pulseaudio ) - pulseaudio? ( !portaudio ) - ^^ ( - ( !ruby !s7 ) - ( ruby !s7 ) - ( !ruby s7 ) - )" -PATCHES=( - "${FILESDIR}/${P}-portaudio.patch" -) - -pkg_setup() { - if ! use gtk && ! use motif ; then - ewarn "Warning: no graphic toolkit selected (gtk or motif)." - ewarn "Upstream suggests to enable one of the toolkits (or both)" - ewarn "or only the command line utilities will be helpful." - fi -} - -src_prepare() { - default - sed -i -e "s:-O2 ::" configure.ac || die - eautoreconf -} - -src_configure() { - # Workaround executable sections QA warning (bug #348754) - append-ldflags -Wl,-z,noexecstack - - local myconf - if ! use ruby && ! use s7 ; then - myconf+=" --without-extension-language" - fi - - econf \ - $(use_with alsa) \ - $(use_with fftw) \ - $(use_with gmp) \ - $(use_with gsl) \ - $(use_with gtk) \ - $(use_with jack) \ - $(use_with ladspa) \ - $(use_with motif) \ - $(use_with oss) \ - $(use_with portaudio) \ - $(use_with pulseaudio) \ - $(use_with ruby) \ - $(use_with s7) \ - ${myconf} -} - -src_compile() { - emake snd - - # Do not compile ruby extensions for command line programs since they fail - sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h || die - - local i - for i in sndplay sndinfo; do - emake ${i} - done -} - -src_install () { - dobin snd sndplay sndinfo - - if use ruby ; then - insinto /usr/share/snd - doins *.rb - fi - - if use s7 ; then - insinto /usr/share/snd - doins *.scm - fi - - dodoc README.Snd HISTORY.Snd NEWS - - if use doc ; then - docinto html/ - dodoc -r *.html pix/*.png tutorial - fi -} diff --git a/media-sound/snd/snd-17.4.ebuild b/media-sound/snd/snd-17.4.ebuild index 3a2a2027b8f4..5b746a352c8a 100644 --- a/media-sound/snd/snd-17.4.ebuild +++ b/media-sound/snd/snd-17.4.ebuild @@ -44,7 +44,8 @@ REQUIRED_USE=" ?? ( ruby s7 )" PATCHES=( - "${FILESDIR}/${PN}-17.4-portaudio.patch" + "${FILESDIR}"/${PN}-17.4-portaudio.patch + "${FILESDIR}"/${PN}-17.4-undefined-oss_sample_types.patch ) pkg_setup() { diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild index 74d37e876a74..b80c746f8b2c 100644 --- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild @@ -54,7 +54,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi # Options to use as use_enable in the foo[:bar] form. diff --git a/net-dialup/diald/diald-1.0-r2.ebuild b/net-dialup/diald/diald-1.0-r2.ebuild deleted file mode 100644 index 3eccbf87c45a..000000000000 --- a/net-dialup/diald/diald-1.0-r2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit eutils autotools pam - -DESCRIPTION="Daemon that provides on demand IP links via SLIP or PPP" -HOMEPAGE="http://diald.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="Old-MIT GPL-2" # GPL-2 only for init script -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="pam" - -DEPEND="pam? ( virtual/pam ) - sys-apps/tcp-wrappers" -RDEPEND="${DEPEND} - net-dialup/ppp" - -src_unpack() { - unpack ${A} - - epatch "${FILESDIR}/${P}-posix.patch" - epatch "${FILESDIR}/${P}-gentoo.patch" - if ! use pam; then - epatch "${FILESDIR}/${P}-nopam.patch" - rm "${S}"/README.pam - cd "${S}" - eautoconf - fi -} - -src_install() { - make \ - DESTDIR="${D}" \ - sysconfdir=/etc \ - bindir=/usr/bin \ - sbindir=/usr/sbin \ - mandir=/usr/share/man \ - libdir=/usr/lib/diald \ - BINGRP=root \ - ROOTUID=root \ - ROOTGRP=root \ - install || die "make failed" - use pam && pamd_mimic_system diald auth account - - dodir /var/cache/diald - mknod -m 0660 "${D}/var/cache/diald/diald.ctl" p - - dodoc BUGS CHANGES NOTES README* \ - THANKS TODO TODO.budget doc/diald-faq.txt - docinto setup ; cp -pPR setup/* "${D}/usr/share/doc/${PF}/setup" - docinto contrib ; cp -pPR contrib/* "${D}/usr/share/doc/${PF}/contrib" - prepalldocs - - insinto /etc/diald ; doins "${FILESDIR}"/{diald.conf,diald.filter} - newinitd "${FILESDIR}/diald-init" diald -} diff --git a/net-dialup/diald/diald-1.0-r3.ebuild b/net-dialup/diald/diald-1.0-r3.ebuild index 05503d0d2112..46729a5be186 100644 --- a/net-dialup/diald/diald-1.0-r3.ebuild +++ b/net-dialup/diald/diald-1.0-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils autotools pam +inherit autotools pam DESCRIPTION="Daemon that provides on demand IP links via SLIP or PPP" HOMEPAGE="http://diald.sourceforge.net" @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="Old-MIT GPL-2" # GPL-2 only for init script SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="pam" DEPEND="pam? ( virtual/pam ) @@ -32,7 +32,7 @@ src_prepare() { } src_install() { - make \ + emake \ DESTDIR="${D}" \ sysconfdir=/etc \ bindir=/usr/bin \ @@ -42,7 +42,7 @@ src_install() { BINGRP=root \ ROOTUID=root \ ROOTGRP=root \ - install || die "make failed" + install use pam && pamd_mimic_system diald auth account dodir /var/cache/diald diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml index e59c93f58d36..b98a9450c6f2 100644 --- a/sci-physics/thepeg/metadata.xml +++ b/sci-physics/thepeg/metadata.xml @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>sci-physics@gentoo.org</email> - <name>Gentoo Physics Project</name> -</maintainer> -<longdescription> - Toolkit for High Energy Physics Event Generation. - ThePEG has been broken out from the PYTHIA7 program - to better factorize the parts which were PYTHIA-specific - from those which are general model-independent components - of the toolkit and which can be used by any event generator model. -</longdescription> -<use> - <flag name="c++11">Build ThePEG using the C++11 standard. - Experimental feature, not for production use.</flag> - <flag name="fastjet">Adds support for <pkg>sci-physics/fastjet</pkg></flag> - <flag name="hepmc">Adds support for High Energy Physics Monte Carlo - Generators <pkg>sci-physics/hepmc</pkg></flag> - <flag name="lhapdf">Adds support for <pkg>sci-physics/lhapdf</pkg></flag> - <flag name="rivet">Adds support for <pkg>sci-physics/rivet</pkg></flag> -</use> + <maintainer type="project"> + <email>sci-physics@gentoo.org</email> + <name>Gentoo Physics Project</name> + </maintainer> + <longdescription> + Toolkit for High Energy Physics Event Generation. + ThePEG has been broken out from the PYTHIA7 program + to better factorize the parts which were PYTHIA-specific + from those which are general model-independent components + of the toolkit and which can be used by any event generator model. + </longdescription> + <use> + <flag name="c++11">Build ThePEG using the C++11 standard. + Experimental feature, not for production use.</flag> + <flag name="fastjet">Adds support for <pkg>sci-physics/fastjet</pkg></flag> + <flag name="hepmc">Adds support for High Energy Physics Monte Carlo + Generators <pkg>sci-physics/hepmc</pkg></flag> + <flag name="lhapdf">Adds support for <pkg>sci-physics/lhapdf</pkg></flag> + <flag name="rivet">Adds support for <pkg>sci-physics/rivet</pkg></flag> + </use> </pkgmetadata> |