diff options
| -rw-r--r-- | app-portage/gpyutils/files/implementations.txt | 2 | ||||
| -rw-r--r-- | dev-python/astropy/astropy-1.2.1.ebuild | 4 | ||||
| -rw-r--r-- | eclass/cargo.eclass | 7 | ||||
| -rw-r--r-- | eclass/multilib.eclass | 6 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 2 | ||||
| -rw-r--r-- | kde-frameworks/kdelibs/Manifest | 1 | ||||
| -rw-r--r-- | kde-frameworks/kdelibs/files/kdelibs-4.14.29-sanitize-url.patch | 34 | ||||
| -rw-r--r-- | kde-frameworks/kdelibs/kdelibs-4.14.29-r1.ebuild | 299 | ||||
| -rw-r--r-- | media-gfx/imageworsener/Manifest | 4 | ||||
| -rw-r--r-- | media-gfx/imageworsener/imageworsener-0.9.2.ebuild | 37 | ||||
| -rw-r--r-- | media-gfx/imageworsener/imageworsener-1.0.0.ebuild | 49 | ||||
| -rw-r--r-- | media-gfx/imageworsener/imageworsener-1.2.0.ebuild | 49 | ||||
| -rw-r--r-- | media-gfx/imageworsener/imageworsener-1.3.0.ebuild | 49 | ||||
| -rwxr-xr-x | sys-apps/less/files/lesspipe.sh | 2 |
14 files changed, 14 insertions, 531 deletions
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt index c336a6854140..ead622173966 100644 --- a/app-portage/gpyutils/files/implementations.txt +++ b/app-portage/gpyutils/files/implementations.txt @@ -15,7 +15,7 @@ python3_2 3.2 dead 3.2 python3_3 3.3 dead 3.3 python3_4 current 3.4 python3_5 supported 3.5 -python3_6 experimental 3.6 +python3_6 supported 3.6 pypy1_8 2.7-pypy-1.8 dead p1.8 pypy1_9 2.7-pypy-1.9 dead p1.9 diff --git a/dev-python/astropy/astropy-1.2.1.ebuild b/dev-python/astropy/astropy-1.2.1.ebuild index 9251cc4f2947..2f2c8fcdb9d2 100644 --- a/dev-python/astropy/astropy-1.2.1.ebuild +++ b/dev-python/astropy/astropy-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -39,7 +39,7 @@ DEPEND="${RDEPEND} $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' python2_7) $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7) $(python_gen_cond_dep 'dev-python/wcsaxes[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'sci-libs/scipy[${PYTHON_USEDEP}]'python2_7) + $(python_gen_cond_dep 'sci-libs/scipy[${PYTHON_USEDEP}]' python2_7) ) test? ( dev-libs/libxml2[${PYTHON_USEDEP}] diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index 32d04a2d559b..b08aa9e28aae 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -29,12 +29,13 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo" # @DESCRIPTION: # Generates the URIs to put in SRC_URI to help fetch dependencies. cargo_crate_uris() { - for crate in $*; do + local crate + for crate in "$@"; do local name version url name="${crate%-*}" version="${crate##*-}" url="https://crates.io/api/v1/crates/${name}/${version}/download -> ${crate}.crate" - echo $url + echo "${url}" done } @@ -93,7 +94,7 @@ cargo_src_unpack() { cargo_gen_config() { debug-print-function ${FUNCNAME} "$@" - cat <<- EOF > ${ECARGO_HOME}/config + cat <<- EOF > "${ECARGO_HOME}/config" [source.gentoo] directory = "${ECARGO_VENDOR}" diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 956f3aeed889..350b6f949d12 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -450,6 +450,11 @@ multilib_toolchain_setup() { done export _DEFAULT_ABI_SAVED="true" + # Set CBUILD only if not cross-compiling. + if [[ ${CBUILD} == "${CHOST}" ]]; then + export CBUILD=$(get_abi_CHOST $1) + fi + # Set the CHOST native first so that we pick up the native # toolchain and not a cross-compiler by accident #202811. export CHOST=$(get_abi_CHOST ${DEFAULT_ABI}) @@ -459,7 +464,6 @@ multilib_toolchain_setup() { export FC="$(tc-getFC) $(get_abi_CFLAGS)" export LD="$(tc-getLD) $(get_abi_LDFLAGS)" export CHOST=$(get_abi_CHOST $1) - export CBUILD=$(get_abi_CHOST $1) export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig fi diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index c1349ff277b0..0bf7e7ec1a3e 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1041,7 +1041,7 @@ python_wrapper_setup() { for x in "${nonsupp[@]}"; do cat >"${workdir}"/bin/${x} <<-_EOF_ || die #!/bin/sh - echo "${x} is not supported by ${EPYTHON}" >&2 + echo "${ECLASS}: ${FUNCNAME}: ${x} is not supported by ${EPYTHON} (PYTHON_COMPAT)" >&2 exit 127 _EOF_ chmod +x "${workdir}"/bin/${x} || die diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest index 2f07fadc2c2d..9eb3bb764d43 100644 --- a/kde-frameworks/kdelibs/Manifest +++ b/kde-frameworks/kdelibs/Manifest @@ -1,2 +1 @@ -DIST kdelibs-4.14.29.tar.xz 11643940 SHA256 1b538ddecaf818ae69b3de8ee11324bf92f4da5b3943f728cb0afdcd34037c77 SHA512 caf5f840533bd99c42d74583ef97004500de4d73f14bf442e6b3d83bbf6bb1130e735a8f7a45955d60b318a3587e4e08f168c11e1159c26445875b907f5f0976 WHIRLPOOL 007c8605c22bfa3417c6b3b841cb4c6c7f99484463acb7b954b5eb75615b58515363281d75ebdfb175d90d4830d7fbe3bb7ed786943cb2de66d1519a792a1d11 DIST kdelibs-4.14.32.tar.xz 11640860 SHA256 2133e863b21c197c75bd6a6ac60773422ef026c33acb57b8c7628a09f483bd83 SHA512 06cc64b79758d4dbf676eb6bbf56c1bb2820f3405c61e4d39e4e68a3ecd7db4afcf6fca1fcfe870dba9f8264b56aaee72d0f06da0923d2befd6ea56aa5adba22 WHIRLPOOL 4477c6d60c1df6469e6e1c66d8919c8f6432202b8c864a442226aa220f436971185337cb661b0f8e3e90d3e0dc7bdc0657994198003d6ef5ffb8bc8e604c45b7 diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.29-sanitize-url.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.29-sanitize-url.patch deleted file mode 100644 index d063f8b598d8..000000000000 --- a/kde-frameworks/kdelibs/files/kdelibs-4.14.29-sanitize-url.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 1804c2fde7bf4e432c6cf5bb8cce5701c7010559 -Author: Albert Astals Cid <aacid@kde.org> -Date: Tue Feb 28 19:08:50 2017 +0100 - - Sanitize URLs before passing them to FindProxyForURL - - Remove user/password information - For https: remove path and query - - Backport from kio f9d0cb47cf94e209f6171ac0e8d774e68156a6e4 - -diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp -index a595301307..9ab360a0b5 100644 ---- a/kio/misc/kpac/script.cpp -+++ b/kio/misc/kpac/script.cpp -@@ -754,9 +754,16 @@ namespace KPAC - } - } - -+ KUrl cleanUrl = url; -+ cleanUrl.setUserInfo(QString()); -+ if (cleanUrl.scheme().toLower() == QLatin1String("https")) { -+ cleanUrl.setPath(QString()); -+ cleanUrl.setQuery(QString()); -+ } -+ - QScriptValueList args; -- args << url.url(); -- args << url.host(); -+ args << cleanUrl.url(); -+ args << cleanUrl.host(); - - QScriptValue result = func.call(QScriptValue(), args); - if (result.isError()) { diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.29-r1.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.29-r1.ebuild deleted file mode 100644 index a1228fb327be..000000000000 --- a/kde-frameworks/kdelibs/kdelibs-4.14.29-r1.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CPPUNIT_REQUIRED="optional" -DECLARATIVE_REQUIRED="always" -KDE_HANDBOOK="optional" -OPENGL_REQUIRED="optional" -WEBKIT_REQUIRED="optional" -inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic - -APPS_VERSION="16.12.2" # Don't forget to bump this - -DESCRIPTION="KDE libraries needed by all KDE programs" -[[ ${KDE_BUILD_TYPE} != live ]] && \ -SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz" - -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k -kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell -cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" - -REQUIRED_USE=" - udisks? ( udev ) - upower? ( udev ) -" - -# needs the kate regression testsuite from svn -RESTRICT="test" - -COMMONDEPEND=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libattica-0.4.2 - dev-libs/libdbusmenu-qt[qt4] - dev-libs/libpcre[unicode] - dev-libs/libxml2 - dev-libs/libxslt - media-libs/fontconfig - media-libs/freetype:2 - media-libs/giflib:= - media-libs/libpng:0= - media-libs/phonon[qt4] - sys-libs/zlib - virtual/jpeg:0 - x11-misc/shared-mime-info - acl? ( virtual/acl ) - !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - !kernel_SunOS? ( - || ( - sys-libs/libutempter - >=sys-freebsd/freebsd-lib-9.0 - ) - ) - ) - bzip2? ( app-arch/bzip2 ) - crypt? ( app-crypt/qca:2[qt4] ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper:= ) - kerberos? ( virtual/krb5 ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - policykit? ( sys-auth/polkit-qt[qt4] ) - spell? ( app-text/enchant ) - ssl? ( - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) - ) - udev? ( virtual/udev ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - nls? ( virtual/libintl ) -" -RDEPEND="${COMMONDEPEND} - !dev-qt/qtphonon - >=app-crypt/gnupg-2.0.11 - app-misc/ca-certificates - kde-frameworks/kdelibs-env:4 - sys-apps/dbus[X] - !aqua? ( - udisks? ( sys-fs/udisks:2 ) - x11-apps/iceauth - x11-apps/rgb - x11-misc/xdg-utils - upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) - ) - udev? ( app-misc/media-player-info ) -" -PDEPEND=" - $(add_kdeapps_dep katepart '' 4.14.3) - || ( - $(add_kdeapps_dep kfmclient '' 4.14.3) - x11-misc/xdg-utils - ) - handbook? ( kde-apps/khelpcenter:* ) - policykit? ( || ( - >=sys-auth/polkit-kde-agent-0.99 - kde-plasma/polkit-kde-agent - ) ) -" - -PATCHES=( - "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" - "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" - "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" - "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" - "${FILESDIR}/${PN}-4.4.90-xslt.patch" - "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" - "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.9.3-werror.patch" - "${FILESDIR}/${PN}-4.10.0-udisks.patch" - "${FILESDIR}/${PN}-4.14.20-FindQt4.patch" - "${FILESDIR}/${PN}-4.14.22-webkit.patch" - "${FILESDIR}/${P}-sanitize-url.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ - && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." - fi -} - -src_prepare() { - kde4-base_src_prepare - - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) - sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ - -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." - - if use aqua; then - sed -i -e \ - "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ - cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" - - #if [[ ${CHOST} == *-darwin8 ]]; then - sed -i -e \ - "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ - cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" - #fi - - # solid/solid/backends/iokit doesn't properly link, so disable it. - sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ - || die "disabling solid/solid/backends/iokit failed" - sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ - || die "disabling solid/solid/backends/iokit failed" - - # There's no fdatasync on OSX and the check fails to detect that. - sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ - || die "disabling fdatasync failed" - - # Fix nameser include to nameser8_compat - sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ - || die "fixing nameser include failed" - append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 - - # Try to fix kkeyserver_mac - epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_HSPELL=OFF - -DWITH_ASPELL=OFF - -DKDE_DEFAULT_HOME=.kde4 - -DKAUTH_BACKEND=POLKITQT-1 - -DWITH_Soprano=OFF - -DWITH_SharedDesktopOntologies=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON - -DBUILD_doc=$(usex handbook) - -DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow) - -DHAVE_PPC_ALTIVEC=$(usex altivec) - -DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx) - -DHAVE_X86_SSE=$(usex cpu_flags_x86_sse) - -DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2) - -DWITH_ACL=$(usex acl) - -DWITH_BZip2=$(usex bzip2) - -DWITH_QCA2=$(usex crypt) - -DWITH_FAM=$(usex fam) - -DWITH_Jasper=$(usex jpeg2k) - -DWITH_GSSAPI=$(usex kerberos) - -DWITH_LibLZMA=$(usex lzma) - -DWITH_Libintl=$(usex nls) - -DWITH_OpenEXR=$(usex openexr) - -DWITH_OpenGL=$(usex opengl) - -DWITH_PolkitQt-1=$(usex policykit) - -DWITH_ENCHANT=$(usex spell) - -DWITH_OpenSSL=$(usex ssl) - -DWITH_UDev=$(usex udev) - -DWITH_SOLID_UDISKS2=$(usex udisks) - -DWITH_Avahi=$(usex zeroconf) - -DWITH_KDEWEBKIT=$(usex webkit) - ) - - use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF ) - - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - # use system certificates - rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die - dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* - fi - - if use aqua; then - einfo "fixing ${PN} plugins" - - local _PV=${PV:0:3}.0 - local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script - - install_name_tool -id \ - "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ - "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ - || die "failed fixing libkrossqtsplugin.${_PV}.dylib" - - einfo "fixing ${PN} cmake detection files" - #sed -i -e \ - # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ - echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ - "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ - || die "failed fixing FindXKB.cmake" - fi - - einfo Installing environment file. - # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. - echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" - echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" - doenvd "${T}/77kde" -} - -pkg_postinst() { - fdo-mime_mime_database_update - - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the avahi daemon" - elog "is running." - echo - einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" - einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" - einfo "to include 'mdns', e.g.:" - einfo " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} - -pkg_prerm() { - # Remove ksycoca4 global database - rm -f "${EROOT%/}"/usr/share/kde4/services/ksycoca4 || die -} - -pkg_postrm() { - fdo-mime_mime_database_update - - kde4-base_pkg_postrm -} diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest index e7f977f226be..d0d292c15751 100644 --- a/media-gfx/imageworsener/Manifest +++ b/media-gfx/imageworsener/Manifest @@ -1,5 +1 @@ -DIST imageworsener-1.2.0.tar.gz 635509 SHA256 97fdb1aafac7bc2339b2ce813071f0900de0b093b96ab1a99a43f9647afdfe35 SHA512 0f46bb4823048f96904fbd2387adbc48a95289d28869e5b48cb5bf5279499417f77e41a8f5408ca0c644b33113a1f8b708040b7d782205479c99314fe6352f60 WHIRLPOOL 83bcfb535068357bb154656ee6b65e80e03dadefa555044934228a078304a6e5e0e39db8505c1e88e92698b0170baa81064d8d605c9d811001842a669785a4f1 -DIST imageworsener-1.3.0.tar.gz 660594 SHA256 2d4e40463658a577056ee17f204aac2a626b291f187f5f6e42b0c4140408d125 SHA512 f98141169bc4427e6ce188fcce3fd41dbc8ee68f29801386972f5a92960d8bbc9c4daa8b0c33e26b3e216baedabdb78031f8131a7a375f001184ecdaf2fb17d6 WHIRLPOOL 0bef8c43a6db2b28839873af7f35a0cfe2554d47de40d9385574f38cf85459e22269ff15c78a31730214e92d2786f40ac85ad5057ddbd046075c382e7842a99b DIST imageworsener-1.3.1.tar.gz 661055 SHA256 beb0c988c02b1d461dccdb3d6c4fc229316a692ea38689874013ba349dff66d1 SHA512 a44589e720bc91662e286096f744347e3ec3669c33791f81c3f2aeb9d0514ed909dc73615db1d7631139df72aba9ccfbada61b7dcf82f6ffac622ab64a186b49 WHIRLPOOL a7d995a63f9e637ce4ab5da4967ef8e1b8a9108b4ace256e6ddf2b33c9a5445cd85caf74f83f51635789971676124c5b175c16df2cccf85f93e6544cd59ba096 -DIST imageworsener-src-0.9.2.tar.gz 211670 SHA256 f9fa780841d9019817a9bcdccecf6652b2900c3ae7e96b63a60420cd3ac27248 SHA512 19c961fcb9212ebc9373d076c09b0f1a403cba418d8abb425f438388f3b69f7d7e6e9b044dc544c77bfbde4a0afbbdc11d846a92f95cc237f84db61092585269 WHIRLPOOL e5e616d356f28a99be14bddb5f59a70d6c59533face790248391b9c7acd820401420677841ed13192b43e10595353a41ee500e6dc342abaf0990310d261f43ea -DIST imageworsener-src-1.0.0.tar.gz 609807 SHA256 ccab084b4e3ef4dc2130d34804446e4b7d8eb5e17544122b7e239c60aa45e5cf SHA512 94e01937872bd312d6e0c8c52440099766e3fadd8b8e514fa2915c7f9d08c277c43d1ba51341c4a0df3cd84a73383702bb461ad9d371f1f231ec23d3633da8a6 WHIRLPOOL 518c37c7936fbb0f23d1c304b541758e0a2f88a0de36deeac0fa80d0aff31648c2fb515bd4da5205c2f8a512fb126fb792f6c661fa9ccd6bfe6f46048edf4455 diff --git a/media-gfx/imageworsener/imageworsener-0.9.2.ebuild b/media-gfx/imageworsener/imageworsener-0.9.2.ebuild deleted file mode 100644 index 2d834cc1c56b..000000000000 --- a/media-gfx/imageworsener/imageworsener-0.9.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit toolchain-funcs - -MY_P="${PN}-src-${PV}" -MY_PN="imagew" - -DESCRIPTION="Utility for image scaling and processing" -HOMEPAGE="http://entropymine.com/imageworsener/" -SRC_URI="http://entropymine.com/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="media-libs/libpng:0 - virtual/jpeg" -RDEPEND="${DEPEND}" - -src_compile() { - $(tc-getCC) ${LDFLAGS} ${CFLAGS} "${S}/src/"*.c -lpng -ljpeg -lm -lz -o ${MY_PN} \ - || die "Compile failed." -} - -src_install() { - dobin ${MY_PN} || die "dobin failed." - dodoc readme.txt technical.txt changelog.txt || die -} - -src_test() { - cd "${S}/tests" || die - ./runtest "${S}/${MY_PN}" -} diff --git a/media-gfx/imageworsener/imageworsener-1.0.0.ebuild b/media-gfx/imageworsener/imageworsener-1.0.0.ebuild deleted file mode 100644 index fc78ba821b8e..000000000000 --- a/media-gfx/imageworsener/imageworsener-1.0.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -MY_P=${PN}-src-${PV} -MY_PN=imagew - -DESCRIPTION="Utility for image scaling and processing" -HOMEPAGE="http://entropymine.com/imageworsener/" -SRC_URI="http://entropymine.com/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="jpeg png static-libs test webp zlib" - -DEPEND="png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg:0 ) - webp? ( >=media-libs/libwebp-0.1.3 ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -REQUIRED_USE="test? ( jpeg png webp zlib )" - -src_configure() { - local switch='' - use test && switch=test - - econf \ - $(use_enable static-libs static) \ - $(use_with ${switch} jpeg) \ - $(use_with ${switch} png) \ - $(use_with ${switch} webp) \ - $(use_with ${switch} zlib) -} - -src_install() { - default - dodoc {changelog,readme,technical}.txt - prune_libtool_files -} - -src_test() { - cd "${S}"/tests || die - ./runtest "${S}"/${MY_PN} -} diff --git a/media-gfx/imageworsener/imageworsener-1.2.0.ebuild b/media-gfx/imageworsener/imageworsener-1.2.0.ebuild deleted file mode 100644 index d43f7dc3e654..000000000000 --- a/media-gfx/imageworsener/imageworsener-1.2.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -MY_P=${PN}-src-${PV} -MY_PN=imagew - -DESCRIPTION="Utility for image scaling and processing" -HOMEPAGE="http://entropymine.com/imageworsener/" -SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz" - -LICENSE="MIT-with-advertising" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="jpeg png static-libs test webp zlib" - -DEPEND="png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg:0 ) - webp? ( >=media-libs/libwebp-0.1.3 ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -REQUIRED_USE="test? ( jpeg png webp zlib )" - -src_configure() { - local switch='' - use test && switch=test - - econf \ - $(use_enable static-libs static) \ - $(use_with ${switch} jpeg) \ - $(use_with ${switch} png) \ - $(use_with ${switch} webp) \ - $(use_with ${switch} zlib) -} - -src_install() { - default - dodoc {changelog,readme,technical}.txt - prune_libtool_files -} - -src_test() { - cd "${S}"/tests || die - ./runtest "${S}"/${MY_PN} -} diff --git a/media-gfx/imageworsener/imageworsener-1.3.0.ebuild b/media-gfx/imageworsener/imageworsener-1.3.0.ebuild deleted file mode 100644 index f5cc26a7c641..000000000000 --- a/media-gfx/imageworsener/imageworsener-1.3.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -MY_P=${PN}-src-${PV} -MY_PN=imagew - -DESCRIPTION="Utility for image scaling and processing" -HOMEPAGE="http://entropymine.com/imageworsener/" -SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz" - -LICENSE="MIT-with-advertising" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="jpeg png static-libs test webp zlib" - -DEPEND="png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg:0 ) - webp? ( >=media-libs/libwebp-0.1.3 ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -REQUIRED_USE="test? ( jpeg png webp zlib )" - -src_configure() { - local switch='' - use test && switch=test - - econf \ - $(use_enable static-libs static) \ - $(use_with ${switch} jpeg) \ - $(use_with ${switch} png) \ - $(use_with ${switch} webp) \ - $(use_with ${switch} zlib) -} - -src_install() { - default - dodoc {changelog,readme,technical}.txt - prune_libtool_files -} - -src_test() { - cd "${S}"/tests || die - ./runtest "${S}"/${MY_PN} -} diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh index abd934905ad2..66078850cbda 100755 --- a/sys-apps/less/files/lesspipe.sh +++ b/sys-apps/less/files/lesspipe.sh @@ -164,7 +164,7 @@ lesspipe() { *.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp) identify -verbose -- "$1" || file -L -- "$1" ;; - *.asf|*.avi|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv) + *.asf|*.avi|*.flv|*.mkv|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv) midentify "$1" || file -L -- "$1" ;; *.mp3) mp3info "$1" || id3info "$1" ;; |