diff --git a/app-admin/ansible/ansible-2.0.1.ebuild b/app-admin/ansible/ansible-2.0.0.1.ebuild similarity index 87% rename from app-admin/ansible/ansible-2.0.1.ebuild rename to app-admin/ansible/ansible-2.0.0.1.ebuild index 6306732183e26..2e30874d0da77 100644 --- a/app-admin/ansible/ansible-2.0.1.ebuild +++ b/app-admin/ansible/ansible-2.0.0.1.ebuild @@ -10,9 +10,7 @@ inherit distutils-r1 eutils versionator DESCRIPTION="Model-driven deployment, config management, and command execution framework" HOMEPAGE="http://ansible.com/" -# the version here is special because upstream did a 2.0.0 release on accident one time... -MY_PV=$(replace_version_separator 1 '.0.') -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml index c1a50002164ce..b99919364d81b 100644 --- a/app-admin/ansible/metadata.xml +++ b/app-admin/ansible/metadata.xml @@ -18,10 +18,10 @@ ansible/ansible https://github.com/ansible/ansible/issues - - Enable accelerated mode for old ssh clients/servers - Enable the use of the paramiko transport, an alternitive to ssh - + + Enable accelerated mode for old ssh clients/servers + Enable the use of the paramiko transport, an alternitive to ssh + Radically simple deployment, model-driven configuration management, and command execution framework. diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest index 7d23177972b27..8f2e8239d28d2 100644 --- a/app-admin/lastpass-cli/Manifest +++ b/app-admin/lastpass-cli/Manifest @@ -1,2 +1,3 @@ DIST lastpass-cli-0.6.0.tar.gz 65047 SHA256 e48f210b34a030e8b8cef3e1d05957aabe757ea4cd31bf03c46b70ddc830733c SHA512 ceaa660e6a7d3b27b09ce6d1d522af216e2c8357859d87034f7f887b53631bf5214b02400f8cb91d0c0020fcfb7889dd0fd8731b1af76a63f94666de2ac4dcd4 WHIRLPOOL 4554d8576e71a0b4c7d69556614a33f3e34d85aec4dd6aa50973ba8eb212864fc45bf3a7cb4e2847cb60a00546e46652cf5baf7f34872ada23431e78078cc6ed DIST lastpass-cli-0.7.1.tar.gz 68232 SHA256 e9e2d1dbbb6be0b0d9ce8d6c24026fc537cadc824528c96ac562737a90152f5c SHA512 c6be9b4cf30165835dd4e8716992d43246c91c4e9177226285b5a5214fd5927774155cc75b9aad66c69ec8b10ca0b0e00485a429e2bd064dd406fc55f275a295 WHIRLPOOL b88d4de9fdb120463a8454c098c12a1e2a366429904dec82d271b4ef287bdce192efef5de297733c3a38be21f3241ff402c8448a96daa195b986c671456b0b1d +DIST lastpass-cli-0.8.0.tar.gz 79167 SHA256 c5c6076a9a80de275f7fc57275d303cc0c4eb21ff06f705659047abc09a8595b SHA512 2bbaffbe31ed95bda77cec82d5f702f92a311798590d9d41f63f920e50f79b2b7a9ab9b6fb05f4e0650ea4ba75d3e845b817a4f4206f316bc2cdba0de85f9999 WHIRLPOOL 9f7da593457555e50a0450cb0cb4d9d9a8e9b940566158eaf95b21b0865d8f14d19211c9e9fcf9794784695ffc1df66712ed569b3f1cabb472260a0b5c7b1106 diff --git a/app-admin/lastpass-cli/lastpass-cli-0.8.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.8.0.ebuild new file mode 100644 index 0000000000000..242be99643904 --- /dev/null +++ b/app-admin/lastpass-cli/lastpass-cli-0.8.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Interfaces with LastPass.com from the command line." +SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/lastpass/lastpass-cli" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="libressl X +pinentry" + +RDEPEND=" + X? ( || ( x11-misc/xclip x11-misc/xsel ) ) + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + net-misc/curl + dev-libs/libxml2 + pinentry? ( app-crypt/pinentry ) +" +DEPEND="${RDEPEND} app-text/asciidoc" + +src_compile() { + emake PREFIX="${EPREFIX}/usr" + emake PREFIX="${EPREFIX}/usr" doc-man +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-doc +} diff --git a/app-admin/lastpass-cli/metadata.xml b/app-admin/lastpass-cli/metadata.xml index 5530621913551..e13c9ed137f56 100644 --- a/app-admin/lastpass-cli/metadata.xml +++ b/app-admin/lastpass-cli/metadata.xml @@ -1,19 +1,21 @@ - - jdhore@gentoo.org - Jeff Horelick - - - + proxy-maintainers + + gokturk@binghamton.edu + Gokturk 'gokturk' Yuksek + + + Use x11-misc/xclip or x11-misc/xsel to copy passwords to the clipboard. - - Use app-crypt/pinentry to prompt for passwords. + + Use app-crypt/pinentry to prompt for passwords. - - - lastpass/lastpass-cli - + + + lastpass/lastpass-cli + https://github.com/lastpass/lastpass-cli/issues + diff --git a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch index 4633b29ba7f5e..59f971c943865 100644 --- a/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch +++ b/dev-games/openscenegraph/files/openscenegraph-3.4.0-cmake.patch @@ -73,7 +73,7 @@ IF (NOT(OSG_USE_LOCAL_LUA_SOURCE)) - FIND_PACKAGE(Lua52) -+ MACRO_OPTIONAL_FIND_PACKAGE(Lua52) ++ MACRO_OPTIONAL_FIND_PACKAGE(Lua) IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR)) - FIND_PACKAGE(Lua51) + MACRO_OPTIONAL_FIND_PACKAGE(Lua51) diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml index 28883fac314d0..2d18898086529 100644 --- a/dev-games/openscenegraph/metadata.xml +++ b/dev-games/openscenegraph/metadata.xml @@ -13,10 +13,10 @@ The OpenSceneGraph is an open source high performance 3D graphics toolkit, used Enable support for dev-cpp/asio library Build examples using x11-libs/fox library Enable support for sci-libs/gdal library + Enable support for geospatial data LAS LiDAR format using sci-geosciences/liblas Build OpenInventor plugin Build osg applications - Use media-libs/libsdl2 additionally to - media-libs/libsdl + Use media-libs/libsdl2 additionally to media-libs/libsdl Enable support for the X xrandr extension diff --git a/dev-games/openscenegraph/openscenegraph-3.4.0.ebuild b/dev-games/openscenegraph/openscenegraph-3.4.0.ebuild index ae1f1102f3de3..86d35bcc1aebb 100644 --- a/dev-games/openscenegraph/openscenegraph-3.4.0.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.4.0.ebuild @@ -16,14 +16,15 @@ SRC_URI="http://trac.openscenegraph.org/downloads/developer_releases/${MY_P}.zip LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/34" # Subslot consists of major + minor version number -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg -jpeg2k openexr openinventor osgapps pdf png qt4 qt5 sdl sdl2 svg tiff truetype vnc -wxwidgets xine xrandr zlib" +jpeg2k las lua openexr openinventor osgapps pdf png qt4 qt5 sdl sdl2 svg tiff truetype +vnc wxwidgets xine xrandr zlib" REQUIRED_USE=" qt4? ( !qt5 ) qt5? ( !qt4 ) + sdl2? ( sdl ) " # TODO: COLLADA, FBX, GTA, ITK, OpenVRML, Performer, DCMTK @@ -39,8 +40,7 @@ RDEPEND=" fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) - sdl? ( media-libs/libsdl - sdl2? ( media-libs/libsdl2 ) ) + sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) ) ffmpeg? ( virtual/ffmpeg ) @@ -52,6 +52,8 @@ RDEPEND=" ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) + las? ( >=sci-geosciences/liblas-1.8.0 ) + lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase media-libs/openexr @@ -70,6 +72,7 @@ RDEPEND=" dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) + sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo @@ -109,6 +112,10 @@ src_configure() { -DDYNAMIC_OPENSCENEGRAPH=ON -DWITH_ITK=OFF -DGENTOO_DOCDIR="/usr/share/doc/${PF}" + -DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3 + -DOSG_USE_LOCAL_LUA_SOURCE=OFF + -DWITH_Lua51=OFF # We use CMake-version FindLua.cmake instead + -DWITH_Lua52=OFF $(cmake-utils_use_with asio) $(cmake-utils_use_with curl) $(cmake-utils_use_build doc DOCUMENTATION) @@ -121,15 +128,18 @@ src_configure() { $(cmake-utils_use_with gif GIFLIB) $(cmake-utils_use_with glut) $(cmake-utils_use_with gstreamer GStreamer) + $(cmake-utils_use_with gstreamer GLIB) $(cmake-utils_use_with gtk GtkGl) $(cmake-utils_use_with jpeg) $(cmake-utils_use_with jpeg2k Jasper) + $(cmake-utils_use_with las LIBLAS) + $(cmake-utils_use_with lua) $(cmake-utils_use_with openexr OpenEXR) $(cmake-utils_use_with openinventor Inventor) $(cmake-utils_use_with pdf Poppler-glib) $(cmake-utils_use_with png) $(cmake-utils_use_with sdl) - $(cmake_utils_use_with sdl2) + $(cmake-utils_use_with sdl2) $(cmake-utils_use_with svg rsvg) $(cmake-utils_use_with tiff) $(cmake-utils_use_with truetype Freetype) diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild index 59cad2227932b..579d0c58c6c90 100644 --- a/dev-python/matplotlib/matplotlib-9999.ebuild +++ b/dev-python/matplotlib/matplotlib-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) PYTHON_REQ_USE='tk?,threads(+)' -inherit distutils-r1 eutils flag-o-matic git-r3 virtualx toolchain-funcs +inherit distutils-r1 eutils flag-o-matic git-r3 multiprocessing virtualx toolchain-funcs DESCRIPTION="Pure python plotting library with matlab like syntax" HOMEPAGE="http://matplotlib.org/" @@ -22,18 +22,18 @@ SLOT="0" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" KEYWORDS="" -IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets" +IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets" PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" REQUIRED_USE=" doc? ( ${PY2_FLAGS} ) excel? ( ${PY2_FLAGS} ) fltk? ( ${PY2_FLAGS} ) - gtk? ( ${PY2_FLAGS} ) + gtk2? ( ${PY2_FLAGS} ) wxwidgets? ( ${PY2_FLAGS} ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets - || ( gtk gtk3 ) + || ( gtk2 gtk3 ) )" # #456704 -- a lot of py2-only deps @@ -48,7 +48,13 @@ COMMON_DEPEND=" media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull - gtk? ( + cairo? ( + || ( + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/cairocffi[${PYTHON_USEDEP}] + ) + ) + gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 @@ -59,14 +65,17 @@ COMMON_DEPEND=" # dev-python/pycxx DEPEND="${COMMON_DEPEND} + dev-python/versioneer[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( app-text/dvipng dev-python/pillow[${PYTHON_USEDEP}] dev-python/ipython[${PYTHON_USEDEP}] + dev-python/mock[${PY2_USEDEP}] dev-python/numpydoc[${PYTHON_USEDEP}] - dev-python/xlwt[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/xlwt[${PYTHON_USEDEP}] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended @@ -79,12 +88,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] - cairo? ( - || ( - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/cairocffi[${PYTHON_USEDEP}] - ) - ) excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] ) gtk3? ( @@ -133,15 +136,20 @@ python_prepare_all() { # rm -r agg24 CXX || die # rm -r agg24 || die +# cat > lib/${PN}/externals/six.py <<-EOF +# from __future__ import absolute_import +# from six import * +# EOF + sed \ -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ || die "sed pyparsing failed" # suggested by upstream - sed \ - -e '/tol/s:32:35:g' \ - -i lib/matplotlib/tests/test_mathtext.py || die +# sed \ +# -e '/tol/s:32:35:g' \ +# -i lib/matplotlib/tests/test_mathtext.py || die sed \ -e "s:/usr/:${EPREFIX}/usr/:g" \ @@ -201,7 +209,7 @@ python_configure() { cat >> "${BUILD_DIR}"/setup.cfg <<-EOF six = False $(use_setup fltk) - $(use_setup gtk) + $(use_setup gtk2 gtk) $(use_setup gtk3) $(use_setup wxwidgets wx) EOF @@ -236,10 +244,11 @@ python_compile_all() { python_test() { wrap_setup distutils_install_for_testing - cd "${TMPDIR}" || die - VIRTUALX_COMMAND="${PYTHON}" - virtualmake -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || \ - die "Tests fail with ${EPYTHON}" + virtx ${PYTHON} tests.py \ + --no-pep8 \ + --no-network \ + --verbose \ + --processes=$(makeopts_jobs) } python_install() { diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest new file mode 100644 index 0000000000000..c6eaa745d584c --- /dev/null +++ b/dev-python/plyvel/Manifest @@ -0,0 +1 @@ +DIST plyvel-0.9.tar.gz 121513 SHA256 587d93681ae44936ae086b4b45486eb302e3853ba5af149aac3be9e9713998e9 SHA512 21a3bf0bff075e429fef63418c2a2578b22a4904cc2f4f66fc5fbccec22c762d918bea0622a22dcbeee2e60f8d35210ae8f1e63b6d37405f0fdf29ca2fe80586 WHIRLPOOL baf98bb318bb402ba26d98b1a4657a72b7b1b93dda7e0f0b667b66af798cd6e7723a1ae740265a88266ab608023de8b3d350873560117bf9557f2e8abf792453 diff --git a/dev-python/plyvel/metadata.xml b/dev-python/plyvel/metadata.xml new file mode 100644 index 0000000000000..55fd330e1a3e2 --- /dev/null +++ b/dev-python/plyvel/metadata.xml @@ -0,0 +1,14 @@ + + + + proxy-maintainers + + sautier.louis@gmail.com + Louis Sautier + Proxied maintainer; set to assignee in all bugs + + + plyvel + wbolster/plyvel + + diff --git a/dev-python/plyvel/plyvel-0.9.ebuild b/dev-python/plyvel/plyvel-0.9.ebuild new file mode 100644 index 0000000000000..d99b31d44abdd --- /dev/null +++ b/dev-python/plyvel/plyvel-0.9.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit distutils-r1 + +MY_PN="${PN/-/.}" +DESCRIPTION="Python interface to LevelDB" +HOMEPAGE="https://github.com/wbolster/plyvel" +SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RDEPEND="dev-libs/leveldb" +DEPEND=" + ${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-runner[${PYTHON_USEDEP}] + ) + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +python_compile() { + python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" + distutils-r1_python_compile +} + +python_compile_all() { + use doc && emake doc +} + +python_test() { + local lib="$(ls "${BUILD_DIR}/lib/${PN}/"*.so | head -n1)" + ln -s "${lib}" "${PN}" || die + py.test || die "tests failed with ${EPYTHON}" + rm "${PN}/$(basename "${lib}")" || die +} + +python_install_all() { + use doc && local HTML_DOCS=( doc/build//html/. ) + distutils-r1_python_install_all +} + diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest index 1b4911213588e..3d795265dc2aa 100644 --- a/games-fps/doomsday/Manifest +++ b/games-fps/doomsday/Manifest @@ -1 +1,2 @@ DIST doomsday-1.14.5.tar.gz 14081857 SHA256 019cd0cf89e69d80cd8f6fbbd3e3fd57b8ae4d0bcdf4285e8a71caad9f46417e SHA512 f8ecf7d213ab57081858226ab4078fcf8f250271be19a3ce5883c01e53c43b5c0e7afc16085703fe19c0cbccb795c7fd1b651e3efb8a8e854160131c6374cd9a WHIRLPOOL 2351129c6dba951ca4975e6f6e92d78c75ad3e8f9648e9129a9f5a3a22c295b25c4fdb87d5208b2d3fe9c0af94c4ff968730929fbc645da9171018a672cfc60e +DIST doomsday-stable-1.15.7.tar.gz 52055761 SHA256 9d833e458e72df7723b7a1b209cc53dc868d070ce7912a53c8c7887b1df933f3 SHA512 8b0ea09a46d88dd7bb8213878401d0eccca960ac08da1b77fb359f92b9a519b3e474007c5e0a42dd44684e909be529710be52b8fabbf62975536a99385fc4d66 WHIRLPOOL 78d40bb932072e2f3380f0a64f807d251ea64efe8e5eca0c7a3360b43be51988ea2b06264a7f7bd1c89e15c4d330dcba4a0c57b612f399a0e15c2c4567d14601 diff --git a/games-fps/doomsday/doomsday-1.14.5.ebuild b/games-fps/doomsday/doomsday-1.14.5.ebuild index 5052a797a10e1..a229a14bea74a 100644 --- a/games-fps/doomsday/doomsday-1.14.5.ebuild +++ b/games-fps/doomsday/doomsday-1.14.5.ebuild @@ -40,7 +40,7 @@ DEPEND=" ) fluidsynth? ( media-sound/fluidsynth ) openal? ( media-libs/openal ) - tools? ( sys-libs/ncurses )" + tools? ( sys-libs/ncurses:0 )" RDEPEND="${DEPEND} !dedicated? ( snowberry? ( diff --git a/games-fps/doomsday/doomsday-1.15.7.ebuild b/games-fps/doomsday/doomsday-1.15.7.ebuild new file mode 100644 index 0000000000000..b45373023b05a --- /dev/null +++ b/games-fps/doomsday/doomsday-1.15.7.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# TODO: fmod support broken (deng_fmod) + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +inherit python-r1 eutils qt5-build games + +DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen" +HOMEPAGE="http://www.dengine.net/" +SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${PN}-stable-${PV}.tar.gz" + +LICENSE="GPL-3+ LGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools" +# we need python at build time, so +# snowberry? ( ${PYTHON_REQUIRED_USE} ) +# could break the build +REQUIRED_USE="${PYTHON_REQUIRED_USE} + demo? ( doom ) freedoom? ( doom ) resources? ( doom )" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-qt/qtx11extras:5 + dev-qt/qtgui:5 + net-misc/curl + sys-libs/zlib + media-libs/assimp + !dedicated? ( + media-libs/libsdl2[joystick,sound] + media-libs/sdl2-mixer + media-libs/libpng:0 + virtual/opengl + virtual/glu + x11-libs/libX11 + x11-libs/libXrandr + x11-libs/libXxf86vm + ) + fluidsynth? ( media-sound/fluidsynth ) + openal? ( media-libs/openal ) + tools? ( sys-libs/ncurses:0 )" +RDEPEND="${DEPEND} + !dedicated? ( + snowberry? ( + ${PYTHON_DEPS} + dev-lang/python-exec:2[${PYTHON_USEDEP}] + dev-python/wxpython[${PYTHON_USEDEP}] + ) + )" +DEPEND="${DEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig" +PDEPEND=" + !dedicated? ( + demo? ( games-fps/doom-data ) + freedoom? ( games-fps/freedoom ) + resources? ( games-fps/doomsday-resources ) + )" + +S=${WORKDIR}/${PN}-stable-${PV}/${PN} + +pkg_setup() { + games_pkg_setup + python_setup +} + +src_prepare() { + sed -i \ + -e '/readme.path/s#$$PREFIX#/usr#' \ + client/client.pro server/server.pro || die + + sed -i \ + -e "/DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \ + config_unix.pri || die + + { + echo "CONFIG += nostrip" + echo "PREFIX=${GAMES_PREFIX}" + + if use dedicated ; then + echo "CONFIG += deng_noclient" + echo "CONFIG += deng_nosnowberry" + else + echo "CONFIG += deng_$(usex snowberry '' no)snowberry" + fi + + use fluidsynth && echo "CONFIG += deng_fluidsynth" + + use tools || echo "CONFIG += deng_notools" + + use openal && echo "CONFIG += deng_openal" + + } > config_user.pri || die + + qt5-build_src_prepare +} + +#Usage: doom_make_wrapper [args] +doom_make_wrapper() { + local name=$1 game=$2 icon=$3 de_title=$4 + shift 4 + games_make_wrapper $name "doomsday -game ${game} $@" + make_desktop_entry $name "${de_title}" ${icon} +} + +src_configure() { + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + dodoc "${S}"/../README.md + + mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die + dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom + + if use !dedicated ; then + if use snowberry ; then + python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday + + installmodules() { + # relocate snowberry module directory recursively into site-packages + python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry + # hack around improper path handling + sed -i \ + -e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \ + "${D%/}$(python_get_scriptdir)"/launch-doomsday || die + } + python_foreach_impl installmodules + # remove old module dir + rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die + + make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry + doicon ../snowberry/graphics/snowberry.png + fi + + if use doom; then + local res_arg + + if use resources; then + res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded" + fi + + doicon ../snowberry/graphics/orb-doom.png + doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}" + elog "Created jdoom launcher. To play Doom place your doom.wad to" + elog "\"${GAMES_DATADIR}\"/doom-data" + elog + + if use demo; then + doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \ + "-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}" + fi + if use freedoom; then + doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \ + "-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad" + fi + fi + if use hexen; then + doicon ../snowberry/graphics/orb-hexen.png + doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen" + + elog "Created jhexen launcher. To play Hexen place your hexen.wad to" + elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen" + elog + fi + if use heretic; then + doicon ../snowberry/graphics/orb-heretic.png + doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic" + + elog "Created jheretic launcher. To play Heretic place your heretic.wad to" + elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic" + elog + fi + fi + + prepgamesdirs +} diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest index 1be729bdb023b..e5bdfbbf3a612 100644 --- a/games-strategy/lgeneral/Manifest +++ b/games-strategy/lgeneral/Manifest @@ -1,2 +1,3 @@ DIST lgeneral-1.3.0.tar.gz 1679182 SHA256 bd23962a8a98c1a3d3c176213c0b1845fd872ca68c141e2beff8d1a3792784ea SHA512 b958b4ee3fb6fa2b5e416cb30ddeca82cd17f0461a1afa6adc7d48d16f8e763e1610c3e05f561e442cc9460bdca64e2ac33cf616bd26f0ca8b2274c7e2b8bb41 WHIRLPOOL f00d2d0832727a1d90839bf6f1fd941a0c31e497a330dd991680146138f1dfb516e94e67a3ac8c20a1315e033313352a1d2f6a0e7f1153a7d365c2ef68581988 +DIST lgeneral-1.3.1.tar.gz 1678892 SHA256 6e95a84d7772f0bd2d64edac8c2aa45c6f750ae47bfb9dc203fe53a089e5562c SHA512 4eb8fc6d1dc134792893f3f9b23833da75412fafefea66d699a27de1954d3c1338c7e5dedef842537303368387797ecea2158a477fe1d018e3af973dd5b755e5 WHIRLPOOL 9711bc8fc83a6806abc229c8de5ef669eb8335fb0aac59f5fbee9de7c3eb82865602569c83ba3246faa4be92ff5f2f8048b721bc605e299db5b76f88fe95e2d1 DIST pg-data.tar.gz 410454 SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516 WHIRLPOOL 69f22f28cf4639dab0e6cf90036c26178129d7f67decf8b95ca175bb224bb3b985cf80382e06e45db06ef21d9ab9819fc1821b3d633a67bbb06ba56a8b450022 diff --git a/games-strategy/lgeneral/lgeneral-1.3.1.ebuild b/games-strategy/lgeneral/lgeneral-1.3.1.ebuild new file mode 100644 index 0000000000000..5c99ecf222d69 --- /dev/null +++ b/games-strategy/lgeneral/lgeneral-1.3.1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils autotools gnome2-utils games + +MY_P="${P/_/}" +MY_P="${MY_P/beta/beta-}" +DESCRIPTION="A Panzer General clone written in SDL" +HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LGeneral" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz + mirror://sourceforge/${PN}/pg-data.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nls" + +RDEPEND="media-libs/libsdl[sound,video] + media-libs/sdl-mixer + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + sys-devel/gettext" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + sed -i \ + -e '/desktop_DATA/d' \ + -e '/icon_DATA/d' \ + Makefile.am || die + + cp /usr/share/gettext/config.rpath . + rm -f missing + mv configure.in configure.ac + eautoreconf + + # Build a temporary lgc-pg that knows about ${WORKDIR}: + cp -pPR "${S}" "${WORKDIR}"/tmp-build || die + sed -i \ + -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \ + -e "s:@D@::" \ + {lgc-pg,src}/misc.c || die + + cd "${WORKDIR}"/tmp-build || die + sed -i \ + -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \ + -e "s:@D@:${D}:" \ + {lgc-pg,src}/misc.c || die +} + +src_configure() { + egamesconf \ + $(use_enable nls) + + # Build the temporary lgc-pg: + cd "${WORKDIR}"/tmp-build || die + egamesconf \ + --disable-nls \ + --datadir="${D}/${GAMES_DATADIR}" +} + +src_compile() { + emake + + # Build the temporary lgc-pg: + cd "${WORKDIR}"/tmp-build || die + emake +} + +src_install() { + default + keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain} + + # Generate scenario data: + dodir "${GAMES_DATADIR}"/${PN}/gfx/{flags,units,terrain} #413901 + SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg \ + -s "${WORKDIR}"/pg-data \ + -d "${D}/${GAMES_DATADIR}"/${PN} || die + + doicon -s 48 lgeneral.png + make_desktop_entry ${PN} LGeneral + prepgamesdirs +} + +pkg_preinst() { + games_pkg_preinst + gnome2_icon_savelist +} + +pkg_postinst() { + games_pkg_postinst + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild index 9f32421c6dbbb..c27274c027048 100644 --- a/games-strategy/widelands/widelands-0.17.ebuild +++ b/games-strategy/widelands/widelands-0.17.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -inherit eutils versionator toolchain-funcs flag-o-matic cmake-utils games +inherit eutils versionator cmake-utils games MY_PV=build$(get_version_component_range 2) MY_P=${PN}-${MY_PV}-src @@ -16,13 +16,13 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -DEPEND="dev-lang/lua +DEPEND="dev-lang/lua:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net - media-libs/libpng + media-libs/libpng:0 sys-libs/zlib media-libs/glew media-libs/sdl-ttf @@ -43,21 +43,6 @@ src_prepare() { sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die sed -i -e '/Boost_USE_STATIC_LIBS/s:ON:OFF:' CMakeLists.txt || die - - # how do I hate boost? Let me count the ways... - local boost_ver=$(best_version ">=dev-libs/boost-1.37") - - boost_ver=${boost_ver/*boost-/} - boost_ver=${boost_ver%.*} - boost_ver=${boost_ver/./_} - - einfo "Using boost version ${boost_ver}" - append-cxxflags \ - -I/usr/include/boost-${boost_ver} - append-ldflags \ - -L/usr/$(get_libdir)/boost-${boost_ver} - export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}" - export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}" } src_configure() { diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index 521b94e8e4f95..1d283e7561396 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -1,2 +1,3 @@ DIST assimp--3.0.1270-source-only.zip 4042147 SHA256 ac29beb596db97df57451a5503afaf2d8b4366522842a6914da89644927a1423 SHA512 0c23e4eafbd2ff5eb6371b9a3b83ea2b0ef65110f6091a4e63e28b83a6dd1939f1f03607ad002cb5e9a632b821f65d1cc78b63d7792f45ed186071ef0a7ab820 WHIRLPOOL 9f32ea8b3c54ca7efd4a1c57300571bedb7f527bf630aa7203636c297acc53e6fbebf482069e76e833a1eb6317fa313c3d78ad4e6a68db4dd82a466b136f8d38 DIST assimp-3.1.1.zip 32869052 SHA256 3b8d16eaf6c4b26479295f4f7436388bee1e42e8c0b11f6f695b7194985eb00e SHA512 c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527 WHIRLPOOL 238a79a7e2c7ce799dc89394043962456af06eb8b6ed105893512cb751919287c70c88030b03832ba2f3e6ea54d82db4e8d6009629bb7ed3f3e5e6df78bbd6c6 +DIST assimp-3.2.tar.gz 33756081 SHA256 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a SHA512 d9c4b1efc319990726605664ef38fda49d23a8f169261dda007d912015f404737b2c2a8306bffb837827e4a62d5fb362dae384b85b865450a5622325fe13ad7a WHIRLPOOL 1a1cb97356a888863f1183a6cc838cccabda1ffa5d89265f94fb231df24be2cadffbdeb72763826000b80d513e2003d81aca6d20aae7bce09428194ef45f6888 diff --git a/media-libs/assimp/assimp-3.2.ebuild b/media-libs/assimp/assimp-3.2.ebuild new file mode 100644 index 0000000000000..b0b5989aa4147 --- /dev/null +++ b/media-libs/assimp/assimp-3.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils versionator + +DESCRIPTION="Importer library to import assets from 3D files" +HOMEPAGE="https://github.com/assimp/assimp" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+boost samples static tools" +SLOT="0" + +DEPEND=" + boost? ( dev-libs/boost ) + samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) + sys-libs/zlib +" +RDEPEND="${DEPEND}" + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ + $(cmake-utils_use_build tools ASSIMP_TOOLS) \ + $(cmake-utils_use_build static STATIC_LIB) \ + $(cmake-utils_use_enable !boost BOOST_WORKAROUND) + ) + + cmake-utils_src_configure +} \ No newline at end of file diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 2a2b7ad263af4..79d59e6991a6a 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -1 +1,2 @@ DIST tcpreplay-4.1.0.tar.gz 2118212 SHA256 ad285b08d7a61ed88799713c4c5d657a7a503eee832304d3a767f67efe5d1a20 SHA512 bfd7a0679dccd86aba7ca5d102665e6feba72bffb1596915985bc50261f9ac10ce56b870e1aa64a33efa79e3bee89b8c66e2c26328fb15d3722a5bc957ea77a2 WHIRLPOOL e6a07495cb07a09f707b3784d15a266c04a7b3d369b7d8eb9d7d5683838accdcc539255ff05f99c2fc8036d045e66f3a250a0c7f1896024c65065a6c6d282b7a +DIST tcpreplay-4.1.1.tar.gz 2173781 SHA256 61b916ef91049cad2a9ddc8de6f5e3e3cc5d9998dbb644dc91cf3a798497ffe4 SHA512 6be88d3742b93fa557c9142eebe7ae2cf61a5436087f8400260472f87c1dd0d61515b338706afa1c850ae2380c0d5fa664691052d3dc01f3099ad068b67eee87 WHIRLPOOL ce1e4fe845ffbc019316f7a11249828d7b8c65afd9bfbff04950d0666aa79ee61e3bfd98d0870f820423cfb5b21e5274bf328cb4a020f290b0e7faa81297c544 diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild new file mode 100644 index 0000000000000..1136474257e42 --- /dev/null +++ b/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils flag-o-matic + +DESCRIPTION="a suite of utilities for editing and replaying previously captured network traffic" +HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" +LICENSE="BSD GPL-3" +SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86" +IUSE="debug pcapnav +tcpdump" + +DEPEND=" + >=sys-devel/autogen-5.18.4[libopts] + dev-libs/libdnet + >=net-libs/libpcap-0.9 + tcpdump? ( net-analyzer/tcpdump ) + pcapnav? ( net-libs/libpcapnav ) +" + +RDEPEND="${DEPEND}" + +DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch + + sed -i \ + -e 's|-O3||g' \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ + configure.ac || die + sed -i \ + -e 's|#include |#include |g' \ + src/common/sendpacket.c || die + sed -i \ + -e 's|@\([A-Z_]*\)@|$(\1)|g' \ + -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \ + -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \ + src/Makefile.am || die + + eautoreconf +} + +src_configure() { + # By default it uses static linking. Avoid that, bug 252940 + econf \ + $(use_enable debug) \ + $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \ + $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \ + --disable-local-libopts \ + --enable-dynamic-link \ + --enable-shared \ + --with-libdnet \ + --with-testnic2=lo \ + --with-testnic=lo +} + +src_test() { + if [[ ! ${EUID} -eq 0 ]]; then + ewarn "Some tests were disabled due to FEATURES=userpriv" + ewarn "To run all tests issue the following command as root:" + ewarn " # make -C ${S}/test" + emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log" + else + emake -j1 test || { + ewarn "Note, that some tests require eth0 iface to be UP." ; + die "self test failed - see ${S}/test/test.log" ; } + fi +} diff --git a/net-fs/samba/samba-4.2.7-r1.ebuild b/net-fs/samba/samba-4.2.7-r1.ebuild index 6686a68e6c86b..fe36f4716a572 100644 --- a/net-fs/samba/samba-4.2.7-r1.ebuild +++ b/net-fs/samba/samba-4.2.7-r1.ebuild @@ -39,7 +39,7 @@ CDEPEND="${PYTHON_DEPS} dev-libs/popt[${MULTILIB_USEDEP}] sys-libs/readline:= virtual/libiconv - dev-python/subunit[${PYTHON_USEDEP}] + dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] >=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] sys-libs/libcap diff --git a/net-fs/samba/samba-4.3.4.ebuild b/net-fs/samba/samba-4.3.4.ebuild index d7769ae0435ee..dd187d69a14be 100644 --- a/net-fs/samba/samba-4.3.4.ebuild +++ b/net-fs/samba/samba-4.3.4.ebuild @@ -39,7 +39,7 @@ CDEPEND="${PYTHON_DEPS} dev-libs/popt[${MULTILIB_USEDEP}] sys-libs/readline:= virtual/libiconv - dev-python/subunit[${PYTHON_USEDEP}] + dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] >=net-libs/socket_wrapper-1.1.3[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] sys-libs/libcap diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index d4813d9c0670f..783e94393949e 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -1,4 +1,4 @@ DIST dhcp-4.2.5-P1.tar.gz 8255960 SHA256 59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250 SHA512 02a811b6e88ce013f7ecff6abf81d4b2aff82fff584521ae03fc3242b6036d0d0ad3afc6283fe8b97d18b8fffd4b6d2253386897ae2297c165240017f5f219ec WHIRLPOOL b8cf91c69ae0e1b234089ce3fae4b9daf5bde7f415d8cbc274ab4d006c8aa25f55807c70ba4c6771e0c9803ec5a99f8cc2088e561cac7d16479f5f022ee5459f DIST dhcp-4.3.1.tar.gz 8980806 SHA256 266cbca8a7a6bb8f9ccc5765da0d2b04099329314a54a4fc1022d510ad3e9af0 SHA512 84ca525fda825bf367a98754f1fb1b8eba5b095c92c25ddaec6e30b31008c7d5c43062ae43cecaa43731a8e78ae406a3123906fd402d2ba4b46b7adbae65aa6a WHIRLPOOL 3fd3720f6883b43856d2169264ee2adfb541b793604728c4e5cc3b647d4a88d6245fb6e53062de4118301cc15f0b4388363eba304bf3623dfb88c91bde94b2b6 -DIST dhcp-4.3.2.tar.gz 9230340 SHA256 6246c9b358759f6cdcc45104caaf76e732a211dbbbbf64a21f499c8db1298165 SHA512 b91a0a90736c6e8bd66a74af8c67949c81db3148eba23ee647f0987bbd98543f0dfd1605c94e152b28a606bbbecd94cd8a8112db5f5fe4c3d041101bda1b95da WHIRLPOOL a201cea52e96517ff1dae2b6c05b05da11feb4c2eed6dca539ea5ab3185711377cd7f7ed9ecc5e5f2bc30bc84d73a85d4140154c43b4f0f27a7e0a4a51f56787 +DIST dhcp-4.3.3-P1.tar.gz 9204043 SHA256 c11e896dffa1bfbc49462965d3f6dec45534e34068603546d9a236f2aa669921 SHA512 7e14268b4acaa82c807af9d956f76f4327a9a75d36273a244fef74dbd54e7506e8b38ce6035e56f61ab09a19bfc0a40599f76c89dc342514f1048b5ac3b2a0eb WHIRLPOOL a0a6873e2f1625cfa208c328ed2d6ec507e239456d6eba24f5731a83ba16f5fbb36f0d6d99fd33fb9045cbf051116196a57c6c2ded2b36e93964475ad29d2b0e DIST dhcp-4.3.3.tar.gz 9205539 SHA256 553c4945b09b1c1b904c4780f34f72aaefa2fc8c6556715de0bc9d4e3d255ede SHA512 33671816e21456ffec57e2c9ab2d129377096b4e2e5b4ca8194dcd9495c6a9e18a2a5e79d4f05694f3dc841895aa0adb63afd7bd6fe4641eb5a80d3fd7e715d9 WHIRLPOOL 27e7f2fdd1f1f7b3309b444a67e21d139468317538345cc3599e6a47f20489fa5d07018eabe8e32c429f2f16f03c28b22b29bff2ab08972f541c63603bd3df9a diff --git a/net-misc/dhcp/dhcp-4.3.2.ebuild b/net-misc/dhcp/dhcp-4.3.2.ebuild deleted file mode 100644 index 447f44c55e109..0000000000000 --- a/net-misc/dhcp/dhcp-4.3.2.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils systemd toolchain-funcs user - -MY_PV="${PV//_alpha/a}" -MY_PV="${MY_PV//_beta/b}" -MY_PV="${MY_PV//_rc/rc}" -MY_PV="${MY_PV//_p/-P}" -MY_P="${PN}-${MY_PV}" -DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" -HOMEPAGE="http://www.isc.org/products/DHCP" -SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz - ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" - -DEPEND=" - client? ( - kernel_linux? ( - ipv6? ( sys-apps/iproute2 ) - sys-apps/net-tools - ) - ) - ldap? ( - net-nds/openldap - ssl? ( dev-libs/openssl ) - )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-dhcp ) - vim-syntax? ( app-vim/dhcpd-syntax )" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - # handle local bind hell - cd "${S}"/bind - unpack ./bind.tar.gz -} - -src_prepare() { - # Gentoo patches - these will probably never be accepted upstream - # Fix some permission issues - epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch - # Enable dhclient to equery NTP servers - epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch - epatch "${FILESDIR}"/${PN}-4.3.1-dhclient-resolvconf.patch - # Stop downing the interface on Linux as that breaks link daemons - # such as wpa_supplicant and netplug - epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch - # Enable dhclient to get extra configuration from stdin - epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch - epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531 - epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921 - epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108 - epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636 - epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142 - - # Brand the version with Gentoo - sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ - configure || die - - # Change the hook script locations of the scripts - sed -i \ - -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \ - -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \ - client/scripts/* || die - - # No need for the linux script to force bash #158540 - sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die - - # Quiet the freebsd logger a little - sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die - - # Remove these options from the sample config - sed -i -r \ - -e "/(script|host-name|domain-name) /d" \ - client/dhclient.conf.example || die - - if use client && ! use server ; then - sed -i -r \ - -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \ - Makefile.in || die - elif ! use client && use server ; then - sed -i -r \ - -e '/^SUBDIRS/s:\::' \ - Makefile.in || die - fi - - # Only install different man pages if we don't have en - if [[ " ${LINGUAS} " != *" en "* ]]; then - # Install Japanese man pages - if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then - einfo "Installing Japanese documention" - cp doc/ja_JP.eucJP/dhclient* client - cp doc/ja_JP.eucJP/dhcp* common - fi - fi - # Now remove the non-english docs so there are no errors later - rm -rf doc/ja_JP.eucJP - - # make the bind build work - binddir=${S}/bind - cd "${binddir}" || die - cat <<-EOF > bindvar.tmp - binddir=${binddir} - GMAKE=${MAKE:-gmake} - EOF - epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch - cd bind-*/ - epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717 - epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch -} - -src_configure() { - # bind defaults to stupid `/usr/bin/ar` - tc-export AR BUILD_CC - export ac_cv_path_AR=${AR} - - # this is tested for by the bind build system, and can cause trouble - # when cross-building; since dhcp itself doesn't make use of libcap, - # simply disable it. - export ac_cv_lib_cap_cap_set_proc=no - - # Use FHS sane paths ... some of these have configure options, - # but not all, so just do it all here. - local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp" - cat <<-EOF >> includes/site.h - #define _PATH_DHCPD_CONF "${e}/dhcpd.conf" - #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf" - #define _PATH_DHCPD_DB "${l}/dhcpd.leases" - #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases" - #define _PATH_DHCLIENT_DB "${l}/dhclient.leases" - #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases" - #define _PATH_DHCPD_PID "${r}/dhcpd.pid" - #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid" - #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid" - #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid" - #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid" - #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid" - EOF - - econf \ - --enable-paranoia \ - --enable-early-chroot \ - --sysconfdir=${e} \ - $(use_enable ipv6 dhcpv6) \ - $(use_with ldap) \ - $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) - - # configure local bind cruft. symtable option requires - # perl and we don't want to require that #383837. - cd bind/bind-*/ || die - eval econf \ - $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \ - --disable-symtable \ - --without-make-clean -} - -src_compile() { - # build local bind cruft first - emake -C bind/bind-*/lib/export install - # then build standard dhcp code - emake AR="$(tc-getAR)" -} - -src_install() { - default - - dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} - dohtml doc/References.html - - if [[ -e client/dhclient ]] ; then - # move the client to / - dodir /sbin - mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die - - exeinto /sbin - if use kernel_linux ; then - newexe "${S}"/client/scripts/linux dhclient-script - else - newexe "${S}"/client/scripts/freebsd dhclient-script - fi - fi - - if [[ -e server/dhcpd ]] ; then - if use ldap ; then - insinto /etc/openldap/schema - doins contrib/ldap/dhcp.* - dosbin contrib/ldap/dhcpd-conf-to-ldap - fi - - newinitd "${FILESDIR}"/dhcpd.init5 dhcpd - newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd - newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay - newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay - newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6 - newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6 - - systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf - systemd_dounit "${FILESDIR}"/dhcpd4.service - systemd_dounit "${FILESDIR}"/dhcpd6.service - systemd_dounit "${FILESDIR}"/dhcrelay4.service - systemd_dounit "${FILESDIR}"/dhcrelay6.service - systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf - systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf - - sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560 - fi - - # the default config files aren't terribly useful #384087 - local f - for f in "${ED}"/etc/dhcp/*.conf.example ; do - mv "${f}" "${f%.example}" || die - done - sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die -} - -pkg_preinst() { - enewgroup dhcp - enewuser dhcp -1 -1 /var/lib/dhcp dhcp - - # Keep the user files over the sample ones. The - # hashing is to ignore the crappy defaults #384087. - local f h - for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do - h=${f#*:} - f="/etc/dhcp/${f%:*}.conf" - if [ -e "${EROOT}"${f} ] ; then - case $(md5sum "${EROOT}"${f}) in - ${h}*) ;; - *) cp -p "${EROOT}"${f} "${ED}"${f};; - esac - fi - done -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then - ewarn - ewarn "WARNING: The dhcp init script has been renamed to dhcpd" - ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and" - ewarn "and dhcp should be removed from the default runlevel" - ewarn - fi -} diff --git a/net-misc/dhcp/dhcp-4.3.3.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild similarity index 97% rename from net-misc/dhcp/dhcp-4.3.3.ebuild rename to net-misc/dhcp/dhcp-4.3.3_p1.ebuild index a2c42d44bef06..535c9aeffe172 100644 --- a/net-misc/dhcp/dhcp-4.3.3.ebuild +++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI=5 inherit eutils systemd toolchain-funcs user @@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" +IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax" DEPEND=" client? ( @@ -30,7 +30,10 @@ DEPEND=" ) ldap? ( net-nds/openldap - ssl? ( dev-libs/openssl ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) )" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-dhcp ) diff --git a/net-misc/dhcp/files/dhcp-3.0-paranoia.patch b/net-misc/dhcp/files/dhcp-3.0-paranoia.patch deleted file mode 100644 index 886f5cb5ffe3f..0000000000000 --- a/net-misc/dhcp/files/dhcp-3.0-paranoia.patch +++ /dev/null @@ -1,207 +0,0 @@ - -paranoia (non-root/chroot) patch for ISC dhcp 3.0 -file to patch: dhcp-3.0/server/dhcpd.c - -update from paranoia patch for ISC dhcp 2.0 - -Adds 3 options: - - -user - -group - -chroot - -Notes: - -DPARANOIA must be passed as an argument to the --copts option - of configure. Otherwise, the paranoia code will not be compiled - in. Example: ./configure --copts -DPARANOIA - - The chroot() call has been delayed in order to allow /dev/log to - be reopened after the configuration file has been read. This is - beneficial for systems on which /dev/log is a unix domain socket. - The main side effect is that dhcpd.conf should be placed in /etc, - instead of /etc. - - If dhcpd is to be run on a sysV-style architecture (or, more - generally, if /dev/log is a character device), one may opt to - create the /dev/log character device and add - -DEARLY_CHROOT to the --copts option of configure (in addition to - -DPARANOIA). This will perform the chroot() call at the earliest - convenience (before reading the configuration file). - - If the -user option is used, the lease and pid file directories - should be writable to the server process after it drops - privileges. - - -ari edelkind (12/10/2001) -last modified 12/10/2001 - - ---- dhcp-3.0/server/dhcpd.c Thu Jun 21 22:12:58 2001 -+++ dhcp-3.0+paranoia/server/dhcpd.c Wed Oct 17 08:23:00 2001 -@@ -56,6 +56,16 @@ - #include "version.h" - #include - -+#if defined (PARANOIA) -+# include -+# include -+# include -+/* get around the ISC declaration of group */ -+# define group real_group -+# include -+# undef group -+#endif /* PARANOIA */ -+ - static void usage PROTO ((void)); - - TIME cur_time; -@@ -204,6 +214,22 @@ - omapi_object_dereference (&listener, MDL); - } - -+#if defined (PARANOIA) -+/* to be used in one of two possible scenarios */ -+static void setup_chroot (char *chroot_dir) { -+ if (geteuid()) -+ log_fatal ("you must be root to use chroot"); -+ -+ if (chroot(chroot_dir)) { -+ log_fatal ("chroot(\"%s\"): %m", chroot_dir); -+ } -+ if (chdir ("/")) { -+ /* probably permission denied */ -+ log_fatal ("chdir(\"/\"): %m"); -+ } -+} -+#endif /* PARANOIA */ -+ - int main (argc, argv, envp) - int argc; - char **argv, **envp; -@@ -236,6 +262,14 @@ - char *traceinfile = (char *)0; - char *traceoutfile = (char *)0; - #endif -+#if defined (PARANOIA) -+ char *set_user = 0; -+ char *set_group = 0; -+ char *set_chroot = 0; -+ -+ uid_t set_uid = 0; -+ gid_t set_gid = 0; -+#endif /* PARANOIA */ - - /* Make sure we have stdin, stdout and stderr. */ - status = open ("/dev/null", O_RDWR); -@@ -298,6 +332,20 @@ - if (++i == argc) - usage (); - server = argv [i]; -+#if defined (PARANOIA) -+ } else if (!strcmp (argv [i], "-user")) { -+ if (++i == argc) -+ usage (); -+ set_user = argv [i]; -+ } else if (!strcmp (argv [i], "-group")) { -+ if (++i == argc) -+ usage (); -+ set_group = argv [i]; -+ } else if (!strcmp (argv [i], "-chroot")) { -+ if (++i == argc) -+ usage (); -+ set_chroot = argv [i]; -+#endif /* PARANOIA */ - } else if (!strcmp (argv [i], "-cf")) { - if (++i == argc) - usage (); -@@ -397,6 +445,44 @@ - trace_seed_stop, MDL); - #endif - -+#if defined (PARANOIA) -+ /* get user and group info if those options were given */ -+ if (set_user) { -+ struct passwd *tmp_pwd; -+ -+ if (geteuid()) -+ log_fatal ("you must be root to set user"); -+ -+ if (!(tmp_pwd = getpwnam(set_user))) -+ log_fatal ("no such user: %s", set_user); -+ -+ set_uid = tmp_pwd->pw_uid; -+ -+ /* use the user's group as the default gid */ -+ if (!set_group) -+ set_gid = tmp_pwd->pw_gid; -+ } -+ -+ if (set_group) { -+/* get around the ISC declaration of group */ -+#define group real_group -+ struct group *tmp_grp; -+ -+ if (geteuid()) -+ log_fatal ("you must be root to set group"); -+ -+ if (!(tmp_grp = getgrnam(set_group))) -+ log_fatal ("no such group: %s", set_group); -+ -+ set_gid = tmp_grp->gr_gid; -+#undef group -+ } -+ -+# if defined (EARLY_CHROOT) -+ if (set_chroot) setup_chroot (set_chroot); -+# endif /* EARLY_CHROOT */ -+#endif /* PARANOIA */ -+ - /* Default to the DHCP/BOOTP port. */ - if (!local_port) - { -@@ -500,6 +586,10 @@ - - postconf_initialization (quiet); - -+#if defined (PARANOIA) && !defined (EARLY_CHROOT) -+ if (set_chroot) setup_chroot (set_chroot); -+#endif /* PARANOIA && !EARLY_CHROOT */ -+ - /* test option should cause an early exit */ - if (cftest && !lftest) - exit(0); -@@ -543,6 +633,22 @@ - exit (0); - } - -+#if defined (PARANOIA) -+ /* change uid to the specified one */ -+ -+ if (set_gid) { -+ if (setgroups (0, (void *)0)) -+ log_fatal ("setgroups: %m"); -+ if (setgid (set_gid)) -+ log_fatal ("setgid(%d): %m", (int) set_gid); -+ } -+ -+ if (set_uid) { -+ if (setuid (set_uid)) -+ log_fatal ("setuid(%d): %m", (int) set_uid); -+ } -+#endif /* PARANOIA */ -+ - /* Read previous pid file. */ - if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) { - status = read (i, pbuf, (sizeof pbuf) - 1); -@@ -888,6 +994,10 @@ - - log_fatal ("Usage: dhcpd [-p ] [-d] [-f]%s%s%s%s", - "\n [-cf config-file] [-lf lease-file]", -+#if defined (PARANOIA) -+ /* meld into the following string */ -+ "\n [-user user] [-group group] [-chroot dir]" -+#endif /* PARANOIA */ - #if defined (TRACING) - "\n [-tf trace-output-file]", - "\n [-play trace-input-file]", diff --git a/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch b/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch deleted file mode 100644 index 89935df820f90..0000000000000 --- a/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -Nuar --exclude '*.orig' dhcp-3.1.3.orig//client/scripts/linux dhcp-3.1.3//client/scripts/linux ---- dhcp-3.1.3.orig//client/scripts/linux 2010-10-15 04:59:15.890664245 +0000 -+++ dhcp-3.1.3//client/scripts/linux 2010-10-15 05:04:57.940396350 +0000 -@@ -118,7 +118,7 @@ - if [ x$reason = xPREINIT ]; then - if [ x$alias_ip_address != x ]; then - # Bring down alias interface. Its routes will disappear too. -- ifconfig $interface:0- inet 0 -+ ifconfig $interface:0- inet 0.0.0.0 - fi - if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ) - then -@@ -127,7 +127,7 @@ - # Add route to make broadcast work. Do not omit netmask. - route add default dev $interface netmask 0.0.0.0 - else -- ifconfig $interface 0 up -+ ifconfig $interface 0.0.0.0 up - fi - - # We need to give the kernel some time to get the interface up. -@@ -155,12 +155,12 @@ - if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ - [ x$alias_ip_address != x$old_ip_address ]; then - # Possible new alias. Remove old alias. -- ifconfig $interface:0- inet 0 -+ ifconfig $interface:0- inet 0.0.0.0 - fi - if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then - # IP address changed. Bringing down the interface will delete all routes, - # and clear the ARP cache. -- ifconfig $interface inet 0 down -+ ifconfig $interface inet 0.0.0.0 - - fi - if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ -@@ -179,7 +179,7 @@ - fi - if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; - then -- ifconfig $interface:0- inet 0 -+ ifconfig $interface:0- inet 0.0.0.0 - ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg - route add -host $alias_ip_address $interface:0 - fi -@@ -191,11 +191,11 @@ - || [ x$reason = xSTOP ]; then - if [ x$alias_ip_address != x ]; then - # Turn off alias interface. -- ifconfig $interface:0- inet 0 -+ ifconfig $interface:0- inet 0.0.0.0 - fi - if [ x$old_ip_address != x ]; then - # Shut down interface, which will delete routes and clear arp cache. -- ifconfig $interface inet 0 down -+ ifconfig $interface inet 0.0.0.0 - fi - if [ x$alias_ip_address != x ]; then - ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg -@@ -206,7 +206,7 @@ - - if [ x$reason = xTIMEOUT ]; then - if [ x$alias_ip_address != x ]; then -- ifconfig $interface:0- inet 0 -+ ifconfig $interface:0- inet 0.0.0.0 - fi - ifconfig $interface inet $new_ip_address $new_subnet_arg \ - $new_broadcast_arg $mtu_arg -@@ -227,7 +227,7 @@ - make_resolv_conf - exit_with_hooks 0 - fi -- ifconfig $interface inet 0 down -+ ifconfig $interface inet 0.0.0.0 - exit_with_hooks 1 - fi - diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index e250e96ecd0dd..1ee0b85580dbf 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,10 +1,6 @@ -DIST ntp-4.2.6p5-manpages.tar.bz2 47874 SHA256 f49203cba2301ce27a53113a6e22d844b258114604f2c9ee1371833babc70f9c SHA512 57d4b8fc4482a41c6595418ebff1a861d4bd7ee175b13cf5580a5915749a096b3a906ca8ddf9fc9c57ead783df22b7b9326b51bbab9cd8340576413bee3e7f84 WHIRLPOOL 83c2d95fe953ab2cd7729bc03d89e44a2de85cb68b4ec72c123a034846866aebf7b83eeb4e45add6aa1443f2de83bfbb1ecdbb437534d827d1e1a4a08f91cfd4 -DIST ntp-4.2.6p5.tar.gz 4202539 SHA256 d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c SHA512 8d76fc7e92b2ea6dd5031e6030a7aba4ff6fb3e19d3bc0153852509861be5d0960e70604814163caedb81f8315a451d78371f99634a50b55cfe1cbd2c69e3046 WHIRLPOOL 9943706ad02e377cb38d65caed6f675d37db7aa53dd86319b17405791494bf11244ac933867516cca9438947202b595b6606088a8aaa436655f9eeb8d078b77e -DIST ntp-4.2.8-manpages.tar.bz2 46542 SHA256 9c68840456c7002796baea70231e6cf7f6bc06583bbab370a09f837a66f2c409 SHA512 a87db65da978fcaf123763a6de59a399a3c799d59374acd1c397d7a7816e6ee2ff6091f24ff41223cf719effd2e595dfa7699006a724d2908d380c6098603d28 WHIRLPOOL cb0e53cc0132573d6b2910301c1d7743874598b1487968ec9e49f467a8aa62340609379c8cffb42da2694703955581629aa78897a9319f71b3589600e882b9b0 -DIST ntp-4.2.8.tar.gz 6750364 SHA256 2e920df8b6a5a410567a73767fa458c00c7f0acec3213e69ed0134414a50d8ee SHA512 d69ed02e57c66d5c57616bb5e4be0d58e7410dd27ea96acaed6e8b63726a37cd22ae73e8bdff089abbe8e19bcd8bee05733ab362249018fc495fcedc71aa3a44 WHIRLPOOL 4bfe1222c250425e3fc229649d1d4ae11fa6a32eb03f9d15b95575ee31171761321730c83d6e283551fc89647370a86791ec1c262c49826b31106d4317fb64e1 -DIST ntp-4.2.8p2-manpages.tar.bz2 46421 SHA256 c22f74e0361e5eb921e495ff0f1b8987c26d90db72393dfb307f68498d6501e8 SHA512 8b211e891e96006ba4fa054fe5f111ae5b52cc4b990d4bbe691fd0724f6373ec54428fc39ea0cffc8fe66f757d6f99355ac69f3dc76ad43f8f95c145f3adee9c WHIRLPOOL f1b85c4e39934d308dbaaca1b22779e33c18489abfd9e17ad26368462032445d164a2dbb96fa9865128bc138ce8f8f8790d9eeffc0c37339ed5eafa0ee687a72 -DIST ntp-4.2.8p2.tar.gz 6820869 SHA256 0d69bc0e95caad43ea04fdad410e756bae1a71e67b1c2bd799b76b55e04c9b31 SHA512 7b39e4d8a362afd37dc57a742841fadcd4634bb1d21d59d72d484b759a867d82b90d8c77e6e104c73ec8690489b80b0f9e2e86e4dfcfa34a49621cee3dee16d0 WHIRLPOOL 70d63c895a62bcd790760e6205d6b666ab47dfc9fc8737f10d1cd7d4a2c3cafb4efe6b8141570921c5024e71b00ebca73574562694678f448ee7680a982a0084 DIST ntp-4.2.8p3-manpages.tar.bz2 46419 SHA256 83f9641e52fd79ac8bd76f7d62214591389f97fed5200e8b5d85aa31070f9112 SHA512 1d15c63f5c88e0b45f5de3a35042fde9a3a01413ab460f553124ad996832b46c72212070ccbefc0e70aef8ffe4c634b7424e06ac31f62cd921a3df13b3746d6b WHIRLPOOL 92aa9cebe97454e1d7d1533546bee131795ab6f28538b0326423afbca10b83fadc8693c8148de08d7d7bed0773d462d204632ba38e16a4c442b1bae10094a501 DIST ntp-4.2.8p3.tar.gz 7099575 SHA256 818ca4f2ed6ca845b1c5ec43f5e6ad905eaa0fc0aab2d509ed6b962a37fbf38f SHA512 5a628f72e900ac8c8a4754bc9620e6511f68035b3a1e1108d619b1beab307d3f6c9f5dad4f3ca3f4e252d0e7e3bf48900044df2934aa87df1f699316db5e9598 WHIRLPOOL 4d66c9403b0bf8b4a9b297bd13974f88bcdc3f524bede0e633f7ee17b688bdd60dcc4e8a23fa7a4efd82540fab515df0b40c140edbefd1bb51352edd06b08d2d DIST ntp-4.2.8p4-manpages.tar.bz2 24655 SHA256 fe368d6c30c8c9c3f6e7959b00fc82695e122b29d597090f3725a9a00de92da6 SHA512 80a56b5b736810e4c04e128ce5565fc3834dc0b899b2fdd4173c8dd7f53d353209b648186d0183b9aecd9debec60f2d0b179d229032971876269810bd72096a7 WHIRLPOOL b97331e8e565377bac8fe6cc53cbab0e20a36357f3c142d68505b31104187b117e823ddabbe767e841efbd28b8c0476c460e00cd777619e8f190c7fa2aac0e9e DIST ntp-4.2.8p4.tar.gz 7104852 SHA256 0d6961572548d2c4af96f58f763e22ac620f5afef717384ddc317a0e365cfdb9 SHA512 e5ad7b44921e49b5546aa804dc56c320a3a0beb32b0e6fde40c900bf5e3af40b354a0cecc869b4605b59b5ab58219b9940789b50d747e0f5b50b4e73513d9f23 WHIRLPOOL 0fdbf4fddf726c52a7533aa45e9947f380ff7edb79abc1852355f0fe387472b28318027a738c85fa021e0b24b0e309a0aa03ef420f5873ce9ef5fa0a155eba6b +DIST ntp-4.2.8p5-manpages.tar.bz2 24626 SHA256 a26de4f83a6d8d6e0aa2d20bb6b8c8f7667993652e15d174c1bac91656c4dbec SHA512 5a5a51afca6fd91240c5fe8cbfa8d29b02e1bc46cb37eaa4032ced3b23caee7f2f80fda9ccdf93454bf33a465face0f3c4afb3c76a33352005f3fdd74de05076 WHIRLPOOL bcdb17da93a2c01c25c2ea36c8144ad1e3373e4d584856a7affea548aa8db048da4f759c00e06a617f083107771cf2b552eba76a806c1bbda1d5251fccc15570 +DIST ntp-4.2.8p5.tar.gz 7138233 SHA256 ca28baf4f6bb6fabdc1b62fd1dcec412be2e621192b40466a469a2496164f696 SHA512 8df3e51027f6bfc5e77b81317b67e75263cb429dc532d21bb5924852f77ea39314a06b94944804991185f93155063cee7c1f28024698ec893c353a4d5561750e WHIRLPOOL bcd60d6ee8b8fd19095fe335cdc05a8d58973ca467c5c603860deaefa43cb25597ded1acf7de57598a2e9a521b7e0fa6d2e544cb1aedd16aad08f44854b9f7fc diff --git a/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch b/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch deleted file mode 100644 index 40625fa18fb32..0000000000000 --- a/net-misc/ntp/files/ntp-4.2.4_p5-adjtimex.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://support.ntp.org/bugs/show_bug.cgi?id=769 -http://bugs.gentoo.org/254030 - ---- ntp/util/tickadj.c -+++ ntp/util/tickadj.c -@@ -21,7 +21,8 @@ - # include - #endif /* HAVE_UNISTD_H */ - --#ifdef HAVE___ADJTIMEX /* Linux */ -+/* proper handling here has been moved to upstream ntp bugzilla */ -+#ifdef linux - - #include - struct timex txc; -@@ -91,7 +92,7 @@ - } - - if (!errflg) { -- if (__adjtimex(&txc) < 0) -+ if (adjtimex(&txc) < 0) - perror("adjtimex"); - else if (!quiet) - printf("tick = %ld\ntick_adj = %d\n", -@@ -146,7 +147,7 @@ - #endif - } - -- if (__adjtimex(&txc) < 0) -+ if (adjtimex(&txc) < 0) - { - perror("adjtimex"); - } diff --git a/net-misc/ntp/files/ntp-4.2.4_p7-nano.patch b/net-misc/ntp/files/ntp-4.2.4_p7-nano.patch deleted file mode 100644 index b31ea0adcb931..0000000000000 --- a/net-misc/ntp/files/ntp-4.2.4_p7-nano.patch +++ /dev/null @@ -1,20 +0,0 @@ -http://bugs.gentoo.org/270483 - -ripped from fedora - ---- ntp-4.2.4p7/include/ntp_syscall.h -+++ ntp-4.2.4p7/include/ntp_syscall.h -@@ -14,5 +14,13 @@ - # include - #endif - -+#if defined(ADJ_NANO) && !defined(MOD_NANO) -+#define MOD_NANO ADJ_NANO -+#endif -+ -+#if defined(ADJ_TAI) && !defined(MOD_TAI) -+#define MOD_TAI ADJ_TAI -+#endif -+ - #ifndef NTP_SYSCALLS_LIBC - #ifdef NTP_SYSCALLS_STD diff --git a/net-misc/ntp/files/ntp-4.2.8-ntp-keygen-no-openssl.patch b/net-misc/ntp/files/ntp-4.2.8-ntp-keygen-no-openssl.patch deleted file mode 100644 index bfed86c3cb4d1..0000000000000 --- a/net-misc/ntp/files/ntp-4.2.8-ntp-keygen-no-openssl.patch +++ /dev/null @@ -1,164 +0,0 @@ -Fix ntp-keygen build without OpenSSL - -Upstream commit: -http://bk1.ntp.org/ntp-stable/?PAGE=patch&REV=5497b345z5MNTuNvJWuqPSje25NQTg -Gentoo bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=533238 - -Signed-off-by: Markos Chandras -Index: ntp-4.2.8/Makefile.am -=================================================================== ---- ntp-4.2.8.orig/Makefile.am -+++ ntp-4.2.8/Makefile.am -@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/lib - - NULL = - -+# moved sntp first to get libtool and libevent built. -+ - SUBDIRS = \ -+ sntp \ - scripts \ - include \ - libntp \ -@@ -17,7 +20,6 @@ SUBDIRS = \ - clockstuff \ - kernel \ - util \ -- sntp \ - tests \ - $(NULL) - -@@ -64,7 +66,6 @@ BUILT_SOURCES = \ - .gcc-warning \ - libtool \ - html/.datecheck \ -- sntp/built-sources-only \ - $(srcdir)/COPYRIGHT \ - $(srcdir)/.checkChangeLog \ - $(NULL) -Index: ntp-4.2.8/configure.ac -=================================================================== ---- ntp-4.2.8.orig/configure.ac -+++ ntp-4.2.8/configure.ac -@@ -102,7 +102,7 @@ esac - enable_nls=no - LIBOPTS_CHECK_NOBUILD([sntp/libopts]) - --NTP_ENABLE_LOCAL_LIBEVENT -+NTP_LIBEVENT_CHECK_NOBUILD([2], [sntp/libevent]) - - NTP_LIBNTP - -@@ -771,6 +771,10 @@ esac - - #### - -+AC_CHECK_FUNCS([arc4random_buf]) -+ -+#### -+ - saved_LIBS="$LIBS" - LIBS="$LIBS $LDADD_LIBNTP" - AC_CHECK_FUNCS([daemon]) -Index: ntp-4.2.8/libntp/ntp_crypto_rnd.c -=================================================================== ---- ntp-4.2.8.orig/libntp/ntp_crypto_rnd.c -+++ ntp-4.2.8/libntp/ntp_crypto_rnd.c -@@ -24,6 +24,21 @@ - int crypto_rand_init = 0; - #endif - -+#ifndef HAVE_ARC4RANDOM_BUF -+static void -+arc4random_buf(void *buf, size_t nbytes); -+ -+void -+evutil_secure_rng_get_bytes(void *buf, size_t nbytes); -+ -+static void -+arc4random_buf(void *buf, size_t nbytes) -+{ -+ evutil_secure_rng_get_bytes(buf, nbytes); -+ return; -+} -+#endif -+ - /* - * As of late 2014, here's how we plan to provide cryptographic-quality - * random numbers: -Index: ntp-4.2.8/sntp/configure.ac -=================================================================== ---- ntp-4.2.8.orig/sntp/configure.ac -+++ ntp-4.2.8/sntp/configure.ac -@@ -97,11 +97,14 @@ esac - enable_nls=no - LIBOPTS_CHECK - --AM_COND_IF( -- [BUILD_SNTP], -- [NTP_LIBEVENT_CHECK], -- [NTP_LIBEVENT_CHECK_NOBUILD] --) -+# From when we only used libevent for sntp: -+#AM_COND_IF( -+# [BUILD_SNTP], -+# [NTP_LIBEVENT_CHECK], -+# [NTP_LIBEVENT_CHECK_NOBUILD] -+#) -+ -+NTP_LIBEVENT_CHECK([2]) - - # Checks for libraries. - -Index: ntp-4.2.8/sntp/m4/ntp_libevent.m4 -=================================================================== ---- ntp-4.2.8.orig/sntp/m4/ntp_libevent.m4 -+++ ntp-4.2.8/sntp/m4/ntp_libevent.m4 -@@ -1,4 +1,25 @@ --dnl NTP_ENABLE_LOCAL_LIBEVENT -*- Autoconf -*- -+# SYNOPSIS -*- Autoconf -*- -+# -+# NTP_ENABLE_LOCAL_LIBEVENT -+# NTP_LIBEVENT_CHECK([MINVERSION [, DIR]]) -+# NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]]) -+# -+# DESCRIPTION -+# -+# AUTHOR -+# -+# Harlan Stenn -+# -+# LICENSE -+# -+# This file is Copyright (c) 2014 Network Time Foundation -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice, -+# author attribution and this notice are preserved. This file is offered -+# as-is, without any warranty. -+ -+dnl NTP_ENABLE_LOCAL_LIBEVENT - dnl - dnl Provide only the --enable-local-libevent command-line option. - dnl -@@ -29,7 +50,7 @@ dnl If NOBUILD is provided as the 3rd ar - dnl but DO NOT invoke DIR/configure if we are going to use our bundled - dnl version. This may be the case for nested packages. - dnl --dnl provide --enable-local-libevent . -+dnl provides --enable-local-libevent . - dnl - dnl Examples: - dnl -Index: ntp-4.2.8/util/Makefile.am -=================================================================== ---- ntp-4.2.8.orig/util/Makefile.am -+++ ntp-4.2.8/util/Makefile.am -@@ -19,6 +19,7 @@ AM_LDFLAGS = $(LDFLAGS_NTP) - LDADD= ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS) - tg2_LDADD= ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) - ntp_keygen_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a -+ntp_keygen_LDADD += $(LDADD_LIBEVENT) - ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LDADD_NTP) $(LIBM) - ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h - diff --git a/net-misc/ntp/files/ntpd.rc b/net-misc/ntp/files/ntpd.rc deleted file mode 100644 index b1f5de6ab5d3e..0000000000000 --- a/net-misc/ntp/files/ntpd.rc +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - use net dns logger - after ntp-client -} - -checkconfig() { - if [ ! -f /etc/ntp.conf ] ; then - eerror "Please create /etc/ntp.conf" - eerror "Sample conf: /usr/share/ntp/ntp.conf" - return 1 - fi - return 0 -} - -start() { - checkconfig || return $? - - ebegin "Starting ntpd" - start-stop-daemon --start --exec /usr/sbin/ntpd \ - --pidfile /var/run/ntpd.pid \ - -- -p /var/run/ntpd.pid ${NTPD_OPTS} - eend $? "Failed to start ntpd" -} - -stop() { - ebegin "Stopping ntpd" - start-stop-daemon --stop \ - --pidfile /var/run/ntpd.pid \ - --exec /usr/sbin/ntpd - eend $? "Failed to stop ntpd" -} diff --git a/net-misc/ntp/files/ntpd.service-r1 b/net-misc/ntp/files/ntpd.service-r1 deleted file mode 100644 index 0b6109037c429..0000000000000 --- a/net-misc/ntp/files/ntpd.service-r1 +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Network Time Service -After=ntpdate.service sntp.service - -[Service] -ExecStart=/usr/sbin/ntpd -g -n -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/ntp/files/ntpdate.service b/net-misc/ntp/files/ntpdate.service deleted file mode 100644 index a6c75c9c14c0f..0000000000000 --- a/net-misc/ntp/files/ntpdate.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Set time via NTP using ntpdate -After=network-online.target nss-lookup.target -Before=time-sync.target -Wants=time-sync.target - -[Service] -Type=oneshot -ExecStart=/usr/sbin/ntpdate -b -u $SERVER -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/ntp/files/sntp.service-r1 b/net-misc/ntp/files/sntp.service-r1 deleted file mode 100644 index 2686951f641d1..0000000000000 --- a/net-misc/ntp/files/sntp.service-r1 +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Set time via SNTP -After=network.target NetworkManager-wait-online.service nss-lookup.target -Before=time-sync.target -Wants=time-sync.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/sntp -s $SERVER -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild deleted file mode 100644 index 3aac893a98db7..0000000000000 --- a/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils toolchain-funcs flag-o-matic user systemd - -MY_P=${P/_p/p} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -LICENSE="HPND BSD ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf" - -DEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - kernel_linux? ( caps? ( sys-libs/libcap ) ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - !openntpd? ( !net-misc/openntpd ) - snmp? ( net-analyzer/net-snmp ) - ssl? ( dev-libs/openssl ) - parse-clocks? ( net-misc/pps-tools )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax )" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030 - epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 - append-cppflags -D_GNU_SOURCE #264109 -} - -src_configure() { - # avoid libmd5/libelf - export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no - export ac_cv_lib_elf_nlist=no - # blah, no real configure options #176333 - export ac_cv_header_dns_sd_h=$(usex zeroconf) - export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} - econf \ - --with-lineeditlibs=readline,edit,editline \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_enable samba ntp-signd) \ - $(use_with snmp ntpsnmpd) \ - $(use_with ssl crypto) -} - -src_install() { - default - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" - - dodoc INSTALL WHERE-TO-START - doman "${WORKDIR}"/man/*.[58] - dohtml -r html/* - - insinto /usr/share/ntp - doins "${FILESDIR}"/ntp.conf - cp -r scripts/* "${ED}"/usr/share/ntp/ || die - use prefix || fperms -R go-w /usr/share/ntp - find "${ED}"/usr/share/ntp \ - '(' \ - -name '*.in' -o \ - -name 'Makefile*' -o \ - -name support \ - ')' \ - -exec rm -r {} \; - - insinto /etc - doins "${FILESDIR}"/ntp.conf - newinitd "${FILESDIR}"/ntpd.rc ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - newinitd "${FILESDIR}"/sntp.rc sntp - newconfd "${FILESDIR}"/sntp.confd sntp - if ! use caps ; then - sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die - fi - sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - - keepdir /var/lib/ntp - use prefix || fowners ntp:ntp /var/lib/ntp - - if use openntpd ; then - cd "${ED}" - rm usr/sbin/ntpd || die - rm -r var/lib - rm etc/{conf,init}.d/ntpd - rm usr/share/man/*/ntpd.8 || die - else - systemd_newunit "${FILESDIR}"/ntpd.service-r1 ntpd.service - use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service - systemd_enable_ntpunit 60-ntpd ntpd.service - fi - - systemd_dounit "${FILESDIR}"/ntpdate.service - systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf - systemd_newunit "${FILESDIR}"/sntp.service-r1 sntp.service - systemd_install_serviced "${FILESDIR}"/sntp.service.conf -} - -pkg_postinst() { - ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/" - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - elog "The way ntp sets and maintains your system time has changed." - elog "Now you can use /etc/init.d/ntp-client to set your time at" - elog "boot while you can use /etc/init.d/ntpd to maintain your time" - elog "while your machine runs" - if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then - echo - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "https://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.6_p5-r11.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r11.ebuild deleted file mode 100644 index ac0362bc21b71..0000000000000 --- a/net-misc/ntp/ntp-4.2.6_p5-r11.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils toolchain-funcs flag-o-matic user systemd - -MY_P=${P/_p/p} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -LICENSE="HPND BSD ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf" - -DEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - kernel_linux? ( caps? ( sys-libs/libcap ) ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - !openntpd? ( !net-misc/openntpd ) - snmp? ( net-analyzer/net-snmp ) - ssl? ( dev-libs/openssl ) - parse-clocks? ( net-misc/pps-tools )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax )" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030 - epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 - append-cppflags -D_GNU_SOURCE #264109 -} - -src_configure() { - # avoid libmd5/libelf - export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no - export ac_cv_lib_elf_nlist=no - # blah, no real configure options #176333 - export ac_cv_header_dns_sd_h=$(usex zeroconf) - export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} - econf \ - --with-lineeditlibs=readline,edit,editline \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_enable samba ntp-signd) \ - $(use_with snmp ntpsnmpd) \ - $(use_with ssl crypto) -} - -src_install() { - default - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" - - dodoc INSTALL WHERE-TO-START - doman "${WORKDIR}"/man/*.[58] - dohtml -r html/* - - insinto /usr/share/ntp - doins "${FILESDIR}"/ntp.conf - cp -r scripts/* "${ED}"/usr/share/ntp/ || die - use prefix || fperms -R go-w /usr/share/ntp - find "${ED}"/usr/share/ntp \ - '(' \ - -name '*.in' -o \ - -name 'Makefile*' -o \ - -name support \ - ')' \ - -exec rm -r {} \; - - insinto /etc - doins "${FILESDIR}"/ntp.conf - newinitd "${FILESDIR}"/ntpd.rc ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - newinitd "${FILESDIR}"/sntp.rc sntp - newconfd "${FILESDIR}"/sntp.confd sntp - if ! use caps ; then - sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die - fi - sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - - keepdir /var/lib/ntp - use prefix || fowners ntp:ntp /var/lib/ntp - - if use openntpd ; then - cd "${ED}" - rm usr/sbin/ntpd || die - rm -r var/lib - rm etc/{conf,init}.d/ntpd - rm usr/share/man/*/ntpd.8 || die - else - systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service - use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service - systemd_enable_ntpunit 60-ntpd ntpd.service - fi - - systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service - systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf - systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service - systemd_install_serviced "${FILESDIR}"/sntp.service.conf -} - -pkg_postinst() { - ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/" - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - elog "The way ntp sets and maintains your system time has changed." - elog "Now you can use /etc/init.d/ntp-client to set your time at" - elog "boot while you can use /etc/init.d/ntpd to maintain your time" - elog "while your machine runs" - if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then - echo - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "https://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.8-r1.ebuild b/net-misc/ntp/ntp-4.2.8-r1.ebuild deleted file mode 100644 index d437ee57d4139..0000000000000 --- a/net-misc/ntp/ntp-4.2.8-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit autotools eutils toolchain-funcs flag-o-matic user systemd - -MY_P=${P/_p/p} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -LICENSE="HPND BSD ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf" - -CDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - >=dev-libs/libevent-2.0.9 - kernel_linux? ( caps? ( sys-libs/libcap ) ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - !openntpd? ( !net-misc/openntpd ) - snmp? ( net-analyzer/net-snmp ) - ssl? ( dev-libs/openssl ) - parse-clocks? ( net-misc/pps-tools )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax )" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 - epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238 - append-cppflags -D_GNU_SOURCE #264109 - eautoreconf -} - -src_configure() { - # avoid libmd5/libelf - export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no - export ac_cv_lib_elf_nlist=no - # blah, no real configure options #176333 - export ac_cv_header_dns_sd_h=$(usex zeroconf) - export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} - econf \ - --with-lineeditlibs=readline,edit,editline \ - --with-yielding-select \ - --disable-local-libevent \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_enable samba ntp-signd) \ - $(use_with snmp ntpsnmpd) \ - $(use_with ssl crypto) -} - -src_install() { - default - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" - - dodoc INSTALL WHERE-TO-START - doman "${WORKDIR}"/man/*.[58] - dohtml -r html/* - - insinto /etc - doins "${FILESDIR}"/ntp.conf - newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - newinitd "${FILESDIR}"/sntp.rc sntp - newconfd "${FILESDIR}"/sntp.confd sntp - if ! use caps ; then - sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die - fi - sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - - keepdir /var/lib/ntp - use prefix || fowners ntp:ntp /var/lib/ntp - - if use openntpd ; then - cd "${ED}" - rm usr/sbin/ntpd || die - rm -r var/lib - rm etc/{conf,init}.d/ntpd - rm usr/share/man/*/ntpd.8 || die - else - systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service - use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service - systemd_enable_ntpunit 60-ntpd ntpd.service - fi - - systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service - systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf - systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service - systemd_install_serviced "${FILESDIR}"/sntp.service.conf -} - -pkg_postinst() { - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - elog "The way ntp sets and maintains your system time has changed." - elog "Now you can use /etc/init.d/ntp-client to set your time at" - elog "boot while you can use /etc/init.d/ntpd to maintain your time" - elog "while your machine runs" - if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then - echo - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "https://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.8-r2.ebuild b/net-misc/ntp/ntp-4.2.8-r2.ebuild deleted file mode 100644 index 6f178556843ce..0000000000000 --- a/net-misc/ntp/ntp-4.2.8-r2.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit autotools eutils toolchain-funcs flag-o-matic user systemd - -MY_P=${P/_p/p} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -LICENSE="HPND BSD ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl +threads vim-syntax zeroconf" - -CDEPEND=">=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - >=dev-libs/libevent-2.0.9[threads?] - kernel_linux? ( caps? ( sys-libs/libcap ) ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - !openntpd? ( !net-misc/openntpd ) - snmp? ( net-analyzer/net-snmp ) - ssl? ( dev-libs/openssl ) - parse-clocks? ( net-misc/pps-tools )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax )" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 - epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238 - append-cppflags -D_GNU_SOURCE #264109 - # Make sure every build uses the same install layout. #539092 - find sntp/loc/ -type f '!' -name legacy -delete || die - # Disable pointless checks. - touch .checkChangeLog .gcc-warning FRC.html html/.datecheck - eautoreconf - - # The autoreconf call above recursively ran in all subdirs, and then - # ran in the top level. But the libtool call there updated files in - # the subdir which broke timestamps causing autotools to re-run. #538270 - find -type f -exec touch -r . {} + -} - -src_configure() { - # avoid libmd5/libelf - export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no - export ac_cv_lib_elf_nlist=no - # blah, no real configure options #176333 - export ac_cv_header_dns_sd_h=$(usex zeroconf) - export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} - econf \ - --with-lineeditlibs=readline,edit,editline \ - --with-yielding-select \ - --disable-local-libevent \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_enable samba ntp-signd) \ - $(use_with snmp ntpsnmpd) \ - $(use_with ssl crypto) \ - $(use_enable threads thread-support) -} - -src_install() { - default - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" - - dodoc INSTALL WHERE-TO-START - doman "${WORKDIR}"/man/*.[58] - - insinto /etc - doins "${FILESDIR}"/ntp.conf - newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - newinitd "${FILESDIR}"/sntp.rc sntp - newconfd "${FILESDIR}"/sntp.confd sntp - if ! use caps ; then - sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die - fi - sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - - keepdir /var/lib/ntp - use prefix || fowners ntp:ntp /var/lib/ntp - - if use openntpd ; then - cd "${ED}" - rm usr/sbin/ntpd || die - rm -r var/lib - rm etc/{conf,init}.d/ntpd - rm usr/share/man/*/ntpd.8 || die - else - systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service - use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service - systemd_enable_ntpunit 60-ntpd ntpd.service - fi - - systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service - systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf - systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service - systemd_install_serviced "${FILESDIR}"/sntp.service.conf -} - -pkg_postinst() { - ewarn "Review /etc/ntp.conf to setup server info." - ewarn "Review /etc/conf.d/ntpd to setup init.d info." - echo - elog "The way ntp sets and maintains your system time has changed." - elog "Now you can use /etc/init.d/ntp-client to set your time at" - elog "boot while you can use /etc/init.d/ntpd to maintain your time" - elog "while your machine runs" - if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then - echo - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "https://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.8-r3.ebuild b/net-misc/ntp/ntp-4.2.8-r3.ebuild deleted file mode 100644 index 247172b09f104..0000000000000 --- a/net-misc/ntp/ntp-4.2.8-r3.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit autotools eutils toolchain-funcs flag-o-matic user systemd - -MY_P=${P/_p/p} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -LICENSE="HPND BSD ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" - -CDEPEND="readline? ( >=sys-libs/readline-4.1 ) - >=dev-libs/libevent-2.0.9[threads?] - kernel_linux? ( caps? ( sys-libs/libcap ) ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - !openntpd? ( !net-misc/openntpd ) - snmp? ( net-analyzer/net-snmp ) - ssl? ( dev-libs/openssl ) - parse-clocks? ( net-misc/pps-tools )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax )" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 - epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238 - append-cppflags -D_GNU_SOURCE #264109 - # Make sure every build uses the same install layout. #539092 - find sntp/loc/ -type f '!' -name legacy -delete || die - # Disable pointless checks. - touch .checkChangeLog .gcc-warning FRC.html html/.datecheck - eautoreconf - - # The autoreconf call above recursively ran in all subdirs, and then - # ran in the top level. But the libtool call there updated files in - # the subdir which broke timestamps causing autotools to re-run. #538270 - find -type f -exec touch -r . {} + - - # We want to force a rebuild of this source file though as the shipped one - # is broken. #545546 - rm libparse/info_trimble.c || die -} - -src_configure() { - # avoid libmd5/libelf - export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no - export ac_cv_lib_elf_nlist=no - # blah, no real configure options #176333 - export ac_cv_header_dns_sd_h=$(usex zeroconf) - export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} - econf \ - --with-lineeditlibs=readline,edit,editline \ - --with-yielding-select \ - --disable-local-libevent \ - --docdir='$(datarootdir)'/doc/${PF} \ - --htmldir='$(docdir)/html' \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_with readline lineeditlibs readline) \ - $(use_enable samba ntp-signd) \ - $(use_with snmp ntpsnmpd) \ - $(use_with ssl crypto) \ - $(use_enable threads thread-support) -} - -src_install() { - default - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" - - dodoc INSTALL WHERE-TO-START - doman "${WORKDIR}"/man/*.[58] - - insinto /etc - doins "${FILESDIR}"/ntp.conf - newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - newinitd "${FILESDIR}"/sntp.rc sntp - newconfd "${FILESDIR}"/sntp.confd sntp - if ! use caps ; then - sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die - fi - sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - - keepdir /var/lib/ntp - use prefix || fowners ntp:ntp /var/lib/ntp - - if use openntpd ; then - cd "${ED}" - rm usr/sbin/ntpd || die - rm -r var/lib - rm etc/{conf,init}.d/ntpd - rm usr/share/man/*/ntpd.8 || die - else - systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service - use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service - systemd_enable_ntpunit 60-ntpd ntpd.service - fi - - systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service - systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf - systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service - systemd_install_serviced "${FILESDIR}"/sntp.service.conf -} - -pkg_postinst() { - if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "https://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.8_p2.ebuild b/net-misc/ntp/ntp-4.2.8_p2.ebuild deleted file mode 100644 index a9b6a9f616567..0000000000000 --- a/net-misc/ntp/ntp-4.2.8_p2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit autotools eutils toolchain-funcs flag-o-matic user systemd - -MY_P=${P/_p/p} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" - -LICENSE="HPND BSD ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" - -CDEPEND="readline? ( >=sys-libs/readline-4.1 ) - >=dev-libs/libevent-2.0.9[threads?] - kernel_linux? ( caps? ( sys-libs/libcap ) ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - !openntpd? ( !net-misc/openntpd ) - snmp? ( net-analyzer/net-snmp ) - ssl? ( dev-libs/openssl ) - parse-clocks? ( net-misc/pps-tools )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax )" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 - append-cppflags -D_GNU_SOURCE #264109 - # Make sure every build uses the same install layout. #539092 - find sntp/loc/ -type f '!' -name legacy -delete || die - # Disable pointless checks. - touch .checkChangeLog .gcc-warning FRC.html html/.datecheck -} - -src_configure() { - # avoid libmd5/libelf - export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no - export ac_cv_lib_elf_nlist=no - # blah, no real configure options #176333 - export ac_cv_header_dns_sd_h=$(usex zeroconf) - export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} - # Increase the default memlimit from 32MiB to 128MiB. #533232 - econf \ - --with-lineeditlibs=readline,edit,editline \ - --with-yielding-select \ - --disable-local-libevent \ - --docdir='$(datarootdir)'/doc/${PF} \ - --htmldir='$(docdir)/html' \ - --with-memlock=256 \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_with readline lineeditlibs readline) \ - $(use_enable samba ntp-signd) \ - $(use_with snmp ntpsnmpd) \ - $(use_with ssl crypto) \ - $(use_enable threads thread-support) -} - -src_install() { - default - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" - - dodoc INSTALL WHERE-TO-START - doman "${WORKDIR}"/man/*.[58] - - insinto /etc - doins "${FILESDIR}"/ntp.conf - use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726 - newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - newinitd "${FILESDIR}"/sntp.rc sntp - newconfd "${FILESDIR}"/sntp.confd sntp - if ! use caps ; then - sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die - fi - sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - - keepdir /var/lib/ntp - use prefix || fowners ntp:ntp /var/lib/ntp - - if use openntpd ; then - cd "${ED}" - rm usr/sbin/ntpd || die - rm -r var/lib - rm etc/{conf,init}.d/ntpd - rm usr/share/man/*/ntpd.8 || die - else - systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service - use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service - systemd_enable_ntpunit 60-ntpd ntpd.service - fi - - systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service - systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf - systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service - systemd_install_serviced "${FILESDIR}"/sntp.service.conf -} - -pkg_postinst() { - if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "https://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/ntp/ntp-4.2.8_p4.ebuild b/net-misc/ntp/ntp-4.2.8_p5.ebuild similarity index 91% rename from net-misc/ntp/ntp-4.2.8_p4.ebuild rename to net-misc/ntp/ntp-4.2.8_p5.ebuild index 4bfcda085fa79..b118a32a18b3f 100644 --- a/net-misc/ntp/ntp-4.2.8_p4.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p5.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -inherit autotools eutils toolchain-funcs flag-o-matic user systemd +inherit eutils toolchain-funcs flag-o-matic user systemd MY_P=${P/_p/p} DESCRIPTION="Network Time Protocol suite/programs" HOMEPAGE="http://www.ntp.org/" SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-manpages.tar.bz2" + https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.bz2" LICENSE="HPND BSD ISC" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" +IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9[threads?] @@ -23,7 +23,10 @@ CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) parse-clocks? ( net-misc/pps-tools )" DEPEND="${CDEPEND} virtual/pkgconfig" diff --git a/profiles/package.mask b/profiles/package.mask index 55770e6989bbc..e2aea9685fe5e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -45,11 +45,6 @@ # Gentoo. (Bug 548974) Use Apache Module mod_authn_dbd instead. www-apache/mod_auth_pgsql -# Lars Wendler (11 Jan 2016) -# Masked until reavertm added all missing pieces (lua, gles) -# to the ebuild. -=dev-games/openscenegraph-3.4.0 - # Andreas K. Hüttel (9 Jan 2016) # Errorneously added. Is already in perl-core. Please uninstall. dev-perl/ExtUtils-Constant diff --git a/sci-mathematics/fann/fann-9999.ebuild b/sci-mathematics/fann/fann-9999.ebuild new file mode 100644 index 0000000000000..d2ed135fc2994 --- /dev/null +++ b/sci-mathematics/fann/fann-9999.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils git-2 + +DESCRIPTION="Fast Artificial Neural Network Library" +HOMEPAGE="http://leenissen.dk/fann/" +EGIT_REPO_URI="git://github.com/libfann/fann.git" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="examples" + +src_test() { + cd examples || die 'fails to enter examples directory' + LD_LIBRARY_PATH="${BUILD_DIR}/src" GCC="$(tc-getCC) ${CFLAGS} -I../src/include -L${BUILD_DIR}/src" emake -e runtest + emake clean +} + +src_install() { + cmake-utils_src_install + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples + fi +} diff --git a/sys-apps/fakechroot/fakechroot-2.17.2.ebuild b/sys-apps/fakechroot/fakechroot-2.17.2.ebuild index 0aeedf8a5c7e0..7bb8628e91834 100644 --- a/sys-apps/fakechroot/fakechroot-2.17.2.ebuild +++ b/sys-apps/fakechroot/fakechroot-2.17.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="" RESTRICT="test" diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index f5bbe28d32c43..a3ae71563cde4 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -2,5 +2,5 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1 -DIST opera-stable_33.0.1990.115_amd64.deb 43816244 SHA256 c7f8046ce1498fe87270b1d59e67c300515d4784c771308b52a722794dc81522 SHA512 b881c0a3603ef2ce394b23cf60962f7f40536669a86b0be96d68303a1b7033f39fdd748f073c5d437d863adf0d021449471259fd8e80f0548475afdf0ad4a0ae WHIRLPOOL 63144e2cdacde36aead7ad10da3e3a837a2278dc41862bdbc22e8e44de997e8fd9904064256549a4611b893d87e1b5b4813f25564acd6022099cd3ec9db7f443 DIST opera-stable_34.0.2036.25_amd64.deb 44697198 SHA256 ae4933f0df63b920f79ce6063b48ebcd7f3cf2bcdbde13dc410c4fe24bcf1447 SHA512 26a7496c6eb008f22535da6285c6ed86c2f8da1a65148804c9b5deb6acfe63ceb1aa90d952ac4e2cb302ff7f8b3da3a5903572ae9a004ab4cf328ed4fcb8a690 WHIRLPOOL f2a53c69628b736d3a7cfd6c51c1031e2b00e3635c3917e4410dea6ecfd87661123c216aeaaab527ca65b15440e30c042864c0be200e821eea2c9a6e59104cfb +DIST opera-stable_34.0.2036.47_amd64.deb 44631166 SHA256 26a2aca99b2c719a3e031f112aaa1c29ebd694ac6870b50fc33e84ca7987a5be SHA512 89b663a26416b01b35af91f8f3b9a50ffcabb715e6c5c4934d59a78a0598a9489948771a3f72cc12ec4c30ba85c7348e5807120013f235f114f0b53a844157ce WHIRLPOOL 2718d38d47a8b0f4a8ea2100dac4ca6560a831a287fd5e5086f9588a0b52c51446f969d1636ce3b390ed1e5f807f79d85bfff5df6a8e31c441b443f32c110473 diff --git a/www-client/opera/opera-33.0.1990.115.ebuild b/www-client/opera/opera-34.0.2036.47.ebuild similarity index 100% rename from www-client/opera/opera-33.0.1990.115.ebuild rename to www-client/opera/opera-34.0.2036.47.ebuild diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-361.16.ebuild index 055c12e638c2c..b5a38b03ed9a7 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.16.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.16.ebuild @@ -81,11 +81,11 @@ pkg_pretend() { die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" fi - if use kernel_linux && kernel_is ge 4 4; then + if use kernel_linux && kernel_is ge 4 5; then ewarn "Gentoo supports kernels which are supported by NVIDIA" ewarn "which are limited to the following kernels:" - ewarn "