diff options
290 files changed, 4141 insertions, 7747 deletions
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest index ee25e7a9842c..371af4cf50b8 100644 --- a/app-admin/sysstat/Manifest +++ b/app-admin/sysstat/Manifest @@ -1,3 +1,5 @@ DIST sysstat-11.0.2.tar.xz 291256 SHA256 acd87fdfbe7c796480f14fc26119d8f785d26827d74a0f5bced6c492a91f1b96 SHA512 4bb5f2ee14346d83c59bd4da36ae8fc6c13197eabb808b1b5db84b593f07d8b366b1f6329abed8d43e2a8497a89de0f89a398b741d4ca23b4a3a95973b5f0f54 WHIRLPOOL 98daee288e22f803f19bbe423eb999f527e8997f2ffd3fe1fe784363260365ee833dd33b755f44d6bfcc685f70b47cb8fd70fdd9a3fa679829c1e608bd65f8e2 DIST sysstat-11.0.8.tar.xz 294828 SHA256 d073b0e95820254a3fbf53ae3fb27db91d5b11778875034cd39c4d56d8e23695 SHA512 bae205b90d3b908de14d568a7872cca1fe0b2a6e423b74d4f837ebd9f9892abc742f8dc746dde559763c982cf0fd73fafc9ad116ea827ff1189c92488fc8696e WHIRLPOOL 375c3e9af3634c151605f89f1debea3148e2d890f9c43cf4dcb834977c093d2622832c0f0773ef05330f6d9dacb3abfd74acc10ae56251b812a7c6c528007232 DIST sysstat-11.2.0.tar.xz 322660 SHA256 9806b9a662568796d3fb93ecd01ecea10d815e668337a646494953bff4bc4155 SHA512 0759d2df158b909a2f2f87cee9966041acb50093dbbd364bff9471b87143b31cd6bd83d085346a5a3e985b7b3cb29bcb1145739ac0b57804afcc5577c8f8c35f WHIRLPOOL 35b34f6f4e77a70a544d636e5dca4642cf1ec76dc16709ed0daab2c1b0741ba7d7e80f3290c47fbc16d25f89217b765c059bdea4677f26aad1406c7e4b6ae000 +DIST sysstat-11.2.1.1.tar.xz 322936 SHA256 19c4d435ffaf3e53ab2f5ca0f63b5c86ebd8f2595e9c34ece30f0966df2d483a SHA512 2c2a26d35ff7cf02332c54780b97de181cdca589da59aa85103619843edeed16c8a2a050585a201687a7d6e928fcb0546a2f2980d8e65203323572aada0ff691 WHIRLPOOL 372d55c332d7446dfc5c475d9ce839db46dab3622cb6131d986366d4da9c2d81eaaa8cabb9704639890866b30b0477e2d3ea4efd7e1602e0522cb4e72b16a14d +DIST sysstat-11.3.1.tar.xz 329704 SHA256 ccb1b7c6569dd5ba17b41b7bcae2551cffe2aa8a8bd5293ac2f2b5c35f8e705d SHA512 5a977ff6048a971b513d0e59c3361bf9754dd3cbcfeacd367df26af075bd3249f32bff28075da4c13c996a6416cd1fe94397786eebedc4ec706454b40bd58afb WHIRLPOOL 44a39a11a33c94ee41ab4dedbef39e89c5c6b8a65392016c3fb79d16630de7fa9d2e87f53b1857d8c318c5e93e83e0db68454d1d73bb893aa506b6fdf8514e37 diff --git a/app-admin/sysstat/sysstat-11.2.1.1.ebuild b/app-admin/sysstat/sysstat-11.2.1.1.ebuild new file mode 100644 index 000000000000..2dc8b9716eb8 --- /dev/null +++ b/app-admin/sysstat/sysstat-11.2.1.1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils flag-o-matic multilib systemd toolchain-funcs + +DESCRIPTION="System performance tools for Linux" +HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/" +SRC_URI="${HOMEPAGE}${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="debug +doc isag nls lm_sensors selinux static" + +CDEPEND=" + isag? ( + dev-lang/tk:0 + dev-vcs/rcs + sci-visualization/gnuplot + ) + nls? ( virtual/libintl ) + lm_sensors? ( sys-apps/lm_sensors ) +" +DEPEND=" + ${CDEPEND} + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${CDEPEND} + selinux? ( sec-policy/selinux-sysstat ) +" + +SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d + +src_prepare() { + if use nls; then + strip-linguas -i nls/ + local lingua pofile + for pofile in nls/*.po; do + lingua=${pofile/nls\/} + lingua=${lingua/.po} + if ! has ${lingua} ${LINGUAS}; then + rm "nls/${lingua}.po" || die + fi + done + fi + epatch \ + "${FILESDIR}"/${PN}-10.0.4-flags.patch \ + "${FILESDIR}"/${PN}-11.0.4-cron.patch +} + +src_configure() { + tc-export AR + use static && append-ldflags -static + + sa_lib_dir=/usr/$(get_libdir)/sa \ + conf_dir=/etc \ + rcdir=${SYSSTAT_FAKE_RC_DIR} \ + econf \ + --enable-copy-only \ + --with-systemdsystemunitdir=$(systemd_get_unitdir) \ + $(use_enable debug debuginfo) \ + $(use_enable doc documentation ) \ + $(use_enable isag install-isag) \ + $(use_enable lm_sensors sensors) \ + $(use_enable nls) \ + --enable-install-cron +} + +src_compile() { + emake LFLAGS="${LDFLAGS}" +} + +src_install() { + keepdir /var/log/sa + + emake \ + CHOWN=true \ + DESTDIR="${D}" \ + DOC_DIR=/usr/share/doc/${PF} \ + MANGRPARG='' \ + install + + dodoc contrib/sargraph/sargraph + + rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die + newinitd "${FILESDIR}"/${PN}.init.d ${PN} + systemd_dounit ${PN}.service + + use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING +} diff --git a/app-admin/sysstat/sysstat-11.3.1.ebuild b/app-admin/sysstat/sysstat-11.3.1.ebuild new file mode 100644 index 000000000000..aba68299f06a --- /dev/null +++ b/app-admin/sysstat/sysstat-11.3.1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils flag-o-matic multilib systemd toolchain-funcs + +DESCRIPTION="System performance tools for Linux" +HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/" +SRC_URI="${HOMEPAGE}${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="debug +doc isag nls lm_sensors selinux static" + +CDEPEND=" + isag? ( + dev-lang/tk:0 + dev-vcs/rcs + sci-visualization/gnuplot + ) + nls? ( virtual/libintl ) + lm_sensors? ( sys-apps/lm_sensors ) +" +DEPEND=" + ${CDEPEND} + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${CDEPEND} + selinux? ( sec-policy/selinux-sysstat ) +" + +SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d + +src_prepare() { + if use nls; then + strip-linguas -i nls/ + local lingua pofile + for pofile in nls/*.po; do + lingua=${pofile/nls\/} + lingua=${lingua/.po} + if ! has ${lingua} ${LINGUAS}; then + rm "nls/${lingua}.po" || die + fi + done + fi + epatch \ + "${FILESDIR}"/${PN}-10.0.4-flags.patch \ + "${FILESDIR}"/${PN}-11.0.4-cron.patch +} + +src_configure() { + tc-export AR + use static && append-ldflags -static + + sa_lib_dir=/usr/$(get_libdir)/sa \ + conf_dir=/etc \ + rcdir=${SYSSTAT_FAKE_RC_DIR} \ + econf \ + --enable-copy-only \ + --with-systemdsystemunitdir=$(systemd_get_unitdir) \ + $(use_enable debug debuginfo) \ + $(use_enable doc documentation ) \ + $(use_enable isag install-isag) \ + $(use_enable lm_sensors sensors) \ + $(use_enable nls) \ + --enable-install-cron +} + +src_compile() { + emake LFLAGS="${LDFLAGS}" +} + +src_install() { + keepdir /var/log/sa + + emake \ + CHOWN=true \ + DESTDIR="${D}" \ + DOC_DIR=/usr/share/doc/${PF} \ + MANGRPARG='' \ + install + + dodoc contrib/sargraph/sargraph + + rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die + newinitd "${FILESDIR}"/${PN}.init.d ${PN} + systemd_dounit ${PN}.service + + use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING +} diff --git a/app-admin/vault/vault-0.4.1.ebuild b/app-admin/vault/vault-0.4.1.ebuild index 7e0d80b73b3e..87e58ca127c6 100644 --- a/app-admin/vault/vault-0.4.1.ebuild +++ b/app-admin/vault/vault-0.4.1.ebuild @@ -17,7 +17,7 @@ IUSE="" RESTRICT="test" -DEPEND="dev-go/go-oauth2:=" +DEPEND="" RDEPEND="" STRIP_MASK="*.a" diff --git a/app-admin/vault/vault-9999.ebuild b/app-admin/vault/vault-9999.ebuild index 531205c6e23a..2ad654b290a0 100644 --- a/app-admin/vault/vault-9999.ebuild +++ b/app-admin/vault/vault-9999.ebuild @@ -20,7 +20,7 @@ IUSE="" RESTRICT="test" -DEPEND="dev-go/go-oauth2:=" +DEPEND="" RDEPEND="" STRIP_MASK="*.a" diff --git a/app-arch/p7zip/p7zip-15.09-r1.ebuild b/app-arch/p7zip/p7zip-15.09-r2.ebuild index 8ca51776b494..8d7950b3694a 100644 --- a/app-arch/p7zip/p7zip-15.09-r1.ebuild +++ b/app-arch/p7zip/p7zip-15.09-r2.ebuild @@ -132,10 +132,10 @@ src_install() { rm GUI/kde4/p7zip_compress.desktop || die insinto /usr/share/kde4/services/ServiceMenus doins GUI/kde4/*.desktop - dodir /usr/local/share/kservices5/ServiceMenus + dodir /usr/share/kservices5/ServiceMenus for item in "${D}"/usr/share/kde4/services/ServiceMenus/*.desktop; do item="$(basename ${item})" - dosym "/usr/share/kde4/services/ServiceMenus/${item}" "/usr/local/share/kservices5/ServiceMenus/${item}" + dosym "/usr/share/kde4/services/ServiceMenus/${item}" "/usr/share/kservices5/ServiceMenus/${item}" done fi fi diff --git a/app-arch/pax/files/pax-3.4-sysmacros.patch b/app-arch/pax/files/pax-3.4-sysmacros.patch new file mode 100644 index 000000000000..3aede97ec06f --- /dev/null +++ b/app-arch/pax/files/pax-3.4-sysmacros.patch @@ -0,0 +1,12 @@ +not all C libs pull in this header via sys/types.h for major()/etc... + +--- a/src/extern.h ++++ b/src/extern.h +@@ -38,6 +38,7 @@ + */ + + #include <sys/cdefs.h> ++#include <sys/sysmacros.h> + + /* + * ar_io.c diff --git a/app-arch/pax/pax-3.4.12.16-r1.ebuild b/app-arch/pax/pax-3.4.12.16-r1.ebuild index 679fdb45f89e..a14e869a02b6 100644 --- a/app-arch/pax/pax-3.4.12.16-r1.ebuild +++ b/app-arch/pax/pax-3.4.12.16-r1.ebuild @@ -12,7 +12,7 @@ RPM_PV=$(get_version_component_range 3) FC_PV=$(get_version_component_range 4) DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool" -HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/bin/pax/" +HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/" SRC_URI="mirror://fedora-dev/releases/${FC_PV}/Everything/source/SRPMS/${MY_P}-${RPM_PV}.fc${FC_PV}.src.rpm" LICENSE="GPL-2" @@ -26,6 +26,7 @@ src_prepare() { rpm_spec_epatch ../${PN}.spec epatch "${FILESDIR}"/pax-3.4-x32.patch epatch "${FILESDIR}"/pax-3.4-fix-fts-includes.patch + epatch "${FILESDIR}"/pax-3.4-sysmacros.patch sed -i configure.in \ -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ -e '/AC_PROG_RANLIB/a AC_PROG_MKDIR_P' \ diff --git a/app-arch/pax/pax-3.4.12.16.ebuild b/app-arch/pax/pax-3.4.12.16.ebuild index 2b53d8116ce1..8d485e6dc3e7 100644 --- a/app-arch/pax/pax-3.4.12.16.ebuild +++ b/app-arch/pax/pax-3.4.12.16.ebuild @@ -12,7 +12,7 @@ RPM_PV=$(get_version_component_range 3) FC_PV=$(get_version_component_range 4) DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool" -HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/bin/pax/" +HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/" SRC_URI="mirror://fedora-dev/releases/${FC_PV}/Everything/source/SRPMS/${MY_P}-${RPM_PV}.fc${FC_PV}.src.rpm" LICENSE="GPL-2" @@ -25,6 +25,7 @@ S=${WORKDIR}/${MY_P} src_prepare() { rpm_spec_epatch ../${PN}.spec epatch "${FILESDIR}"/pax-3.4-x32.patch + epatch "${FILESDIR}"/pax-3.4-sysmacros.patch sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die eautoreconf } diff --git a/app-backup/attic/attic-0.16.ebuild b/app-backup/attic/attic-0.16.ebuild index b3249988f1c9..909ac1f3cd79 100644 --- a/app-backup/attic/attic-0.16.ebuild +++ b/app-backup/attic/attic-0.16.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$ @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Attic is a deduplicating backup program written in Python." @@ -29,5 +29,7 @@ RDEPEND=" libressl? ( dev-libs/libressl ) dev-python/llfuse[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] ${RDEPEND}" diff --git a/app-backup/attic/attic-9999.ebuild b/app-backup/attic/attic-9999.ebuild index b3249988f1c9..909ac1f3cd79 100644 --- a/app-backup/attic/attic-9999.ebuild +++ b/app-backup/attic/attic-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$ @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Attic is a deduplicating backup program written in Python." @@ -29,5 +29,7 @@ RDEPEND=" libressl? ( dev-libs/libressl ) dev-python/llfuse[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] ${RDEPEND}" diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest index 3a0cd29d3ed0..3bac6da34842 100644 --- a/app-benchmarks/siege/Manifest +++ b/app-benchmarks/siege/Manifest @@ -1,3 +1,4 @@ DIST siege-3.0.6.tar.gz 496002 SHA256 78b79964e3d6772e532c6008a084700f830a02a00ca80b44f3e71380b4908c5b SHA512 621f3f60f2aac70fb051f48819f5673d60f31fc4fc69e4c65d4ae0a285d02112686f1e9b40241d48afc378446a2b296a7dc4bbc6d8ae38e390d380506f4d448b WHIRLPOOL 0c94eb828681b2ab67cab13bbaf802f25804e976f4f1eac6cb3cb45160ee6dd2f73d726c39f9ab6be6e4243ac4c6c79d76f406eba72d3fe4a929fb24838b1de0 DIST siege-3.1.0.tar.gz 502444 SHA256 f6a104cb2a3ac6c0efb2699649e8c4f8da2b548147bbbb7af2483089e4940e7f SHA512 b5c0ed75795096dd6c78856747acd1cb778f54ece4ee7b735e676edc898677dd0d23fa544ae249fa6ed9e7780a118936372c271ff24b73f2a54402a94cc0a67a WHIRLPOOL 9a79b0a58fc54c7005406319494acc14fa80c2b98c7c519a39fea92dcded3d330351fa2da7830ff8d52de91744a8646d62b89f8330cf184e7539c86f60065aa0 DIST siege-3.1.3.tar.gz 527862 SHA256 4d3932ea23cbf6d1d22df7c7ee6e7a6bc9f591b604ab582393eeb62f393f5a33 SHA512 880b6d8bbe6b8210147ebb26fd724f4c242076740284977471165fbca514b56c49812ace42dcbe23c57be8fd10a2503b129deec10b79991451a9ae83f30a742b WHIRLPOOL 48e9bb9cd6c66005d17fc8bde1de62d18148114aca48700f26fd3b4710d6dd912dd2e022bbacb3b9adc636fb7003c2a6f561340794aef8142f33fcfe29baa8d9 +DIST siege-3.1.4.tar.gz 530149 SHA256 0436970ca81ade76eb419bc42d3f8460b475079eb5d8f199d2fa83328893099d SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068 WHIRLPOOL 2081e4661a1272d99f16ff350d241c4ba26a6cec7ba34a0968d8db94e2195e0d3f9b1b5b47b5c0575b6b9af0d02d386b020dbcc46ebccdff47bed8e9cd5bd8eb diff --git a/app-benchmarks/siege/siege-3.1.4.ebuild b/app-benchmarks/siege/siege-3.1.4.ebuild new file mode 100644 index 000000000000..f8d6138e1c46 --- /dev/null +++ b/app-benchmarks/siege/siege-3.1.4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +#WANT_AUTOMAKE=1.9 + +inherit eutils bash-completion-r1 libtool autotools + +DESCRIPTION="A HTTP regression testing and benchmarking utility" +HOMEPAGE="https://www.joedog.org/siege-home/" +SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x64-macos" +SLOT="0" +IUSE="ssl" + +RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6d:= )" +DEPEND="${RDEPEND} + sys-devel/libtool" + +src_prepare() { + # bundled macros break recent libtool + sed -i -e 's/AC_PROG_SHELL//' configure.ac || die + rm *.m4 || die "failed to remove bundled macros" + eautoreconf +} + +src_configure() { + local myconf + use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl" + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc AUTHORS ChangeLog INSTALL README* KNOWNBUGS \ + doc/siegerc doc/urls.txt + + newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN} +} + +pkg_postinst() { + echo + elog "An example ~/.siegerc file has been installed in" + elog "${EPREFIX}/usr/share/doc/${PF}/" +} diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest index fe29ad2df0aa..714cd4b18279 100644 --- a/app-cdr/dvdisaster/Manifest +++ b/app-cdr/dvdisaster/Manifest @@ -1 +1,2 @@ +DIST dvdisaster-0.79.5.tar.bz2 8224726 SHA256 9c4c53d9e67855eb04ef87b7525045b4c5b34a9e782c44615dac3ba1a2950f39 SHA512 8630d4389983307afc3faa5b4256f531ded370f84ec35d4a363853dc7d79e5e15ee0b81bf64f4b88f57fe6176537df8195f83acf23e770d991c700b7408dd1f5 WHIRLPOOL 85884422bb76bac52ba02e1d0b6be80458875e79d631d580554a47e5b47aebdadbb93cf2470d2db90f9e332d4318bcd85a52ec5ebc9991ccf4da31017886e7fd DIST dvdisaster_0.72.4.orig.tar.bz2 5097738 SHA256 444763bc40bcc8c396ecd7af0d5d6dd8c458009d4ed62af74ef54074541aa05e SHA512 aa0a9f3040d45b16a9117b2b6756d2423cf55db4a00e8314a164f6dc32863cd4e5a5b5ec009a56782aa2afe6031e3a32954014101abc67291428e9edea1b5272 WHIRLPOOL 888b9643e4102e4c7f237b336bbead60fd02833357775f586766672ea182ce680615a74f9547cf015b3e0edb269fe905a4dd5f28cbf765f3c7f114e097736208 diff --git a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild new file mode 100644 index 000000000000..4236bf6d7b09 --- /dev/null +++ b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils gnome2-utils toolchain-funcs + +DESCRIPTION="Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)" +HOMEPAGE="http://dvdisaster.net/" +SRC_URI="http://dvdisaster.net/downloads/${PN}-${PV}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug nls" + +dvdi_langs="cs de it pt_BR ru sv" +for dvdi_lang in ${dvdi_langs}; do + IUSE+=" linguas_${dvdi_lang}" +done +unset dvdi_lang + +RDEPEND=">=dev-libs/glib-2.32 + nls? ( virtual/libintl ) + >=x11-libs/gtk+-2.6:2 + x11-libs/gdk-pixbuf" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/os-headers + virtual/pkgconfig" + +src_configure() { + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --mandir=/usr/share/man \ + --docdir=/usr/share/doc \ + --docsubdir=${PF} \ + --localedir=/usr/share/locale \ + --buildroot="${D}" \ + --with-nls=$(usex nls) \ + --with-memdebug=$(usex debug) || die +} + +src_compile() { + emake $(use nls && echo -j1) CC="$(tc-getCC)" +} + +src_install() { + emake install + dodoc CHANGELOG CREDITS.en README* TODO *HOWTO + + newicon contrib/${PN}48.png ${PN}.png + make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility' + + local res + for res in 16 32 48 64; do + newicon -s ${res} contrib/${PN}${res}.png ${PN}.png + done + + local dest="${D}"usr/share + + local dvdi_lang + for dvdi_lang in ${dvdi_langs}; do + use linguas_${dvdi_lang} || rm -rf \ + ${dest}/doc/${PF}/${dvdi_lang} \ + ${dest}/doc/${PF}/CREDITS.${dvdi_lang} \ + ${dest}/man/${dvdi_lang} + done + + rm -f "${D}"usr/bin/*-uninstall.sh +} + +pkg_preinst() { gnome2_icon_savelist; } +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; } diff --git a/app-cdr/dvdisaster/metadata.xml b/app-cdr/dvdisaster/metadata.xml index dec8156ad951..d1dcaaa4df96 100644 --- a/app-cdr/dvdisaster/metadata.xml +++ b/app-cdr/dvdisaster/metadata.xml @@ -1,7 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <upstream> - <remote-id type="sourceforge">dvdisaster</remote-id> - </upstream> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Gentoo Proxy Maintainers Project</name> + </maintainer> + <maintainer type="person"> + <email>gentoo@k8n.de</email> + <name>Daniel Kenzelmann</name> + <description>Proxied maintainer; set to assignee in all bugs</description> + </maintainer> + <use> + <flag name="debug"> + Enable memory debugging. + </flag> + </use> </pkgmetadata> diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest index 6ea697aa3a04..42db2b8d5538 100644 --- a/app-editors/qxmledit/Manifest +++ b/app-editors/qxmledit/Manifest @@ -1 +1,2 @@ DIST qxmledit-0.8.8-1-src.tgz 8885329 SHA256 d43ccd0029b1094a970d58170a095cbe5fddfe3d93da7c52388783d321386e17 SHA512 5440d33c052507d3b5c840cdd2966c151a77e2027703f7c1d33f80ec786affab915053d2ae17ef72fd856223ca85dbb70d39d8800170449a26ea88632c0069b5 WHIRLPOOL 68f8d73c39ce490f13d88283053ad045125f007132a25d965ffb603ab1de1d42b62944659a76aa9bbb5adc884b37ad90f7eaf4487f314678d8a1923cd16f1078 +DIST qxmledit-0.9.2-src.tgz 16697023 SHA256 14b8b47f00cf8ea031a0066c928cf8888a3b0d885627ed7f45c6d455be8bd531 SHA512 1cef025ded878e8ad4a33af7f22caf4b157a93e30a6fe863d80ef8c32ca6c9f080e3e4212d1db6a18e647ca111afba796b77f13c2dbc65b18d498fb977504c93 WHIRLPOOL 07fc283720a7427f352fac086770f07e921c20f66ead80fd1b0729be5afc6a01d0c437973dc6c85a61c22f3dabdc9eba2c9b9bf1721e859f0a23cc0cd60900a7 diff --git a/app-editors/qxmledit/metadata.xml b/app-editors/qxmledit/metadata.xml index 98810ff93e62..cfde07d83b4e 100644 --- a/app-editors/qxmledit/metadata.xml +++ b/app-editors/qxmledit/metadata.xml @@ -10,13 +10,13 @@ <name>Gentoo Qt Project</name> </maintainer> <longdescription lang="en"> - QXmlEdit is a simple XML editor written in Qt4. Its main - features are unusual data visualization modes, it has some - nice XML manipulation and presentation features and it is - multi-platform. This is one of the few graphical Open Source - XSD viewer. + QXmlEdit is a simple XML editor based on Qt libraries. Its main features are + unusual data visualization modes, nice XML manipulation and presentation + features, and it is multi-platform. It can split very big XML files into + fragments, and compare XML files. It is one of the few graphical Open Source + XSD viewers. </longdescription> <upstream> - <remote-id type="google-code">qxmledit</remote-id> + <remote-id type="sourceforge">qxmledit</remote-id> </upstream> </pkgmetadata> diff --git a/app-editors/qxmledit/qxmledit-0.9.2.ebuild b/app-editors/qxmledit/qxmledit-0.9.2.ebuild new file mode 100644 index 000000000000..c417cbfc22e7 --- /dev/null +++ b/app-editors/qxmledit/qxmledit-0.9.2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils qmake-utils + +DESCRIPTION="Qt4 XML Editor" +HOMEPAGE="http://qxmledit.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="qt5" + +DEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + ) + !qt5? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtsql:4 + dev-qt/qtsvg:4 + dev-qt/qtxmlpatterns:4 + )" +RDEPEND="${DEPEND}" + +DOCS=(AUTHORS NEWS README) + +src_prepare() { + default + + # bug 568746 + sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \ + src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die +} + +src_configure() { + export \ + QXMLEDIT_INST_DIR="/usr/bin" \ + QXMLEDIT_INST_LIB_DIR="/usr/$(get_libdir)" \ + QXMLEDIT_INST_INCLUDE_DIR="/usr/include/${PN}" \ + QXMLEDIT_INST_DATA_DIR="/usr/share/${PN}" \ + QXMLEDIT_INST_DOC_DIR="/usr/share/doc/${PF}" \ + QXMLEDIT_INST_TRANSLATIONS_DIR="/usr/share/${PN}/translations" + + if use qt5; then + eqmake5 + else + eqmake4 + fi +} + +src_install() { + emake INSTALL_ROOT="${D}" install + doicon install_scripts/environment/icon/qxmledit.png + domenu install_scripts/environment/desktop/QXmlEdit.desktop + einstalldocs +} diff --git a/app-misc/tmux/tmux-2.1.ebuild b/app-misc/tmux/tmux-2.1.ebuild index 9862e65ee629..56d131228b44 100644 --- a/app-misc/tmux/tmux-2.1.ebuild +++ b/app-misc/tmux/tmux-2.1.ebuild @@ -15,14 +15,15 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="ISC" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="debug selinux vim-syntax" +IUSE="debug selinux vim-syntax kernel_FreeBSD kernel_linux" CDEPEND=" || ( =dev-libs/libevent-2.0* >=dev-libs/libevent-2.1.5-r4 ) - sys-libs/libutempter + kernel_linux? ( sys-libs/libutempter ) + kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) sys-libs/ncurses:0=" DEPEND="${CDEPEND} virtual/pkgconfig" diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild index 2709b1a41bdb..d71fba04d744 100644 --- a/app-misc/tmux/tmux-9999.ebuild +++ b/app-misc/tmux/tmux-9999.ebuild @@ -16,11 +16,12 @@ EGIT_REPO_URI="https://github.com/tmux/tmux.git" LICENSE="ISC" SLOT="0" KEYWORDS="" -IUSE="debug selinux vim-syntax" +IUSE="debug selinux vim-syntax kernel_FreeBSD kernel_linux" CDEPEND=" >=dev-libs/libevent-2.0.10 - sys-libs/libutempter + kernel_linux? ( sys-libs/libutempter ) + kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) sys-libs/ncurses:0=" DEPEND="${CDEPEND} virtual/pkgconfig" diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest index f14f84c10a42..4b3c000f7e97 100644 --- a/app-shells/zsh-completions/Manifest +++ b/app-shells/zsh-completions/Manifest @@ -1,2 +1,2 @@ -DIST zsh-completions-0.14.0.tar.gz 199317 SHA256 54e4f5aad66acd729c46f589dc0b9f2a518b453892e4c21e495f33bb959c7eef SHA512 fd2fa683c5990fba9dfa12e839d70c24b7821b487175f5c51d603d21a494f7e9e921628fdd8fff1c02f8c2f52ac1fba1f48638da6a356240e0b7806c1b747ec2 WHIRLPOOL 28df4d93c0bf80bd5c3bb2c189897042e0cfd99fef77492adfe410dca96e140a8e654c0a896b45991f3605822a209d6561f7b196344b704ccd718f0a284f3e28 DIST zsh-completions-0.15.0.tar.gz 217047 SHA256 358c576a44247959966d65f673d2861f232dbef04457954d9ac06e1f5315ca51 SHA512 d4670eb960bf620d627e57ec8dfd92bfba004ccffbbbc3f5e1209fe1569f99477cdd7105837fc6052c7b017c8d0216a44505f60c69abf00031927e6f457c931d WHIRLPOOL b0ceed917498dd3ef843fcca73b6fc730055df3996e0dd19317c0591817662e9b4cf7a69d87dacddf3efd5e484e2d807b65bb4beec84fadc57b5f1b2864fc54c +DIST zsh-completions-0.16.0.tar.gz 218282 SHA256 37fec2bfa7497165530b6afe6d6b837cefff3c8f918c36556cc5ef89f2781102 SHA512 f438dd42fed5cb6b18bc0de3d68792d0fcc6364ff7fc286a9359976987a812010d0c0ce7845d8794a87f1106968cb1afd72cbf73628d7128c1f6e76497f25108 WHIRLPOOL 3724acd47502de7a940c93d9d48d5bef1832c99ac9169a5b77fd2596d187c0d0f52e43e4bd6e88bd95b861cf022bfcb3c4e3920d26ab333b9177ff76d5016c6c diff --git a/app-shells/zsh-completions/zsh-completions-0.14.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.16.0.ebuild index e5b1d5f40bc0..e5b1d5f40bc0 100644 --- a/app-shells/zsh-completions/zsh-completions-0.14.0.ebuild +++ b/app-shells/zsh-completions/zsh-completions-0.16.0.ebuild diff --git a/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch b/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch new file mode 100644 index 000000000000..9869b308c73c --- /dev/null +++ b/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch @@ -0,0 +1,10 @@ +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am +@@ -64,6 +64,7 @@ + libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_SOURCES = \ + EBOOKDocument.cpp + ++libe_book_internal_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED + libe_book_internal_la_SOURCES = \ + EBOOKBitStream.cpp \ + EBOOKBitStream.h \ diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild new file mode 100644 index 000000000000..9ee438db230f --- /dev/null +++ b/app-text/libebook/libebook-0.1.2-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +MY_PN="libe-book" +MY_P="${MY_PN}-${PV}" + +inherit eutils autotools + +DESCRIPTION="Library parsing various ebook formats" +HOMEPAGE="http://www.sourceforge.net/projects/libebook/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc test" + +RDEPEND=" + dev-libs/icu:= + dev-libs/librevenge + dev-libs/libxml2 + sys-libs/zlib +" +DEPEND="${RDEPEND} + dev-libs/boost:= + dev-util/gperf + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( dev-util/cppunit ) +" +RDEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/${P}-boost-1.59-makefile.patch" ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --disable-static \ + --disable-werror \ + $(use_with doc docs) \ + $(use_enable test tests) \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} +} + +src_install() { + default + prune_libtool_files --all +} diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest index 76f401efbbfa..40bad410daaf 100644 --- a/app-text/pdf2djvu/Manifest +++ b/app-text/pdf2djvu/Manifest @@ -1,3 +1,2 @@ -DIST pdf2djvu-0.8.2.tar.xz 234412 SHA256 40b0812e954f374704bd8dbb5952786f6744623a2ec6df1c56de0b8057be93d6 SHA512 72a3ee719b6311824c1f71269787b31cdd600bc8671f0486419f4d023cb10f9d338df18ce33c982ed43f893d441a723bffd502a17287be43a00dc695ca959042 WHIRLPOOL 72863dfc7f4a7d1665de77a3fa12242c83746f4c3a237b45e92fd3111581f55e16a5c020590d12185db13b7035a987ab2efaa8fee9b47adb60f0502703af6a7c -DIST pdf2djvu-0.9.1.tar.xz 238840 SHA256 9f9919e97fe244f4c49fa4074120cfc03397379b39f32a911793088039c63df5 SHA512 9ccc5a5523f9b9f17f67912a63f0314eac93a633282bb8bee95bcd9b0f50ef2d05ddbb3456daee7b8d5795081c27002ffc355e6effcfbee4ce9a52b7f92bdf50 WHIRLPOOL ae3e531a5de524e03cd353af54bb4171a62fc01b4162ec31b2401eea53732acb13fed80f3b5eb7ed797080b1b2aab5908d6666a95068b0583b3f8ce92130897e DIST pdf2djvu-0.9.3.tar.xz 239492 SHA256 d05eb7a10e22d18b77113831ac1c6e380c4569e021c39554d5bb54effe4c7077 SHA512 388b76642c354480674b6eee4961792c4ef483313ffd25a6248d1d6302985ac5adfb558ae9241062893a419463c9626d8dac9d08297d66b68a98cebbcc4dc193 WHIRLPOOL 76f5d53c11c921968eaf9f91b4fcf7ff25bd6405b6f92638af4fd38c5931941f6c48f4ba586d0ef3a6f5f8bdcfff68b1681c6429e32c818ffe379bd3a6891bfc +DIST pdf2djvu-0.9.4.tar.xz 250332 SHA256 c5702283fc6f39e8c0c49c2dc67b95e321dc926199bc77578d3daeef4de62fa8 SHA512 6b97d0577ee6e623d8c877393f551dd2a5e19508e5cd6dc5bb2d3ae1a2b71c2f0ffc7020d85507bc52a25da09a301dd5ddf45ab2628928477e0846707ea57322 WHIRLPOOL 007e1d2a150ca1300d67852ef6ee5e47e0ab36c253d0628438f3a199c42b889613f0aeb8d2ab661555d87bf0b913975ffa65f80fc3d9c5fad475d581d13fb2b6 diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.1.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.1.ebuild deleted file mode 100644 index 653e9bbc712e..000000000000 --- a/app-text/pdf2djvu/pdf2djvu-0.9.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 toolchain-funcs - -DESCRIPTION="A tool to create DjVu files from PDF files" -HOMEPAGE="http://jwilk.net/software/pdf2djvu" -SRC_URI="https://bitbucket.org/jwilk/${PN}/downloads/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+graphicsmagick nls openmp test" - -RDEPEND=" - >=app-text/djvu-3.5.21:= - >=app-text/poppler-0.16.7:= - dev-libs/libxml2:= - dev-libs/libxslt:= - graphicsmagick? ( media-gfx/graphicsmagick:= ) -" -DEPEND="${RDEPEND} - dev-cpp/pstreams - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" - -REQUIRED_USE="test? ( graphicsmagick ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - use test && python-single-r1_pkg_setup -} - -src_configure() { - local openmp=--disable-openmp - use openmp && tc-has-openmp && openmp=--enable-openmp - - econf \ - ${openmp} \ - $(use_enable nls) \ - $(use_with graphicsmagick) -} - -src_install() { - default - dodoc doc/{changelog,{cjk,credits,djvudigital}.txt} -} diff --git a/app-text/pdf2djvu/pdf2djvu-0.8.2.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.4.ebuild index 653e9bbc712e..e1760fe2396d 100644 --- a/app-text/pdf2djvu/pdf2djvu-0.8.2.ebuild +++ b/app-text/pdf2djvu/pdf2djvu-0.9.4.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$ diff --git a/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild b/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild index 05dfdf9e5edf..605f0c735ce1 100644 --- a/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild +++ b/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2" LICENSE="public-domain" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" DEPEND="" diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest index 904c53c77177..d72c289005a6 100644 --- a/app-text/zathura-pdf-mupdf/Manifest +++ b/app-text/zathura-pdf-mupdf/Manifest @@ -1,4 +1,2 @@ -DIST zathura-pdf-mupdf-0.2.6.tar.gz 9094 SHA256 5df94b6f906008b5f3bca770a552da6d2917d6b8d3e4b3049cb7001302041b20 SHA512 5dda347055a0286229e63b7de02bd58314590bfe0edd25d793169f30061083dbf7915669657c7f717c6a3b141b23acd4481dbdb81fa69e399385b2c3eff4272f WHIRLPOOL 6ea732523c0fe4f1324a690a4a7120da5d422f976358270ea096516fb2470b61f1efd3f3be0c1735320e3b9d5de5f0672ee69fd48c6b72135ae686908f1d089e -DIST zathura-pdf-mupdf-0.2.7.tar.gz 9357 SHA256 b1343f35940ebcf463b868b557be4eaba7d61884d6ff3ad3d7c7c272e69c253f SHA512 0c0b5ab13cce85f7328fa5ba967ceba926793d7e19fc8e41875fe98b5878292d395edab71e5df86bc6fe86ad111031510362303b7f08a8375731e41a73237a82 WHIRLPOOL a46915fa33f563adb18d462c58a516fd76f69ccdc30b05605b566215acaf47776d36f285019e68bd9d9b4e6c91616a6a0f130478d7ef1668db9a670bdd164b92 DIST zathura-pdf-mupdf-0.2.8.tar.gz 9930 SHA256 9f8b92762cdad14a2a587744c758edc0e1003be6a0c1511486065bdc91a66910 SHA512 fce85f513c7d99e1bc48a288fd9f9a14b8ab01ade660ac8eaeeffb3ceaa695d210026d2c4d9c0bf383df613b98a3cb56499b2c835a7d8873dd896d73c61b7258 WHIRLPOOL a0ba8f961c98c9681ae352097cfd0bd58613929466e1a7f072df8d162fe3d9888a7cf073bf995a4ff88332b96a6e40d91f2c65c23a0bf157e5e15c93f00454f0 -DIST zathura-pdf-mupdf-0.2.9.tar.gz 9909 SHA256 1c7a123b5153a9b1110e882a1475de7bd0929c70d41b33750e1c98efc74f7e3c SHA512 09507df8fa568d64667e8456ba64cb94353322140cb37b2412b46cfdf443142b331d13ac3a5939b8635a185e08b44430578a7cf1d075b6be239cab01a0a4b883 WHIRLPOOL f8129da84073e45227fef8b63df13de70e61b0f80d55cb6192ff8d728e81216445e60297295b1a5ba57962ffd41a06686984c2d8e137a6842bb642d2d7f218b8 +DIST zathura-pdf-mupdf-0.3.0.tar.gz 9914 SHA256 478cb9d1562d08e096ebec4a6db9116d616a3536260197c2a28a2772171f72c8 SHA512 c83eef453176c6317be338260e311c39e049b8ae1ae719445c6303725b4e993758ed3f3a61f0af31032d09f1f2f03574f862d24e36b27fa38732e0b6c7aa18ea WHIRLPOOL 6fef567220a5d1f9140b0d8a216752f92717c24b7abcdc945239acc8f9ee349695c052fefc671f0f47f3e3a9aa1d2e94cd88a9d5c3edd7e64b8edc9e923919a8 diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.6.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.6.ebuild deleted file mode 100644 index ea3474144973..000000000000 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.6.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs -[[ ${PV} == 9999* ]] && inherit git-2 - -DESCRIPTION="PDF plug-in for zathura" -HOMEPAGE="http://pwmt.org/projects/zathura/" -if ! [[ ${PV} == 9999* ]]; then -SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz" -fi -EGIT_REPO_URI="git://git.pwmt.org/${PN}.git" -EGIT_BRANCH="mupdf-git" - -LICENSE="ZLIB" -SLOT="0" -if ! [[ ${PV} == 9999* ]]; then -KEYWORDS="~amd64 ~x86" -else -KEYWORDS="" -fi -IUSE="" - -RDEPEND="!app-text/zathura-pdf-poppler - >=app-text/mupdf-1.3:= - >=app-text/zathura-0.2.7 - media-libs/jbig2dec:= - media-libs/openjpeg:2= - virtual/jpeg:0 - x11-libs/cairo:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - myzathuraconf=( - CC="$(tc-getCC)" - LD="$(tc-getLD)" - VERBOSE=1 - DESTDIR="${D}" - MUPDF_LIB="$($(tc-getPKG_CONFIG) --libs mupdf)" - OPENSSL_INC="$($(tc-getPKG_CONFIG) --cflags mupdf)" - OPENSSL_LIB='' - ) -} - -src_compile() { - emake "${myzathuraconf[@]}" -} - -src_install() { - emake "${myzathuraconf[@]}" install - dodoc AUTHORS -} diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.7.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.7.ebuild deleted file mode 100644 index bdedfa8c59e3..000000000000 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.7.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs -[[ ${PV} == 9999* ]] && inherit git-2 - -DESCRIPTION="PDF plug-in for zathura" -HOMEPAGE="http://pwmt.org/projects/zathura/" -if ! [[ ${PV} == 9999* ]]; then -SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz" -fi -EGIT_REPO_URI="git://git.pwmt.org/${PN}.git" -EGIT_BRANCH="develop" - -LICENSE="ZLIB" -SLOT="0" -if ! [[ ${PV} == 9999* ]]; then -KEYWORDS="~amd64 ~x86" -else -KEYWORDS="" -fi -IUSE="" - -RDEPEND="!app-text/zathura-pdf-poppler - >=app-text/mupdf-1.3:= - <app-text/mupdf-1.7:= - >=app-text/zathura-0.3.1 - media-libs/jbig2dec:= - media-libs/openjpeg:2= - virtual/jpeg:0 - x11-libs/cairo:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - myzathuraconf=( - CC="$(tc-getCC)" - LD="$(tc-getLD)" - VERBOSE=1 - DESTDIR="${D}" - MUPDF_LIB="$($(tc-getPKG_CONFIG) --libs mupdf)" - OPENSSL_INC="$($(tc-getPKG_CONFIG) --cflags mupdf)" - OPENSSL_LIB='' - ) -} - -src_compile() { - emake "${myzathuraconf[@]}" -} - -src_install() { - emake "${myzathuraconf[@]}" install - dodoc AUTHORS -} diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.9.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.0.ebuild index 1b6a0ab649e8..653df8747a09 100644 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.9.ebuild +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.0.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$ diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild index 9e29938aaccb..653df8747a09 100644 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest index 94aa5206e707..643d3b83cda7 100644 --- a/app-text/zathura/Manifest +++ b/app-text/zathura/Manifest @@ -1,5 +1,3 @@ DIST zathura-0.2.9.tar.gz 196690 SHA256 2c071d403ec9348b839567b2897850bf29d9c24c85982b5509a1a429a72ee09f SHA512 be72a5845ed0e4f09d54c608fc8373757d0d8dbf6f3d9be1a4ee671be22cec31e8eda2e8591c007e80df30059938b3480f5e7f035a115bd58e8dd05972296503 WHIRLPOOL 4c436fc9a78ea797d1e094baa04755c5cd8e3470371ad15296eab0b346c8a4ea5018c10240d5f9f1647995f2e645665aad3c867a67d1281fb3b843375af448ee -DIST zathura-0.3.1.tar.gz 201239 SHA256 b502c0220d7220310ca6277042fcb11a0bbaafbaaa926306b27bde6ff79192f3 SHA512 400643f87bfe918345bbff78076161a9b99981dd658e1791194b2826d8b0e4106eeea775ebcb18e8fa7cdd1e2ee07b8e95a7a4544dd34934b42cf99a694b4d71 WHIRLPOOL 7bb0c8008a15e9078b6731cf12ce342eb69c15a7de283f3e34dddf660199f38ac0cd66674ba8ea9695f7ed3622298a9b608decd93ada4bd0d77cec7782e32c98 -DIST zathura-0.3.2.tar.gz 202943 SHA256 fda6503dc5b21f7c667301798fbd2c978897e68b4555e8c731945cecd9d165e2 SHA512 17d221079a748681c7bbdeb8bcb7dac876db1300ec970b553dffd166e67d945708911a13dca000b425198b87c0a232f41f71c12f174037d261933e17882e3224 WHIRLPOOL 56106e15a30eb8f9acfbd37001a6217f243c33822b3dd9fffb978f7d06eaa78d457165908f1a1f4aa260d1ffabddfdf46f6c217c97131fe93549094fff4cdd7f DIST zathura-0.3.3.tar.gz 203604 SHA256 3347decfc8d4b918a6bca1d44657c3b97d4afcea3c8c1f162c57198b13e8dce7 SHA512 0bfcb2c9ca6e7cf44db1c04fdcc5e1e2122b5bd060c10b711a331f885371a523881a46376c770b60cf199530fd9c7814248e8a6da556da8cd464a3a85dbad8e3 WHIRLPOOL c7d94f9db579336f6c2f41b1789e5ffba882b0c00c57e935146297c445cb1ec2894dc7d3dfc0b02ce695e5b5849d3820f91dea8149f206e036c3aae3402b8a4c -DIST zathura-0.3.4.tar.gz 167584 SHA256 52c4a3efc5843ce7c720ea7357667699363c809fd34ada4cb350d0e1031d0234 SHA512 663a24574838fe6531bf588ec97ed54f3bf3601c6ed11bbcd38347e8fa1876c4cfa964ab7bba70f8afd40dd9d984315b0966546394c0efac00c6fbd9967b77a2 WHIRLPOOL fbbbe6bfe34f5d21c47c7fdc2aea0741d569e8e8ec39ed3c4f4581724588acd8c328a55cbcf49a11c2d3121f21d1e12d87760abedd8525028e73f1aaa0ac8539 +DIST zathura-0.3.5.tar.gz 168808 SHA256 2a71b5d49fa70c01535869f4642bc379bf4c182a97b01e2d09b81800426e330c SHA512 a28b10f58b88f8e162e693d164bd1bbe5a6580b49fcedb0825d0b981f74b91783d650dc13f230be41bee0d11c406f10b2b823e87306e8de5e5e09d70878a8610 WHIRLPOOL 5b912837368ce9958dc38e33b2a3972bb04cd80eba289889359905e908a59ee095c7c57a1fe6fcad8977f4095516557a605e6794ffaf840cd7a5c4c89afc376b diff --git a/app-text/zathura/zathura-0.3.1.ebuild b/app-text/zathura/zathura-0.3.1.ebuild deleted file mode 100644 index d11b9839f820..000000000000 --- a/app-text/zathura/zathura-0.3.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils fdo-mime multilib toolchain-funcs virtualx -[[ ${PV} == 9999* ]] && inherit git-2 - -DESCRIPTION="A highly customizable and functional document viewer" -HOMEPAGE="http://pwmt.org/projects/zathura/" -if ! [[ ${PV} == 9999* ]]; then -SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz" -fi -EGIT_REPO_URI="git://git.pwmt.org/${PN}.git" -EGIT_BRANCH="develop" - -LICENSE="ZLIB" -SLOT="0" -if ! [[ ${PV} == 9999* ]]; then -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -else -KEYWORDS="" -fi -IUSE="+magic sqlite test" - -RDEPEND=">=dev-libs/girara-0.2.3:3= - >=dev-libs/glib-2.28:2= - x11-libs/cairo:= - >=x11-libs/gtk+-3.2:3 - magic? ( sys-apps/file:= ) - sqlite? ( dev-db/sqlite:3= )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig - test? ( dev-libs/check )" - -pkg_setup() { - # TODO: Create ebuild for synctex and pass WITH_SYSTEM_SYNCTEX=1 - myzathuraconf=( - WITH_SYSTEM_SYNCTEX=0 - WITH_MAGIC=$(usex magic 1 0) - WITH_SQLITE=$(usex sqlite 1 0) - PREFIX="${EPREFIX}"/usr - LIBDIR='${PREFIX}'/$(get_libdir) - CC="$(tc-getCC)" - SFLAGS='' - VERBOSE=1 - DESTDIR="${D}" - ) -} - -src_compile() { - emake "${myzathuraconf[@]}" -} - -src_test() { - Xemake "${myzathuraconf[@]}" test -} - -src_install() { - emake "${myzathuraconf[@]}" install - dodoc AUTHORS -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/app-text/zathura/zathura-0.3.2.ebuild b/app-text/zathura/zathura-0.3.2.ebuild deleted file mode 100644 index 8e2776f2ad11..000000000000 --- a/app-text/zathura/zathura-0.3.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils fdo-mime multilib toolchain-funcs virtualx -[[ ${PV} == 9999* ]] && inherit git-2 - -DESCRIPTION="A highly customizable and functional document viewer" -HOMEPAGE="http://pwmt.org/projects/zathura/" -if ! [[ ${PV} == 9999* ]]; then -SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz" -fi -EGIT_REPO_URI="git://git.pwmt.org/${PN}.git" -EGIT_BRANCH="develop" - -LICENSE="ZLIB" -SLOT="0" -if ! [[ ${PV} == 9999* ]]; then -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -else -KEYWORDS="" -fi -IUSE="+magic sqlite test" - -RDEPEND=">=dev-libs/girara-0.2.3:3= - >=dev-libs/glib-2.28:2= - x11-libs/cairo:= - >=x11-libs/gtk+-3.2:3 - magic? ( sys-apps/file:= ) - sqlite? ( dev-db/sqlite:3= )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig - test? ( dev-libs/check )" - -pkg_setup() { - # TODO: Create ebuild for synctex and pass WITH_SYSTEM_SYNCTEX=1 - myzathuraconf=( - WITH_SYSTEM_SYNCTEX=0 - WITH_MAGIC=$(usex magic 1 0) - WITH_SQLITE=$(usex sqlite 1 0) - PREFIX="${EPREFIX}"/usr - LIBDIR='${PREFIX}'/$(get_libdir) - CC="$(tc-getCC)" - SFLAGS='' - VERBOSE=1 - DESTDIR="${D}" - ) -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-no-sqlite.patch -} - -src_compile() { - emake "${myzathuraconf[@]}" -} - -src_test() { - Xemake "${myzathuraconf[@]}" test -} - -src_install() { - emake "${myzathuraconf[@]}" install - dodoc AUTHORS -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/app-text/zathura/zathura-0.3.4.ebuild b/app-text/zathura/zathura-0.3.5.ebuild index 1af5fd36da72..94e403b1a3ec 100644 --- a/app-text/zathura/zathura-0.3.4.ebuild +++ b/app-text/zathura/zathura-0.3.5.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$ @@ -37,9 +37,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/check )" pkg_setup() { - # TODO: Create ebuild for synctex and pass WITH_SYSTEM_SYNCTEX=1 myzathuraconf=( - WITH_SYSTEM_SYNCTEX=0 WITH_MAGIC=$(usex magic 1 0) WITH_SQLITE=$(usex sqlite 1 0) WITH_SYNCTEX=$(usex synctex 1 0) @@ -52,10 +50,6 @@ pkg_setup() { ) } -src_prepare() { - epatch "${FILESDIR}"/${P}-synctex.patch -} - src_compile() { emake "${myzathuraconf[@]}" } diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild index 6f5bd8693633..94e403b1a3ec 100644 --- a/app-text/zathura/zathura-9999.ebuild +++ b/app-text/zathura/zathura-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -37,9 +37,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/check )" pkg_setup() { - # TODO: Create ebuild for synctex and pass WITH_SYSTEM_SYNCTEX=1 myzathuraconf=( - WITH_SYSTEM_SYNCTEX=0 WITH_MAGIC=$(usex magic 1 0) WITH_SQLITE=$(usex sqlite 1 0) WITH_SYNCTEX=$(usex synctex 1 0) diff --git a/dev-cpp/eigen/eigen-3.2.7.ebuild b/dev-cpp/eigen/eigen-3.2.7.ebuild index f0cc3dd00abc..2004683d7e7a 100644 --- a/dev-cpp/eigen/eigen-3.2.7.ebuild +++ b/dev-cpp/eigen/eigen-3.2.7.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2" LICENSE="LGPL-2 GPL-3" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="altivec debug doc openmp test" IUSE+=" cpu_flags_x86_sse2" IUSE+=" cpu_flags_x86_sse3" diff --git a/dev-cpp/eigen/eigen-3.2.8-r1.ebuild b/dev-cpp/eigen/eigen-3.2.8-r2.ebuild index d79230b4ae7e..9f23df9491e8 100644 --- a/dev-cpp/eigen/eigen-3.2.8-r1.ebuild +++ b/dev-cpp/eigen/eigen-3.2.8-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2" LICENSE="LGPL-2 GPL-3" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="altivec debug doc openmp test" IUSE+=" cpu_flags_x86_sse2" IUSE+=" cpu_flags_x86_sse3" @@ -76,10 +76,6 @@ src_prepare() { sed -i -e "/Unknown build type/d" CMakeLists.txt || die - sed \ - -e '/Cflags/s|:.*|: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}|g' \ - -i eigen3.pc.in || die - cmake-utils_src_prepare } diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild index 8df2316e0a01..edadcb76a462 100644 --- a/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild +++ b/dev-db/sqliteman/sqliteman-1.2.2-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm x86" IUSE="" RDEPEND=" diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild index c9dfa6c449b2..1bce507ba284 100644 --- a/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild +++ b/dev-embedded/u-boot-tools/u-boot-tools-2015.04.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$ @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="" S=${WORKDIR}/${MY_P} diff --git a/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild b/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild index e22ccf5dd806..677dcd45ff5c 100644 --- a/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild +++ b/dev-go/blackfriday/blackfriday-1.2_p20150720.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 @@ EGO_PN=github.com/russross/${PN} if [[ ${PV} = *9999* ]]; then inherit golang-vcs else - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" EGIT_COMMIT="8cec3a8" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" inherit golang-vcs-snapshot diff --git a/dev-go/go-md2man/go-md2man-1.0.3.ebuild b/dev-go/go-md2man/go-md2man-1.0.3.ebuild index ece084e9d05a..fa861b69337d 100644 --- a/dev-go/go-md2man/go-md2man-1.0.3.ebuild +++ b/dev-go/go-md2man/go-md2man-1.0.3.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 @@ EGO_PN=github.com/cpuguy83/go-md2man if [[ ${PV} = *9999* ]]; then inherit golang-vcs else - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" EGIT_COMMIT=v${PV} SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" inherit golang-vcs-snapshot diff --git a/dev-go/go-oauth2/Manifest b/dev-go/go-oauth2/Manifest index d7aa3d45af55..180b29456f2c 100644 --- a/dev-go/go-oauth2/Manifest +++ b/dev-go/go-oauth2/Manifest @@ -1,4 +1,5 @@ DIST gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz 217728 SHA256 d4dc2064cc999c9c527fe50a05c44357d3471379bea3f82a95bfebbaa5373552 SHA512 45f0533c842a59dfee3b6d3f1facb9535466119601644a9a2c8c8b4f573889713b1d82d0acdeef96ea246d47d79402d09592b25da3ffbf73953bd28bf5b92ed9 WHIRLPOOL fadd0c32fbfcca9c01ad0a11f64ea4625cda858e4d241bcad35cdc1292bf258a370f4fdd73ecb7bb613fc1f0e8a52154dc3582dbcd776517713468cb2ab7c18a DIST gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz 168358 SHA256 817456c3b49ff6917604d201041d4f555e7f42328d5df036c68c26bf50c7455c SHA512 135124280cdbf0a9e62f811164b4b97f0ee5142736cc4a06efafd48162a89dd1a6f186264c925da27adc970c964ab0af75423025fd125b772ddb99320b816219 WHIRLPOOL 66a445585c17d0331b0ce24d9bde8c8942ba39d1d404e1b3b73cbaf173327ab0c43af5b7e980accf697100b12e3a544334a07f43f9f17ebac93ee7907b92b7ac +DIST go-net-0_pre20160216.tar.gz 741192 SHA256 482a17771601dc706945eee7e0c3a339d57a140dc3cb8adaa86e99ef28a8ea71 SHA512 75db9098b33ede5621fce36645ebe946fad911c815dae219d74242b15714d1b9a3d8544f5f8c90b58989cea3a46b5688d20f705cb24a7d31f201ec218e69e78f WHIRLPOOL 2a7dca88766e6ba010ed6b274a48e7db5cfc9084cbc16f46e2806d59519f91b296d64dead8485f191aff50168bad5b4f62ac670d17b30b90850a9906d85c6708 DIST go-oauth2-0_pre20150701.tar.gz 32040 SHA256 ce9b602dd7f05c819002d6400585c2f09e8e1880a0fe358a4d4f56a6594ccedd SHA512 d809e1d63c7b5a4b388616d930cb22978b1653e2314b208d12679242bdd0e9d72f275f5ade7aa468b1dcf3960aa70ff94183ae1dd04325b24cdd20ef4834880a WHIRLPOOL 984438676de52f635206a3bb19b77e7f05c9c78a2ce6beabbe82cc22fb28fa0c7e3717a596a9b0c967615574ad6e53da0510bc1ecd0a38edd23680622320d6a0 -DIST go-oauth2-0_pre20160220.tar.gz 32040 SHA256 ce9b602dd7f05c819002d6400585c2f09e8e1880a0fe358a4d4f56a6594ccedd SHA512 d809e1d63c7b5a4b388616d930cb22978b1653e2314b208d12679242bdd0e9d72f275f5ade7aa468b1dcf3960aa70ff94183ae1dd04325b24cdd20ef4834880a WHIRLPOOL 984438676de52f635206a3bb19b77e7f05c9c78a2ce6beabbe82cc22fb28fa0c7e3717a596a9b0c967615574ad6e53da0510bc1ecd0a38edd23680622320d6a0 +DIST go-oauth2-0_pre20160222.tar.gz 34556 SHA256 cb4123249901235e6ebfd074a5b1547cb4e3a4a7060b399b29950e60882ecd2f SHA512 23fbc7744fe35f893d385a308428d2a3b8ddbf45fa12c5b43d3dc619e6bb422f30ce80774a25b88a8f74f9343c57280546183b45364456e1c60aee96aa6d0f77 WHIRLPOOL 67c42a0b21861e7cd34b25c4d59359f791faf4f03a2759c94ae70e48cfbe24f27ca005f7e7afbbe7c8221fb47aa8a08dc19c19dc8e53b680d6bcaaeff10d2308 diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild b/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild index be31d40d5ede..0d9fdbbd5e4c 100644 --- a/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild +++ b/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild @@ -60,7 +60,7 @@ src_test() { } src_install() { - insinto /usr/lib/go + insinto "$(get_golibdir)" egit_clean "${WORKDIR}"/{pkg,src} insopts -m0644 -p # preserve timestamps for bug 551486 doins -r "${WORKDIR}"/{pkg,src} diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20160220.ebuild b/dev-go/go-oauth2/go-oauth2-0_pre20160220.ebuild deleted file mode 100644 index a2e4436f7c1e..000000000000 --- a/dev-go/go-oauth2/go-oauth2-0_pre20160220.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils golang-base - -MY_PN=${PN##*-} -GO_PN=golang.org/x/${MY_PN} -EGIT_COMMIT="8914e5017ca260f2a3a1575b1e6868874050d95e" - -HOMEPAGE="https://godoc.org/${GO_PN}" -DESCRIPTION="Go client implementation for OAuth 2.0 spec" -SRC_URI=" - https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - https://github.com/GoogleCloudPlatform/gcloud-golang/archive/872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz -> gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz" - -SLOT="0/${PVR}" -LICENSE="BSD" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-go/go-net:= - dev-go/go-tools" -RDEPEND="" - -S="${WORKDIR}/src/${GO_PN}" - -EGIT_CHECKOUT_DIR="${S}" -STRIP_MASK="*.a" - -src_unpack() { - default - mkdir -p src/${GO_PN%/*} || die - mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die - - # Create a writable GOROOT in order to avoid sandbox violations. - export GOROOT="${WORKDIR}/goroot" GOPATH="${WORKDIR}/:$(get_golibdir_gopath)" - cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die - rm -rf "${GOROOT}/src/${GO_PN}" || die - - mkdir -p "${GOROOT}/src/google.golang.org" || die - rm -rf "${GOROOT}/src/google.golang.org"/* || die - rm -rf "${GOROOT}/pkg/${KERNEL}_${ARCH}/google.golang.org" || die - mv gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf "${GOROOT}/src/google.golang.org/cloud" || die -} - -src_compile() { - go install -v -x -work google.golang.org/cloud/compute/metadata || die - go install -v -x -work ${GO_PN}/... || die -} - -src_test() { - # google/example_test.go imports appengine, introducing a circular dep - mv google/example_test.go{,_} - go test -x -v ${GO_PN}/... || die $? - mv google/example_test.go{_,} -} - -src_install() { - insinto /usr/lib/go - insopts -m0644 -p # preserve timestamps for bug 551486 - doins -r "${WORKDIR}"/{pkg,src} -} diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild b/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild new file mode 100644 index 000000000000..2d1bb8e5435b --- /dev/null +++ b/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils golang-base + +MY_PN=${PN##*-} +EGO_PN="golang.org/x/${MY_PN}/..." +EGIT_COMMIT="2cd4472c321b6cba78e029d99f0e7fe51032fd21" + +HOMEPAGE="https://godoc.org/${EGO_PN%/*}" +DESCRIPTION="Go client implementation for OAuth 2.0 spec" +SRC_URI=" + https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz + https://github.com/golang/net/archive/b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed.tar.gz -> go-net-0_pre20160216.tar.gz + https://github.com/GoogleCloudPlatform/gcloud-golang/archive/872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz -> gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz" + +SLOT="0/${PVR}" +LICENSE="BSD" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="dev-go/go-tools" +RDEPEND="" + +EGIT_CHECKOUT_DIR="${S}" +STRIP_MASK="*.a" + +get_archive_go_package() { + local archive=${1} uri x + case ${archive} in + ${PN}-*) echo "oauth2-* golang.org/x/oauth2"; return;; + gcloud-golang-*) echo "gcloud-golang-* google.golang.org/cloud"; return;; + go-net-*) echo "net-* golang.org/x/net"; return;; + esac + for x in ${SRC_URI}; do + if [[ ${x} == http* ]]; then + uri=${x} + elif [[ ${x} == ${archive} ]]; then + break + fi + done + uri=${uri#https://} + uri=${uri%/archive/*} + echo "${uri##*/}-* ${uri}" +} + +unpack_go_packages() { + local go_package pattern x + # Unpack packages to appropriate locations for GOPATH + for x in ${A}; do + unpack ${x} + if [[ ${x} == *.tar.gz ]]; then + go_package=$(get_archive_go_package ${x}) + pattern=${go_package%% *} + go_package=${go_package##* } + if [[ ${x%.tar.gz} -ef ${S} ]]; then + mv "${S}"{,_} || die + mkdir -p "${S}/src/${go_package%/*}" || die + mv "${S}"_ "${S}/src/${go_package}" || die || die + else + mkdir -p "${S}/src/${go_package%/*}" || die + for x in ${pattern}; do + if [[ ! ${x} -ef ${S} ]]; then + mv "${x}" "${S}/src/${go_package}" || die + fi + done + fi + fi + done +} + +src_unpack() { + unpack_go_packages + + # Create a writable GOROOT in order to avoid sandbox violations. + # Omit $(get_golibdir_gopath) from GOPATH, in order to avoid + # more sandbox violations (bug 575722). + GOROOT="${WORKDIR}/goroot" GOPATH="${S}" + cp -sR "$(go env GOROOT)" "${GOROOT}" || die + rm -rf "${GOROOT}/src/${EGO_PN%/*}" || die + export GOROOT GOPATH + + mkdir -p "${GOROOT}/src/google.golang.org" || die + rm -rf "${GOROOT}/src/google.golang.org"/* || die + rm -rf "${GOROOT}/pkg/${KERNEL}_${ARCH}/google.golang.org" || die +} + +src_compile() { + GOROOT="${GOROOT}" GOPATH="${GOPATH}" \ + go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die +} + +src_test() { + # google/example_test.go imports appengine, introducing a circular dep + mv src/${EGO_PN%/*}/google/example_test.go{,_} || die + go test -x -v "${EGO_PN}" || die $? + mv src/${EGO_PN%/*}/google/example_test.go{_,} || die +} + +src_install() { + golang_install_pkgs +} + +golang_install_pkgs() { + insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}") + rm -rf "${S}"/src/${EGO_PN%/*}/.git* + doins -r "${S}"/src/${EGO_PN%/*} + insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}") + doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a} +} diff --git a/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.ebuild b/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.ebuild index 3eec0dc4c15a..3e247566dfa0 100644 --- a/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.ebuild +++ b/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.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 @@ EGO_PN=github.com/shurcooL/sanitized_anchor_name if [[ ${PV} = *9999* ]]; then inherit golang-vcs else - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" EGIT_COMMIT="244f5ac" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" inherit golang-vcs-snapshot diff --git a/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild b/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild index b6f5a92b55eb..0750342fa12c 100644 --- a/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild +++ b/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] diff --git a/dev-haskell/comonad/comonad-4.2.7.2.ebuild b/dev-haskell/comonad/comonad-4.2.7.2.ebuild index 31b3d2938d2b..007e7ad6ea31 100644 --- a/dev-haskell/comonad/comonad-4.2.7.2.ebuild +++ b/dev-haskell/comonad/comonad-4.2.7.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+containers +contravariant +distributive +test-doctests" RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] diff --git a/dev-haskell/contravariant/contravariant-0.6.ebuild b/dev-haskell/contravariant/contravariant-0.6.ebuild index 97fd7774661a..9879c784e456 100644 --- a/dev-haskell/contravariant/contravariant-0.6.ebuild +++ b/dev-haskell/contravariant/contravariant-0.6.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] diff --git a/dev-haskell/cpphs/cpphs-1.19.3.ebuild b/dev-haskell/cpphs/cpphs-1.19.3.ebuild index c7acc99e9d11..0d307bb84ac8 100644 --- a/dev-haskell/cpphs/cpphs-1.19.3.ebuild +++ b/dev-haskell/cpphs/cpphs-1.19.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="" RDEPEND="dev-haskell/old-locale:=[profile?] diff --git a/dev-haskell/distributive/distributive-0.4.4.ebuild b/dev-haskell/distributive/distributive-0.4.4.ebuild index d4049bca852b..ef3f2a855450 100644 --- a/dev-haskell/distributive/distributive-0.4.4.ebuild +++ b/dev-haskell/distributive/distributive-0.4.4.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] diff --git a/dev-haskell/extra/extra-1.4.2.ebuild b/dev-haskell/extra/extra-1.4.2.ebuild index 6432d1145361..e55882b0ccf1 100644 --- a/dev-haskell/extra/extra-1.4.2.ebuild +++ b/dev-haskell/extra/extra-1.4.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" # this package has nothing to do with extra:0 (aka Extra on hackage) SLOT="2/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/free/free-4.12.4.ebuild b/dev-haskell/free/free-4.12.4.ebuild index 4c26e265fbdc..1b6abe07069d 100644 --- a/dev-haskell/free/free-4.12.4.ebuild +++ b/dev-haskell/free/free-4.12.4.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] diff --git a/dev-haskell/hlint/hlint-1.9.21.ebuild b/dev-haskell/hlint/hlint-1.9.21.ebuild index 84892e554c89..e44f1073c041 100644 --- a/dev-haskell/hlint/hlint-1.9.21.ebuild +++ b/dev-haskell/hlint/hlint-1.9.21.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="emacs +gpl" RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?] diff --git a/dev-haskell/hscolour/hscolour-1.23-r1.ebuild b/dev-haskell/hscolour/hscolour-1.23-r1.ebuild index de818018461a..0311fb259f93 100644 --- a/dev-haskell/hscolour/hscolour-1.23-r1.ebuild +++ b/dev-haskell/hscolour/hscolour-1.23-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild index 66663b4ff7d3..8b07510a544b 100644 --- a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild +++ b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="dev-haskell/regex-posix:=[profile?] diff --git a/dev-haskell/lens/lens-4.6.0.1.ebuild b/dev-haskell/lens/lens-4.6.0.1.ebuild index 82f32a67e23a..0d9b27dfea63 100644 --- a/dev-haskell/lens/lens-4.6.0.1.ebuild +++ b/dev-haskell/lens/lens-4.6.0.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy" RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] diff --git a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild b/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild index 62c6cb97f2f7..6433befed799 100644 --- a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild +++ b/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/profunctors/profunctors-4.4.1.ebuild b/dev-haskell/profunctors/profunctors-4.4.1.ebuild index 3a7f5bbadd3f..eb2d166ce162 100644 --- a/dev-haskell/profunctors/profunctors-4.4.1.ebuild +++ b/dev-haskell/profunctors/profunctors-4.4.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] diff --git a/dev-haskell/reflection/reflection-1.5.2.1.ebuild b/dev-haskell/reflection/reflection-1.5.2.1.ebuild index 2207a22dc170..125757139b86 100644 --- a/dev-haskell/reflection/reflection-1.5.2.1.ebuild +++ b/dev-haskell/reflection/reflection-1.5.2.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+template-haskell" RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] diff --git a/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild b/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild index 0c96f45aa795..8d3e1a79955f 100644 --- a/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild +++ b/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+comonad +containers +contravariant +distributive" RESTRICT="test" diff --git a/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild b/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild index 7e98431e0cb7..0a9038132c62 100644 --- a/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild +++ b/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-lang/ghc-7.4.1:= diff --git a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild index 65656626d027..81f256dd419f 100644 --- a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild +++ b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="dev-haskell/haskell-src-exts:=[profile?] diff --git a/dev-haskell/uniplate/uniplate-1.6.12.ebuild b/dev-haskell/uniplate/uniplate-1.6.12.ebuild index cb51d2e99f90..c2519f365f81 100644 --- a/dev-haskell/uniplate/uniplate-1.6.12.ebuild +++ b/dev-haskell/uniplate/uniplate-1.6.12.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] diff --git a/dev-java/icu4j/icu4j-55.1.ebuild b/dev-java/icu4j/icu4j-55.1.ebuild index d3da6dc459b4..ea3cf7e979a1 100644 --- a/dev-java/icu4j/icu4j-55.1.ebuild +++ b/dev-java/icu4j/icu4j-55.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz" LICENSE="icu" SLOT="55" -KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" # Beware of jdk version dependant code #361593 diff --git a/dev-lang/go/go-1.6-r2.ebuild b/dev-lang/go/go-1.6-r2.ebuild index 9c21fe2b1f53..afea3d7a0710 100644 --- a/dev-lang/go/go-1.6-r2.ebuild +++ b/dev-lang/go/go-1.6-r2.ebuild @@ -39,7 +39,7 @@ else case ${PV} in *9999*|*_rc*) ;; *) - KEYWORDS="-* ~amd64 ~arm64 ~amd64-fbsd ~x86-fbsd" + KEYWORDS="-* ~amd64 ~arm64 ~amd64-fbsd ~x86-fbsd ~x64-macos" ;; esac fi diff --git a/dev-lang/nwcc/Manifest b/dev-lang/nwcc/Manifest index f21b884b47b1..98170365464c 100644 --- a/dev-lang/nwcc/Manifest +++ b/dev-lang/nwcc/Manifest @@ -1 +1,2 @@ DIST nwcc_0.8.2.tar.gz 948656 SHA256 e274626d79b98a5d869fb7edc6264957c37addce80dc028346769e73c62f9d96 SHA512 b399baf16a41ae3782343521fc65b8e94bf76dc0a29719a3addc33881bd0d9dd68170f0e7eb2c79aaafa3ced254fac15847883a38d4a5956280fa5fed10d24e0 WHIRLPOOL da2c47fdf130ff5ad7105345a16b540529adee8e3d3a9669c08db48f17da5a0fefc1aabac8c98625731c725cf9cc9e2627a0a9a393951aff6d70cb859335b7ee +DIST nwcc_0.8.3.tar.gz 954946 SHA256 e64b16c663f2f845d6436342722d29a5e32d03602971de2d521281a18188b065 SHA512 f6af50bd18e13070b512bfac6659f49d10d3ad65ea2c4c5ca3f199c8b87540ec145c7dbbe97272f48903ca1c8afaf58c146ec763c851da0b352d5980746f94f6 WHIRLPOOL 623ef09dfd161542c45e8f5cba275be218094b6d702c46fb15aac37397ab6ec53ae5f0160620ea8e27a6f45b6ee15cefe2b3a4541624dbf7cd1aabda0284deab diff --git a/dev-lang/nwcc/nwcc-0.8.3.ebuild b/dev-lang/nwcc/nwcc-0.8.3.ebuild new file mode 100644 index 000000000000..2d4b6860d189 --- /dev/null +++ b/dev-lang/nwcc/nwcc-0.8.3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MY_P="${PN}_${PV}" + +DESCRIPTION="Nils Weller's C Compiler" +HOMEPAGE="http://nwcc.sourceforge.net/index.html" +SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}/nwcc%200.8.3/${MY_P}.tar.gz" +SLOT="0" +LICENSE="BSD-2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + # custom hackery hack + ABI="" ./configure --installprefix=/usr || die +} diff --git a/dev-lang/perl/files/eblits/src_configure-v50180002.eblit b/dev-lang/perl/files/eblits/src_configure-v50180002.eblit index 018ed283beae..05fa86b6bcd4 100644 --- a/dev-lang/perl/files/eblits/src_configure-v50180002.eblit +++ b/dev-lang/perl/files/eblits/src_configure-v50180002.eblit @@ -107,6 +107,46 @@ eblit-perl-src_configure() { myconf -Dnoextensions="${disabled_extensions}" + echo Configuring Perl as follows: + echo sh Configure \ + -des \ + -Duseshrplib \ + -Darchname="${myarch}" \ + -Dcc="$(tc-getCC)" \ + -Doptimize="${CFLAGS}" \ + -Dldflags="${LDFLAGS}" \ + -Dprefix="${EPREFIX}"'/usr' \ + -Dinstallprefix="${EPREFIX}"'/usr' \ + -Dsiteprefix="${EPREFIX}"'/usr/local' \ + -Dvendorprefix="${EPREFIX}"'/usr' \ + -Dscriptdir="${EPREFIX}"'/usr/bin' \ + -Dprivlib="${EPREFIX}${PRIV_LIB}" \ + -Darchlib="${EPREFIX}${ARCH_LIB}" \ + -Dsitelib="${EPREFIX}${SITE_LIB}" \ + -Dsitearch="${EPREFIX}${SITE_ARCH}" \ + -Dvendorlib="${EPREFIX}${VENDOR_LIB}" \ + -Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \ + -Dman1dir="${EPREFIX}"/usr/share/man/man1 \ + -Dman3dir="${EPREFIX}"/usr/share/man/man3 \ + -Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \ + -Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \ + -Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \ + -Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \ + -Dman1ext='1' \ + -Dman3ext='3pm' \ + -Dlibperl="${LIBPERL}" \ + -Dlocincpth="${EPREFIX}"'/usr/include ' \ + -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \ + -Duselargefiles \ + -Dd_semctl_semun \ + -Dcf_by='Gentoo' \ + -Dmyhostname='localhost' \ + -Dperladmin='root@localhost' \ + -Dinstallusrbinperl='n' \ + -Ud_csh \ + -Uusenm \ + "${myconf[@]}" + sh Configure \ -des \ -Duseshrplib \ diff --git a/dev-lang/regina-rexx/Manifest b/dev-lang/regina-rexx/Manifest index 64d09cb87597..6b6e69bd676d 100644 --- a/dev-lang/regina-rexx/Manifest +++ b/dev-lang/regina-rexx/Manifest @@ -1 +1,2 @@ DIST Regina-REXX-3.6.tar.gz 1140272 SHA256 687a52327b74e75cf383c427268346ef884c9aed6cdd7d3108feff2171ecfbcc SHA512 07a65c633da97e2a696c3d038808fa377af05f99fef2322398f4712726f4b7311957afeb9e2c18988feb29392ef06ddae7f7bde1a7574af0b0e8bbd286aa2e8e WHIRLPOOL be930cd0e8cf96a95eccf61d711ec633d7acfaf7b383f2633ac696bddbf8c01ab2ba2ef4bda8cf0f4f9404128e9f3eabbb3168864a5b93360f46b5f09fa1feb1 +DIST Regina-REXX-3.9.1.tar.gz 1358458 SHA256 5d13df26987e27f25e7779a2efa87a5775213beeda449a9efac59b57a5d5f3ee SHA512 679d146d68598ccca28c4e66a12ab898d5bfb77e2e5d64ce5ffc9159b982dcda419815a83b05e5dfbe3acea84f8f59955726a6466defefe1ac24646c46609677 WHIRLPOOL f46e60eb15b290cf8ad0488eae1a4073155051d8be18a7118020937e81de91b4758b08e48f897be0e19dd382f99755b51d9c81368b7d894d2aa373b152921cdc diff --git a/dev-lang/regina-rexx/regina-rexx-3.9.1.ebuild b/dev-lang/regina-rexx/regina-rexx-3.9.1.ebuild new file mode 100644 index 000000000000..9b932ad84bf2 --- /dev/null +++ b/dev-lang/regina-rexx/regina-rexx-3.9.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +inherit autotools eutils toolchain-funcs + +DESCRIPTION="Portable Rexx interpreter" +HOMEPAGE="http://regina-rexx.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/Regina-REXX-${PV}.tar.gz" + +LICENSE="LGPL-2.1 MPL-1.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +S=${WORKDIR}/Regina-REXX-${PV} + +MAKEOPTS+=" -j1" + +DOCS=( BUGS HACKERS.txt README.Unix README_SAFE TODO ) + +src_prepare() { + sed -e 's/CFLAGS=/UPSTREAM_CFLAGS=/' -i common/incdebug.m4 || die + + eautoconf + tc-export CC #don't move it as tc-getCC +} + +src_compile() { + emake LIBEXE="$(tc-getAR)" +} + +src_install() { + default + newinitd "${FILESDIR}"/rxstack-r1 rxstack +} + +pkg_postinst() { + elog "You may want to run" + elog + elog "\trc-update add rxstack default" + elog + elog "to enable Rexx queues (optional)." +} diff --git a/dev-libs/gf-complete/gf-complete-2.0.0.ebuild b/dev-libs/gf-complete/gf-complete-2.0.0.ebuild index c6c2fbc03f36..7acedb565a74 100644 --- a/dev-libs/gf-complete/gf-complete-2.0.0.ebuild +++ b/dev-libs/gf-complete/gf-complete-2.0.0.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}.git" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="" DEPEND="" diff --git a/dev-libs/jerasure/jerasure-2.0.0.ebuild b/dev-libs/jerasure/jerasure-2.0.0.ebuild index 8ce2a8ddad9e..70c285dbb816 100644 --- a/dev-libs/jerasure/jerasure-2.0.0.ebuild +++ b/dev-libs/jerasure/jerasure-2.0.0.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}.git" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="" DEPEND="dev-libs/gf-complete" diff --git a/dev-libs/liberasurecode/liberasurecode-1.0.8-r1.ebuild b/dev-libs/liberasurecode/liberasurecode-1.0.8-r1.ebuild index 20980abbd0de..0ed5b1fbfe81 100644 --- a/dev-libs/liberasurecode/liberasurecode-1.0.8-r1.ebuild +++ b/dev-libs/liberasurecode/liberasurecode-1.0.8-r1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/tsg--${PN}-${CUSTOM_VERSION}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="doc static-libs" RDEPEND="" diff --git a/dev-libs/libfilezilla/libfilezilla-0.3.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.3.1.ebuild index 2139f8e583c9..d7530f4f0811 100644 --- a/dev-libs/libfilezilla/libfilezilla-0.3.1.ebuild +++ b/dev-libs/libfilezilla/libfilezilla-0.3.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="test" RDEPEND="" diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index ddc4c31f1528..e16c5f3b9a73 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,7 +1,2 @@ -DIST openssl-0.9.8zg.tar.gz 3826891 SHA256 06500060639930e471050474f537fcd28ec934af92ee282d78b52460fbe8f580 SHA512 c757454de321d168ac6d89fe2859966a9f07a8b28305bf697af9018db13fc457e0883346b3d35977461ab058442375563554ecb2a8756a687ff9fc2fdd9103c9 WHIRLPOOL 55ecf50a264a2ddd9b5755b5d90b9b736d2f27e0ba2fd529ccff3b68bbd726d1f60460182a0d215ae6712dbc4d3ef2df11339fb2d8424e049f54c3e904fcfab0 DIST openssl-0.9.8zh.tar.gz 3818524 SHA256 f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 WHIRLPOOL 8ed3362e6aed89cd6ae02438bc3fb58ff3a91afb8a2d401d1d66c1ee4fd96f4befb50558131dd03a60fc15b588172fc1ede5d56bb1f68e184453bfe3b34f9abf -DIST openssl-1.0.1p.tar.gz 4560208 SHA256 bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 SHA512 64e475c53a85b78de7c5aa71a22d4bb3a456142842373ebf8f22e9857cb0352b646e591b21af866933baecdbdb5ac4a22aeb64914440c53a0f30cd25914029e5 WHIRLPOOL 2a81f3b9274e3fef37a2a88e3084d8283159b3a61db08e7805879905c87a74faa85bc6e570d18525741bd5c27c34fe09eeb58b2bfe500545d0f304716e14f819 -DIST openssl-1.0.1r.tar.gz 4547786 SHA256 784bd8d355ed01ce98b812f873f8b2313da61df7c7b5677fcf2e57b0863a3346 SHA512 7a5a2efe5d9421ea6f4f86f75ed40b4459b3825355ad18da3bdba28393bc50a6f457b2e1f11a31828f1af0d62a716d258ac7868fb719c9997f3bc750a1723e86 WHIRLPOOL de9c92f5ddb9bcaac967ac735696e739f5762b7d3a0b2430dbfa0c6cd7ac021fdf3c3257255a2fe995f24aa3550d59ce3067f030f09acc5d43b61dfda627686a -DIST openssl-1.0.2e.tar.gz 5256555 SHA256 e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff SHA512 b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f WHIRLPOOL 8e1c1800a66f57fa78dc391e717e4b2bdf0e6e37a837c5ac033d7a4b1a6437451c7e7540c4ec2f75f936a2d2ef4f9293b42c76f51b0c9c93706639589612f196 DIST openssl-1.0.2f.tar.gz 5258384 SHA256 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c SHA512 50abf6dc94cafd06e7fd20770808bdc675c88daa369e4f752bd584ab17f72a57357c1ca1eca3c83e6745b5a3c9c73c99dce70adaa904d73f6df4c75bc7138351 WHIRLPOOL 179e1b5ad38c50a4c8110024aa7b33c53634c39690917e3bf5c2099548430beef96132ae9f9588ff0cedd6e08bb216a8d36835baaaa04e506fb3fbaed37d31c9 -DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1 diff --git a/dev-libs/openssl/files/gentoo.config-1.0.1 b/dev-libs/openssl/files/gentoo.config-1.0.1 deleted file mode 100644 index 24c995a04f15..000000000000 --- a/dev-libs/openssl/files/gentoo.config-1.0.1 +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -# -# Openssl doesn't play along nicely with cross-compiling -# like autotools based projects, so let's teach it new tricks. -# -# Review the bundled 'config' script to see why kind of targets -# we can pass to the 'Configure' script. - - -# Testing routines -if [[ $1 == "test" ]] ; then - for c in \ - "arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \ - "armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \ - "x86_64-pc-linux-gnu |linux-x86_64" \ - "alpha-linux-gnu |linux-alpha-gcc" \ - "alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \ - "i686-pc-linux-gnu |linux-elf" \ - "whatever-gentoo-freebsdX.Y |BSD-generic32" \ - "i686-gentoo-freebsdX.Y |BSD-x86-elf" \ - "sparc64-alpha-freebsdX.Y |BSD-sparc64" \ - "ia64-gentoo-freebsd5.99234 |BSD-ia64" \ - "x86_64-gentoo-freebsdX.Y |BSD-x86_64" \ - "hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \ - "powerpc-gentOO-linux-uclibc |linux-ppc" \ - "powerpc64-unk-linux-gnu |linux-ppc64" \ - "x86_64-apple-darwinX |darwin64-x86_64-cc" \ - "powerpc64-apple-darwinX |darwin64-ppc-cc" \ - "i686-apple-darwinX |darwin-i386-cc" \ - "i386-apple-darwinX |darwin-i386-cc" \ - "powerpc-apple-darwinX |darwin-ppc-cc" \ - "i586-pc-winnt |winnt-parity" \ - "s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \ - "s390x-linux-gnu |linux64-s390x" \ - ;do - CHOST=${c/|*} - ret_want=${c/*|} - ret_got=$(CHOST=${CHOST} "$0") - - if [[ ${ret_want} == "${ret_got}" ]] ; then - echo "PASS: ${CHOST}" - else - echo "FAIL: ${CHOST}" - echo -e "\twanted: ${ret_want}" - echo -e "\twe got: ${ret_got}" - fi - done - exit 0 -fi -[[ -z ${CHOST} && -n $1 ]] && CHOST=$1 - - -# Detect the operating system -case ${CHOST} in - *-aix*) system="aix";; - *-darwin*) system="darwin";; - *-freebsd*) system="BSD";; - *-hpux*) system="hpux";; - *-linux*) system="linux";; - *-solaris*) system="solaris";; - *-winnt*) system="winnt";; - x86_64-*-mingw*) system="mingw64";; - *mingw*) system="mingw";; - *) exit 0;; -esac - - -# Compiler munging -compiler="gcc" -if [[ ${CC} == "ccc" ]] ; then - compiler=${CC} -fi - - -# Detect target arch -machine="" -chost_machine=${CHOST%%-*} -case ${system} in -linux) - case ${chost_machine}:${ABI} in - aarch64*be) machine="generic64 -DB_ENDIAN";; - aarch64*) machine="generic64 -DL_ENDIAN";; - alphaev56*|\ - alphaev[678]*)machine=alpha+bwx-${compiler};; - alpha*) machine=alpha-${compiler};; - armv[4-9]*b*) machine="armv4 -DB_ENDIAN";; - armv[4-9]*) machine="armv4 -DL_ENDIAN";; - arm*b*) machine="generic32 -DB_ENDIAN";; - arm*) machine="generic32 -DL_ENDIAN";; - avr*) machine="generic32 -DL_ENDIAN";; - bfin*) machine="generic32 -DL_ENDIAN";; - # hppa64*) machine=parisc64;; - hppa*) machine="generic32 -DB_ENDIAN";; - i[0-9]86*|\ - x86_64*:x86) machine=elf;; - ia64*) machine=ia64;; - m68*) machine="generic32 -DB_ENDIAN";; - mips*el*) machine="generic32 -DL_ENDIAN";; - mips*) machine="generic32 -DB_ENDIAN";; - powerpc64*le) machine="generic64 -DL_ENDIAN";; - powerpc64*) machine=ppc64;; - powerpc*le) machine="generic32 -DL_ENDIAN";; - powerpc*) machine=ppc;; - # sh64*) machine=elf;; - sh*b*) machine="generic32 -DB_ENDIAN";; - sh*) machine="generic32 -DL_ENDIAN";; - sparc*v7*) machine="generic32 -DB_ENDIAN";; - sparc64*) machine=sparcv9;; - sparc*) machine=sparcv8;; - s390x*) machine=s390x system=linux64;; - s390*) machine="generic32 -DB_ENDIAN";; - x86_64*:x32) machine=x32;; - x86_64*) machine=x86_64;; - esac - ;; -BSD) - case ${chost_machine} in - alpha*) machine=generic64;; - i[6-9]86*) machine=x86-elf;; - ia64*) machine=ia64;; - sparc64*) machine=sparc64;; - x86_64*) machine=x86_64;; - *) machine=generic32;; - esac - ;; -aix) - machine=${compiler} - ;; -darwin) - case ${chost_machine} in - powerpc64) machine=ppc-cc; system=${system}64;; - powerpc) machine=ppc-cc;; - i?86*) machine=i386-cc;; - x86_64) machine=x86_64-cc; system=${system}64;; - esac - ;; -hpux) - case ${chost_machine} in - ia64) machine=ia64-${compiler} ;; - esac - ;; -solaris) - case ${chost_machine} in - i386) machine=x86-${compiler} ;; - x86_64*) machine=x86_64-${compiler}; system=${system}64;; - sparcv9*) machine=sparcv9-${compiler}; system=${system}64;; - sparc*) machine=sparcv8-${compiler};; - esac - ;; -winnt) - machine=parity - ;; -mingw*) - # special case ... no xxx-yyy style name - echo ${system} - ;; -esac - - -# If we have something, show it -[[ -n ${machine} ]] && echo ${system}-${machine} diff --git a/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch b/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch deleted file mode 100644 index 66fd8220c5b0..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://rt.openssl.org/Ticket/Display.html?id=3332&user=guest&pass=guest - -depend on other pc files rather than encoding library info directly in -every pkg-config file - ---- a/Makefile.org -+++ b/Makefile.org -@@ -335,11 +335,11 @@ libssl.pc: Makefile - echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ - echo 'includedir=$${prefix}/include'; \ - echo ''; \ -- echo 'Name: OpenSSL'; \ -+ echo 'Name: OpenSSL-libssl'; \ - echo 'Description: Secure Sockets Layer and cryptography libraries'; \ - echo 'Version: '$(VERSION); \ -- echo 'Requires: '; \ -- echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ -+ echo 'Requires.private: libcrypto'; \ -+ echo 'Libs: -L$${libdir} -lssl'; \ - echo 'Libs.private: $(EX_LIBS)'; \ - echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc - -@@ -352,10 +353,7 @@ openssl.pc: Makefile - echo 'Name: OpenSSL'; \ - echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ - echo 'Version: '$(VERSION); \ -- echo 'Requires: '; \ -- echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ -- echo 'Libs.private: $(EX_LIBS)'; \ -- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc -+ echo 'Requires: libssl libcrypto' ) > openssl.pc - - Makefile: Makefile.org Configure config - @echo "Makefile is older than Makefile.org, Configure or config." diff --git a/dev-libs/openssl/files/openssl-1.0.1f-revert-alpha-perl-generation.patch b/dev-libs/openssl/files/openssl-1.0.1f-revert-alpha-perl-generation.patch deleted file mode 100644 index 1a942d27ebd0..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.1f-revert-alpha-perl-generation.patch +++ /dev/null @@ -1,84 +0,0 @@ -https://bugs.gentoo.org/499086 -https://rt.openssl.org/Ticket/Display.html?id=3333&user=guest&pass=guest - -when gcc is given a .s file and told to preprocess it, it outputs nothing - -From a2976461784ce463fc7f336cd0dce607d21c2fad Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 25 Jan 2014 05:44:47 -0500 -Subject: [PATCH] Revert "Make Makefiles OSF-make-friendly." - -This reverts commit d1cf23ac86c05b22b8780e2c03b67230564d2d34. ---- - crypto/Makefile | 4 +--- - crypto/bn/Makefile | 4 +--- - crypto/evp/Makefile | 2 +- - crypto/modes/Makefile | 5 +---- - crypto/sha/Makefile | 4 +--- - util/shlib_wrap.sh | 6 +----- - 6 files changed, 6 insertions(+), 19 deletions(-) - -diff --git a/crypto/Makefile b/crypto/Makefile -index b253f50..1de9d5f 100644 ---- a/crypto/Makefile -+++ b/crypto/Makefile -@@ -86,9 +86,7 @@ ia64cpuid.s: ia64cpuid.S; $(CC) $(CFLAGS) -E ia64cpuid.S > $@ - ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@ - pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@ - alphacpuid.s: alphacpuid.pl -- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \ -- $(PERL) alphacpuid.pl > $$preproc && \ -- $(CC) -E $$preproc > $@ && rm $$preproc) -+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null - - subdirs: - @target=all; $(RECURSIVE_MAKE) -diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile -index b62b676..6c03363 100644 ---- a/crypto/bn/Makefile -+++ b/crypto/bn/Makefile -@@ -136,9 +136,7 @@ ppc-mont.s: asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@ - ppc64-mont.s: asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@ - - alpha-mont.s: asm/alpha-mont.pl -- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \ -- $(PERL) asm/alpha-mont.pl > $$preproc && \ -- $(CC) -E $$preproc > $@ && rm $$preproc) -+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null - - # GNU make "catch all" - %-mont.S: asm/%-mont.pl; $(PERL) $< $(PERLASM_SCHEME) $@ -diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile -index ce0dcd6..88ac65e 100644 ---- a/crypto/modes/Makefile -+++ b/crypto/modes/Makefile -@@ -55,10 +55,7 @@ aesni-gcm-x86_64.s: asm/aesni-gcm-x86_64.pl - ghash-sparcv9.s: asm/ghash-sparcv9.pl - $(PERL) asm/ghash-sparcv9.pl $@ $(CFLAGS) - ghash-alpha.s: asm/ghash-alpha.pl -- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \ -- $(PERL) asm/ghash-alpha.pl > $$preproc && \ -- $(CC) -E $$preproc > $@ && rm $$preproc) -- -+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null - ghash-parisc.s: asm/ghash-parisc.pl - $(PERL) asm/ghash-parisc.pl $(PERLASM_SCHEME) $@ - -diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile -index 64eab6c..63fba69 100644 ---- a/crypto/sha/Makefile -+++ b/crypto/sha/Makefile -@@ -60,9 +60,7 @@ sha256-armv4.S: asm/sha256-armv4.pl - $(PERL) $< $(PERLASM_SCHEME) $@ - - sha1-alpha.s: asm/sha1-alpha.pl -- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \ -- $(PERL) asm/sha1-alpha.pl > $$preproc && \ -- $(CC) -E $$preproc > $@ && rm $$preproc) -+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null - - # Solaris make has to be explicitly told - sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@ --- -1.8.5.3 - diff --git a/dev-libs/openssl/files/openssl-1.0.1m-ipv6.patch b/dev-libs/openssl/files/openssl-1.0.1m-ipv6.patch deleted file mode 100644 index 34a7e53c08ca..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.1m-ipv6.patch +++ /dev/null @@ -1,618 +0,0 @@ -http://rt.openssl.org/Ticket/Display.html?id=2051&user=guest&pass=guest - -Forward ported from openssl-1.0.1h-ipv6.patch - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> - ---- openssl-1.0.1m/apps/s_apps.h -+++ openssl-1.0.1m/apps/s_apps.h -@@ -153,7 +153,7 @@ typedef fd_mask fd_set; - - int do_server(int port, int type, int *ret, - int (*cb) (char *hostname, int s, unsigned char *context), -- unsigned char *context); -+ unsigned char *context, int use_ipv4, int use_ipv6); - #ifdef HEADER_X509_H - int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); - #endif -@@ -161,7 +161,8 @@ int MS_CALLBACK verify_callback(int ok, - int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file); - int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key); - #endif --int init_client(int *sock, char *server, int port, int type); -+int init_client(int *sock, char *server, int port, int type, -+ int use_ipv4, int use_ipv6); - int should_retry(int i); - int extract_port(char *str, short *port_ptr); - int extract_host_port(char *str, char **host_ptr, unsigned char *ip, ---- openssl-1.0.1m/apps/s_client.c -+++ openssl-1.0.1m/apps/s_client.c -@@ -299,6 +299,10 @@ static void sc_usage(void) - { - BIO_printf(bio_err, "usage: s_client args\n"); - BIO_printf(bio_err, "\n"); -+ BIO_printf(bio_err," -4 - use IPv4 only\n"); -+#if OPENSSL_USE_IPV6 -+ BIO_printf(bio_err," -6 - use IPv6 only\n"); -+#endif - BIO_printf(bio_err, " -host host - use -connect instead\n"); - BIO_printf(bio_err, " -port port - use -connect instead\n"); - BIO_printf(bio_err, -@@ -629,6 +633,7 @@ int MAIN(int argc, char **argv) - int sbuf_len, sbuf_off; - fd_set readfds, writefds; - short port = PORT; -+ int use_ipv4, use_ipv6; - int full_log = 1; - char *host = SSL_HOST_NAME; - char *cert_file = NULL, *key_file = NULL; -@@ -673,7 +678,11 @@ int MAIN(int argc, char **argv) - #endif - char *sess_in = NULL; - char *sess_out = NULL; -- struct sockaddr peer; -+#if OPENSSL_USE_IPV6 -+ struct sockaddr_storage peer; -+#else -+ struct sockaddr_in peer; -+#endif - int peerlen = sizeof(peer); - int fallback_scsv = 0; - int enable_timeouts = 0; -@@ -689,6 +698,13 @@ int MAIN(int argc, char **argv) - - meth = SSLv23_client_method(); - -+ use_ipv4 = 1; -+#if OPENSSL_USE_IPV6 -+ use_ipv6 = 1; -+#else -+ use_ipv6 = 0; -+#endif -+ - apps_startup(); - c_Pause = 0; - c_quiet = 0; -@@ -985,6 +1001,16 @@ int MAIN(int argc, char **argv) - jpake_secret = *++argv; - } - #endif -+ else if (strcmp(*argv,"-4") == 0) { -+ use_ipv4 = 1; -+ use_ipv6 = 0; -+ } -+#if OPENSSL_USE_IPV6 -+ else if (strcmp(*argv,"-6") == 0) { -+ use_ipv4 = 0; -+ use_ipv6 = 1; -+ } -+#endif - #ifndef OPENSSL_NO_SRTP - else if (strcmp(*argv, "-use_srtp") == 0) { - if (--argc < 1) -@@ -1256,7 +1282,7 @@ int MAIN(int argc, char **argv) - - re_start: - -- if (init_client(&s, host, port, socket_type) == 0) { -+ if (init_client(&s, host, port, socket_type, use_ipv4, use_ipv6) == 0) { - BIO_printf(bio_err, "connect:errno=%d\n", get_last_socket_error()); - SHUTDOWN(s); - goto end; -@@ -1279,7 +1305,7 @@ int MAIN(int argc, char **argv) - if (SSL_version(con) == DTLS1_VERSION) { - - sbio = BIO_new_dgram(s, BIO_NOCLOSE); -- if (getsockname(s, &peer, (void *)&peerlen) < 0) { -+ if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0) { - BIO_printf(bio_err, "getsockname:errno=%d\n", - get_last_socket_error()); - SHUTDOWN(s); ---- openssl-1.0.1m/apps/s_server.c -+++ openssl-1.0.1m/apps/s_server.c -@@ -609,6 +609,10 @@ static void sv_usage(void) - " -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n"); - # endif - #endif -+ BIO_printf(bio_err," -4 - use IPv4 only\n"); -+#if OPENSSL_USE_IPV6 -+ BIO_printf(bio_err," -6 - use IPv6 only\n"); -+#endif - BIO_printf(bio_err, - " -keymatexport label - Export keying material using label\n"); - BIO_printf(bio_err, -@@ -1003,6 +1007,7 @@ int MAIN(int argc, char *argv[]) - int state = 0; - const SSL_METHOD *meth = NULL; - int socket_type = SOCK_STREAM; -+ int use_ipv4, use_ipv6; - ENGINE *e = NULL; - char *inrand = NULL; - int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM; -@@ -1031,6 +1036,13 @@ int MAIN(int argc, char *argv[]) - #endif - meth = SSLv23_server_method(); - -+ use_ipv4 = 1; -+#if OPENSSL_USE_IPV6 -+ use_ipv6 = 1; -+#else -+ use_ipv6 = 0; -+#endif -+ - local_argc = argc; - local_argv = argv; - -@@ -1356,6 +1368,16 @@ int MAIN(int argc, char *argv[]) - jpake_secret = *(++argv); - } - #endif -+ else if (strcmp(*argv,"-4") == 0) { -+ use_ipv4 = 1; -+ use_ipv6 = 0; -+ } -+#if OPENSSL_USE_IPV6 -+ else if (strcmp(*argv,"-6") == 0) { -+ use_ipv4 = 0; -+ use_ipv6 = 1; -+ } -+#endif - #ifndef OPENSSL_NO_SRTP - else if (strcmp(*argv, "-use_srtp") == 0) { - if (--argc < 1) -@@ -1850,9 +1872,11 @@ int MAIN(int argc, char *argv[]) - BIO_printf(bio_s_out, "ACCEPT\n"); - (void)BIO_flush(bio_s_out); - if (www) -- do_server(port, socket_type, &accept_socket, www_body, context); -+ do_server(port, socket_type, &accept_socket, www_body, context, -+ use_ipv4, use_ipv6); - else -- do_server(port, socket_type, &accept_socket, sv_body, context); -+ do_server(port, socket_type, &accept_socket, sv_body, context, -+ use_ipv4, use_ipv6); - print_stats(bio_s_out, ctx); - ret = 0; - end: ---- openssl-1.0.1m/apps/s_socket.c -+++ openssl-1.0.1m/apps/s_socket.c -@@ -101,16 +101,16 @@ typedef unsigned int u_int; - # include "netdb.h" - # endif - --static struct hostent *GetHostByName(char *name); -+static struct hostent *GetHostByName(char *name, int domain); - # if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)) - static void ssl_sock_cleanup(void); - # endif - static int ssl_sock_init(void); --static int init_client_ip(int *sock, unsigned char ip[4], int port, int type); --static int init_server(int *sock, int port, int type); --static int init_server_long(int *sock, int port, char *ip, int type); -+static int init_client_ip(int *sock, unsigned char *ip, int port, int type, int domain); -+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6); -+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6); - static int do_accept(int acc_sock, int *sock, char **host); --static int host_ip(char *str, unsigned char ip[4]); -+static int host_ip(char *str, unsigned char *ip, int domain); - - # ifdef OPENSSL_SYS_WIN16 - # define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ -@@ -231,38 +231,66 @@ static int ssl_sock_init(void) - return (1); - } - --int init_client(int *sock, char *host, int port, int type) -+int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6) - { -+#if OPENSSL_USE_IPV6 -+ unsigned char ip[16]; -+#else - unsigned char ip[4]; -+#endif - -- memset(ip, '\0', sizeof ip); -- if (!host_ip(host, &(ip[0]))) -- return 0; -- return init_client_ip(sock, ip, port, type); --} -- --static int init_client_ip(int *sock, unsigned char ip[4], int port, int type) --{ -- unsigned long addr; -+ if (use_ipv4) -+ if (host_ip(host,ip,AF_INET)) -+ return(init_client_ip(sock,ip,port,type,AF_INET)); -+#if OPENSSL_USE_IPV6 -+ if (use_ipv6) -+ if (host_ip(host,ip,AF_INET6)) -+ return(init_client_ip(sock,ip,port,type,AF_INET6)); -+#endif -+ return 0; -+} -+ -+static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain) -+{ -+#if OPENSSL_USE_IPV6 -+ struct sockaddr_storage them; -+ struct sockaddr_in *them_in = (struct sockaddr_in *)&them; -+ struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them; -+#else - struct sockaddr_in them; -+ struct sockaddr_in *them_in = &them; -+#endif -+ socklen_t addr_len; - int s, i; - - if (!ssl_sock_init()) - return (0); - - memset((char *)&them, 0, sizeof(them)); -- them.sin_family = AF_INET; -- them.sin_port = htons((unsigned short)port); -- addr = (unsigned long) -- ((unsigned long)ip[0] << 24L) | -- ((unsigned long)ip[1] << 16L) | -- ((unsigned long)ip[2] << 8L) | ((unsigned long)ip[3]); -- them.sin_addr.s_addr = htonl(addr); -+ if (domain == AF_INET) { -+ addr_len = (socklen_t)sizeof(struct sockaddr_in); -+ them_in->sin_family=AF_INET; -+ them_in->sin_port=htons((unsigned short)port); -+#ifndef BIT_FIELD_LIMITS -+ memcpy(&them_in->sin_addr.s_addr, ip, 4); -+#else -+ memcpy(&them_in->sin_addr, ip, 4); -+#endif -+ } else { -+#if OPENSSL_USE_IPV6 -+ addr_len = (socklen_t)sizeof(struct sockaddr_in6); -+ them_in6->sin6_family=AF_INET6; -+ them_in6->sin6_port=htons((unsigned short)port); -+ memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr)); -+ } -+#else -+ return(0); -+#endif - - if (type == SOCK_STREAM) -- s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL); -+ s = socket(domain, SOCK_STREAM, SOCKET_PROTOCOL); - else /* ( type == SOCK_DGRAM) */ -- s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); -+ s = socket(domain, SOCK_DGRAM, IPPROTO_UDP); - - if (s == INVALID_SOCKET) { - perror("socket"); -@@ -280,7 +308,7 @@ static int init_client_ip(int *sock, uns - } - # endif - -- if (connect(s, (struct sockaddr *)&them, sizeof(them)) == -1) { -+ if (connect(s, (struct sockaddr *)&them, addr_len) == -1) { - closesocket(s); - perror("connect"); - return (0); -@@ -291,14 +319,14 @@ static int init_client_ip(int *sock, uns - - int do_server(int port, int type, int *ret, - int (*cb) (char *hostname, int s, unsigned char *context), -- unsigned char *context) -+ unsigned char *context, int use_ipv4, int use_ipv6) - { - int sock; - char *name = NULL; - int accept_socket = 0; - int i; - -- if (!init_server(&accept_socket, port, type)) -+ if (!init_server(&accept_socket, port, type, use_ipv4, use_ipv6)) - return (0); - - if (ret != NULL) { -@@ -325,32 +353,45 @@ int do_server(int port, int type, int *r - } - } - --static int init_server_long(int *sock, int port, char *ip, int type) -+static int init_server_long(int *sock, int port, char *ip, int type, -+ int use_ipv4, int use_ipv6) - { - int ret = 0; -+ int domain; -+#if OPENSSL_USE_IPV6 -+ struct sockaddr_storage server; -+ struct sockaddr_in *server_in = (struct sockaddr_in *)&server; -+ struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server; -+#else - struct sockaddr_in server; -+ struct sockaddr_in *server_in = &server; -+#endif -+ socklen_t addr_len; - int s = -1; - -+ if (!use_ipv4 && !use_ipv6) -+ goto err; -+#if OPENSSL_USE_IPV6 -+ /* -+ * we are fine here -+ */ -+#else -+ if (use_ipv6) -+ goto err; -+#endif - if (!ssl_sock_init()) - return (0); - -- memset((char *)&server, 0, sizeof(server)); -- server.sin_family = AF_INET; -- server.sin_port = htons((unsigned short)port); -- if (ip == NULL) -- server.sin_addr.s_addr = INADDR_ANY; -- else --/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */ --# ifndef BIT_FIELD_LIMITS -- memcpy(&server.sin_addr.s_addr, ip, 4); -+#if OPENSSL_USE_IPV6 -+ domain = use_ipv6 ? AF_INET6 : AF_INET; - # else -- memcpy(&server.sin_addr, ip, 4); -+ domain = AF_INET; - # endif - - if (type == SOCK_STREAM) -- s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL); -+ s = socket(domain, SOCK_STREAM, SOCKET_PROTOCOL); - else /* type == SOCK_DGRAM */ -- s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); -+ s = socket(domain, SOCK_DGRAM, IPPROTO_UDP); - - if (s == INVALID_SOCKET) - goto err; -@@ -360,7 +401,44 @@ static int init_server_long(int *sock, i - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof j); - } - # endif -- if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) { -+#if OPENSSL_USE_IPV6 -+ if ((use_ipv4 == 0) && (use_ipv6 == 1)) { -+ const int on = 1; -+ -+ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, -+ (const void *) &on, sizeof(int)); -+ } -+#endif -+ if (domain == AF_INET) { -+ addr_len = (socklen_t)sizeof(struct sockaddr_in); -+ memset(server_in, 0, sizeof(struct sockaddr_in)); -+ server_in->sin_family=AF_INET; -+ server_in->sin_port = htons((unsigned short)port); -+ if (ip == NULL) -+ server_in->sin_addr.s_addr = htonl(INADDR_ANY); -+ else -+/* -+ * Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) -+ */ -+#ifndef BIT_FIELD_LIMITS -+ memcpy(&server_in->sin_addr.s_addr, ip, 4); -+#else -+ memcpy(&server_in->sin_addr, ip, 4); -+#endif -+ } -+#if OPENSSL_USE_IPV6 -+ else { -+ addr_len = (socklen_t)sizeof(struct sockaddr_in6); -+ memset(server_in6, 0, sizeof(struct sockaddr_in6)); -+ server_in6->sin6_family = AF_INET6; -+ server_in6->sin6_port = htons((unsigned short)port); -+ if (ip == NULL) -+ server_in6->sin6_addr = in6addr_any; -+ else -+ memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr)); -+ } -+#endif -+ if (bind(s, (struct sockaddr *)&server, addr_len) == -1) { - # ifndef OPENSSL_SYS_WINDOWS - perror("bind"); - # endif -@@ -378,16 +456,24 @@ static int init_server_long(int *sock, i - return (ret); - } - --static int init_server(int *sock, int port, int type) -+static int init_server(int *sock, int port, int type, -+ int use_ipv4, int use_ipv6) - { -- return (init_server_long(sock, port, NULL, type)); -+ return (init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6)); - } - - static int do_accept(int acc_sock, int *sock, char **host) - { - int ret; - struct hostent *h1, *h2; -+#if OPENSSL_USE_IPV6 -+ struct sockaddr_storage from; -+ struct sockaddr_in *from_in = (struct sockaddr_in *)&from; -+ struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from; -+#else - static struct sockaddr_in from; -+ struct sockaddr_in *from_in = &from; -+#endif - int len; - /* struct linger ling; */ - -@@ -437,14 +523,24 @@ static int do_accept(int acc_sock, int * - - if (host == NULL) - goto end; -+#if OPENSSL_USE_IPV6 -+ if (from.ss_family == AF_INET) -+#else -+ if (from.sin_family == AF_INET) -+#endif - # ifndef BIT_FIELD_LIMITS - /* I should use WSAAsyncGetHostByName() under windows */ -- h1 = gethostbyaddr((char *)&from.sin_addr.s_addr, -- sizeof(from.sin_addr.s_addr), AF_INET); -+ h1 = gethostbyaddr((char *)&from_in->sin_addr.s_addr, -+ sizeof(from_in->sin_addr.s_addr), AF_INET); - # else -- h1 = gethostbyaddr((char *)&from.sin_addr, -+ h1 = gethostbyaddr((char *)&from_in->sin_addr, - sizeof(struct in_addr), AF_INET); - # endif -+#if OPENSSL_USE_IPV6 -+ else -+ h1 = gethostbyaddr((char *)&from_in6->sin6_addr, -+ sizeof(struct in6_addr), AF_INET6); -+#endif - if (h1 == NULL) { - BIO_printf(bio_err, "bad gethostbyaddr\n"); - *host = NULL; -@@ -457,14 +553,23 @@ static int do_accept(int acc_sock, int * - } - BUF_strlcpy(*host, h1->h_name, strlen(h1->h_name) + 1); - -- h2 = GetHostByName(*host); -+#if OPENSSL_USE_IPV6 -+ h2 = GetHostByName(*host, from.ss_family); -+#else -+ h2 = GetHostByName(*host, from.sin_family); -+#endif -+ - if (h2 == NULL) { - BIO_printf(bio_err, "gethostbyname failure\n"); - closesocket(ret); - return (0); - } -- if (h2->h_addrtype != AF_INET) { -- BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n"); -+#if OPENSSL_USE_IPV6 -+ if (h2->h_addrtype != from.ss_family) { -+#else -+ if (h2->h_addrtype != from.sin_family) { -+#endif -+ BIO_printf(bio_err, "gethostbyname addr address is not correct\n"); - closesocket(ret); - return (0); - } -@@ -480,14 +585,14 @@ int extract_host_port(char *str, char ** - char *h, *p; - - h = str; -- p = strchr(str, ':'); -+ p = strrchr(str, ':'); - if (p == NULL) { - BIO_printf(bio_err, "no port defined\n"); - return (0); - } - *(p++) = '\0'; - -- if ((ip != NULL) && !host_ip(str, ip)) -+ if ((ip != NULL) && !host_ip(str, ip, AF_INET)) - goto err; - if (host_ptr != NULL) - *host_ptr = h; -@@ -499,44 +604,54 @@ int extract_host_port(char *str, char ** - return (0); - } - --static int host_ip(char *str, unsigned char ip[4]) -+static int host_ip(char *str, unsigned char *ip, int domain) - { - unsigned int in[4]; -+ unsigned long l; - int i; - -- if (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) == -- 4) { -+ if ((domain == AF_INET) && -+ (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) == -+ 4)) { - for (i = 0; i < 4; i++) - if (in[i] > 255) { - BIO_printf(bio_err, "invalid IP address\n"); - goto err; - } -- ip[0] = in[0]; -- ip[1] = in[1]; -- ip[2] = in[2]; -- ip[3] = in[3]; -- } else { /* do a gethostbyname */ -+ l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]); -+ memcpy(ip, &l, 4); -+ return 1; -+ } -+#if OPENSSL_USE_IPV6 -+ else if ((domain == AF_INET6) && -+ (inet_pton(AF_INET6, str, ip) == 1)) -+ return 1; -+#endif -+ else { /* do a gethostbyname */ - struct hostent *he; - - if (!ssl_sock_init()) - return (0); - -- he = GetHostByName(str); -+ he = GetHostByName(str, domain); - if (he == NULL) { - BIO_printf(bio_err, "gethostbyname failure\n"); - goto err; - } - /* cast to short because of win16 winsock definition */ -- if ((short)he->h_addrtype != AF_INET) { -- BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n"); -+ if ((short)he->h_addrtype != domain) { -+ BIO_printf(bio_err, "gethostbyname addr family is not correct\n"); - return (0); - } -- ip[0] = he->h_addr_list[0][0]; -- ip[1] = he->h_addr_list[0][1]; -- ip[2] = he->h_addr_list[0][2]; -- ip[3] = he->h_addr_list[0][3]; -+ if (domain == AF_INET) -+ memset(ip, 0, 4); -+#if OPENSSL_USE_IPV6 -+ else -+ memset(ip, 0, 16); -+#endif -+ memcpy(ip, he->h_addr_list[0], he->h_length); -+ return 1; - } -- return (1); - err: - return (0); - } -@@ -570,7 +685,7 @@ static struct ghbn_cache_st { - static unsigned long ghbn_hits = 0L; - static unsigned long ghbn_miss = 0L; - --static struct hostent *GetHostByName(char *name) -+static struct hostent *GetHostByName(char *name, int domain) - { - struct hostent *ret; - int i, lowi = 0; -@@ -582,13 +697,19 @@ static struct hostent *GetHostByName(cha - lowi = i; - } - if (ghbn_cache[i].order > 0) { -- if (strncmp(name, ghbn_cache[i].name, 128) == 0) -+ if ((strncmp(name, ghbn_cache[i].name, 128) == 0) && -+ (ghbn_cache[i].ent.h_addrtype == domain)) - break; - } - } - if (i == GHBN_NUM) { /* no hit */ - ghbn_miss++; -- ret = gethostbyname(name); -+ if (domain == AF_INET) -+ ret = gethostbyname(name); -+#if OPENSSL_USE_IPV6 -+ else -+ ret=gethostbyname2(name, AF_INET6); -+#endif - if (ret == NULL) - return (NULL); - /* else add to cache */ diff --git a/dev-libs/openssl/files/openssl-1.0.1m-x32.patch b/dev-libs/openssl/files/openssl-1.0.1m-x32.patch deleted file mode 100644 index 48717a569a23..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.1m-x32.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- openssl-1.0.1m/Configure -+++ openssl-1.0.1m/Configure -@@ -361,6 +361,7 @@ my %table=( - "linux-ia64-ecc","ecc:-DL_ENDIAN -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-x86_64", "gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+"linux-x32", "gcc:-DL_ENDIAN -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux64-s390x", "gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", - #### So called "highgprs" target for z/Architecture CPUs - # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see ---- openssl-1.0.1m/crypto/bn/asm/x86_64-gcc.c -+++ openssl-1.0.1m/crypto/bn/asm/x86_64-gcc.c -@@ -55,7 +55,7 @@ - * machine. - */ - --# ifdef _WIN64 -+# if defined _WIN64 || !defined __LP64__ - # define BN_ULONG unsigned long long - # else - # define BN_ULONG unsigned long -@@ -211,9 +211,9 @@ BN_ULONG bn_add_words(BN_ULONG *rp, cons - - asm volatile (" subq %2,%2 \n" - ".p2align 4 \n" -- "1: movq (%4,%2,8),%0 \n" -- " adcq (%5,%2,8),%0 \n" -- " movq %0,(%3,%2,8) \n" -+ "1: movq (%q4,%2,8),%0 \n" -+ " adcq (%q5,%2,8),%0 \n" -+ " movq %0,(%q3,%2,8) \n" - " leaq 1(%2),%2 \n" - " loop 1b \n" - " sbbq %0,%0 \n":"=&a" (ret), "+c"(n), -@@ -235,9 +235,9 @@ BN_ULONG bn_sub_words(BN_ULONG *rp, cons - - asm volatile (" subq %2,%2 \n" - ".p2align 4 \n" -- "1: movq (%4,%2,8),%0 \n" -- " sbbq (%5,%2,8),%0 \n" -- " movq %0,(%3,%2,8) \n" -+ "1: movq (%q4,%2,8),%0 \n" -+ " sbbq (%q5,%2,8),%0 \n" -+ " movq %0,(%q3,%2,8) \n" - " leaq 1(%2),%2 \n" - " loop 1b \n" - " sbbq %0,%0 \n":"=&a" (ret), "+c"(n), ---- openssl-1.0.1m/crypto/bn/bn.h -+++ openssl-1.0.1m/crypto/bn/bn.h -@@ -174,6 +174,16 @@ extern "C" { - # endif - - /* -+ * Address type. -+ */ -+#ifdef _WIN64 -+#define BN_ADDR unsigned long long -+#else -+#define BN_ADDR unsigned long -+#endif -+ -+ -+/* - * assuming long is 64bit - this is the DEC Alpha unsigned long long is only - * 64 bits :-(, don't define BN_LLONG for the DEC Alpha - */ diff --git a/dev-libs/openssl/files/openssl-1.0.1p-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.1p-parallel-build.patch deleted file mode 100644 index dfefd5675845..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.1p-parallel-build.patch +++ /dev/null @@ -1,359 +0,0 @@ -http://rt.openssl.org/Ticket/Display.html?id=2084 - ---- openssl-1.0.1p/crypto/Makefile -+++ openssl-1.0.1p/crypto/Makefile -@@ -85,11 +85,11 @@ - @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi - - subdirs: -- @target=all; $(RECURSIVE_MAKE) -+ +@target=all; $(RECURSIVE_MAKE) - - files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -- @target=files; $(RECURSIVE_MAKE) -+ +@target=files; $(RECURSIVE_MAKE) - - links: - @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) -@@ -100,7 +100,7 @@ - # lib: $(LIB): are splitted to avoid end-less loop - lib: $(LIB) - @touch lib --$(LIB): $(LIBOBJ) -+$(LIB): $(LIBOBJ) | subdirs - $(AR) $(LIB) $(LIBOBJ) - [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o - $(RANLIB) $(LIB) || echo Never mind. -@@ -111,7 +111,7 @@ - fi - - libs: -- @target=lib; $(RECURSIVE_MAKE) -+ +@target=lib; $(RECURSIVE_MAKE) - - install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... -@@ -120,7 +120,7 @@ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; -- @target=install; $(RECURSIVE_MAKE) -+ +@target=install; $(RECURSIVE_MAKE) - - lint: - @target=lint; $(RECURSIVE_MAKE) ---- openssl-1.0.1p/crypto/objects/Makefile -+++ openssl-1.0.1p/crypto/objects/Makefile -@@ -44,11 +44,11 @@ - # objects.pl both reads and writes obj_mac.num - obj_mac.h: objects.pl objects.txt obj_mac.num - $(PERL) objects.pl objects.txt obj_mac.num obj_mac.h -- @sleep 1; touch obj_mac.h; sleep 1 - --obj_xref.h: objxref.pl obj_xref.txt obj_mac.num -+# This doesn't really need obj_mac.h, but since that rule reads & writes -+# obj_mac.num, we can't run in parallel with it. -+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h - $(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h -- @sleep 1; touch obj_xref.h; sleep 1 - - files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO ---- openssl-1.0.1p/engines/Makefile -+++ openssl-1.0.1p/engines/Makefile -@@ -72,7 +72,7 @@ - - all: lib subdirs - --lib: $(LIBOBJ) -+lib: $(LIBOBJ) | subdirs - @if [ -n "$(SHARED_LIBS)" ]; then \ - set -e; \ - for l in $(LIBNAMES); do \ -@@ -89,7 +89,7 @@ - - subdirs: - echo $(EDIRS) -- @target=all; $(RECURSIVE_MAKE) -+ +@target=all; $(RECURSIVE_MAKE) - - files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -@@ -128,7 +128,7 @@ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ - done; \ - fi -- @target=install; $(RECURSIVE_MAKE) -+ +@target=install; $(RECURSIVE_MAKE) - - tags: - ctags $(SRC) ---- openssl-1.0.1p/Makefile.org -+++ openssl-1.0.1p/Makefile.org -@@ -273,17 +273,17 @@ - build_libs: build_crypto build_ssl build_engines - - build_crypto: -- @dir=crypto; target=all; $(BUILD_ONE_CMD) -+ +@dir=crypto; target=all; $(BUILD_ONE_CMD) - build_ssl: build_crypto -- @dir=ssl; target=all; $(BUILD_ONE_CMD) -+ +@dir=ssl; target=all; $(BUILD_ONE_CMD) - build_engines: build_crypto -- @dir=engines; target=all; $(BUILD_ONE_CMD) -+ +@dir=engines; target=all; $(BUILD_ONE_CMD) - build_apps: build_libs -- @dir=apps; target=all; $(BUILD_ONE_CMD) -+ +@dir=apps; target=all; $(BUILD_ONE_CMD) - build_tests: build_libs -- @dir=test; target=all; $(BUILD_ONE_CMD) -+ +@dir=test; target=all; $(BUILD_ONE_CMD) - build_tools: build_libs -- @dir=tools; target=all; $(BUILD_ONE_CMD) -+ +@dir=tools; target=all; $(BUILD_ONE_CMD) - - all_testapps: build_libs build_testapps - build_testapps: -@@ -538,9 +538,9 @@ - dist_pem_h: - (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) - --install: all install_docs install_sw -+install: install_docs install_sw - --install_sw: -+install_dirs: - @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ - $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ - $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ -@@ -549,12 +549,19 @@ - $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ - $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ - $(INSTALL_PREFIX)$(OPENSSLDIR)/private -+ @$(PERL) $(TOP)/util/mkdir-p.pl \ -+ $(INSTALL_PREFIX)$(MANDIR)/man1 \ -+ $(INSTALL_PREFIX)$(MANDIR)/man3 \ -+ $(INSTALL_PREFIX)$(MANDIR)/man5 \ -+ $(INSTALL_PREFIX)$(MANDIR)/man7 -+ -+install_sw: install_dirs - @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; -- @set -e; target=install; $(RECURSIVE_BUILD_CMD) -+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD) - @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ - do \ - if [ -f "$$i" ]; then \ -@@ -634,12 +641,7 @@ - done; \ - done - --install_docs: -- @$(PERL) $(TOP)/util/mkdir-p.pl \ -- $(INSTALL_PREFIX)$(MANDIR)/man1 \ -- $(INSTALL_PREFIX)$(MANDIR)/man3 \ -- $(INSTALL_PREFIX)$(MANDIR)/man5 \ -- $(INSTALL_PREFIX)$(MANDIR)/man7 -+install_docs: install_dirs - @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ - here="`pwd`"; \ - filecase=; \ ---- openssl-1.0.1p/Makefile.shared -+++ openssl-1.0.1p/Makefile.shared -@@ -105,6 +105,7 @@ - SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ - LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ - LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ -+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \ - LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ - $${SHAREDCMD} $${SHAREDFLAGS} \ - -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ -@@ -122,6 +123,7 @@ - done; \ - fi; \ - if [ -n "$$SHLIB_SOVER" ]; then \ -+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ - ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ - ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ - fi; \ ---- openssl-1.0.1p/test/Makefile -+++ openssl-1.0.1p/test/Makefile -@@ -130,7 +130,7 @@ - tags: - ctags $(SRC) - --tests: exe apps $(TESTS) -+tests: exe $(TESTS) - - apps: - @(cd ..; $(MAKE) DIRS=apps all) -@@ -388,118 +388,118 @@ - link_app.$${shlib_target} - - $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) -- @target=$(RSATEST); $(BUILD_CMD) -+ +@target=$(RSATEST); $(BUILD_CMD) - - $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) -- @target=$(BNTEST); $(BUILD_CMD) -+ +@target=$(BNTEST); $(BUILD_CMD) - - $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) -- @target=$(ECTEST); $(BUILD_CMD) -+ +@target=$(ECTEST); $(BUILD_CMD) - - $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) -- @target=$(EXPTEST); $(BUILD_CMD) -+ +@target=$(EXPTEST); $(BUILD_CMD) - - $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) -- @target=$(IDEATEST); $(BUILD_CMD) -+ +@target=$(IDEATEST); $(BUILD_CMD) - - $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) -- @target=$(MD2TEST); $(BUILD_CMD) -+ +@target=$(MD2TEST); $(BUILD_CMD) - - $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) -- @target=$(SHATEST); $(BUILD_CMD) -+ +@target=$(SHATEST); $(BUILD_CMD) - - $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) -- @target=$(SHA1TEST); $(BUILD_CMD) -+ +@target=$(SHA1TEST); $(BUILD_CMD) - - $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) -- @target=$(SHA256TEST); $(BUILD_CMD) -+ +@target=$(SHA256TEST); $(BUILD_CMD) - - $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) -- @target=$(SHA512TEST); $(BUILD_CMD) -+ +@target=$(SHA512TEST); $(BUILD_CMD) - - $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) -- @target=$(RMDTEST); $(BUILD_CMD) -+ +@target=$(RMDTEST); $(BUILD_CMD) - - $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) -- @target=$(MDC2TEST); $(BUILD_CMD) -+ +@target=$(MDC2TEST); $(BUILD_CMD) - - $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) -- @target=$(MD4TEST); $(BUILD_CMD) -+ +@target=$(MD4TEST); $(BUILD_CMD) - - $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) -- @target=$(MD5TEST); $(BUILD_CMD) -+ +@target=$(MD5TEST); $(BUILD_CMD) - - $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) -- @target=$(HMACTEST); $(BUILD_CMD) -+ +@target=$(HMACTEST); $(BUILD_CMD) - - $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) -- @target=$(WPTEST); $(BUILD_CMD) -+ +@target=$(WPTEST); $(BUILD_CMD) - - $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) -- @target=$(RC2TEST); $(BUILD_CMD) -+ +@target=$(RC2TEST); $(BUILD_CMD) - - $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) -- @target=$(BFTEST); $(BUILD_CMD) -+ +@target=$(BFTEST); $(BUILD_CMD) - - $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) -- @target=$(CASTTEST); $(BUILD_CMD) -+ +@target=$(CASTTEST); $(BUILD_CMD) - - $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) -- @target=$(RC4TEST); $(BUILD_CMD) -+ +@target=$(RC4TEST); $(BUILD_CMD) - - $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) -- @target=$(RC5TEST); $(BUILD_CMD) -+ +@target=$(RC5TEST); $(BUILD_CMD) - - $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) -- @target=$(DESTEST); $(BUILD_CMD) -+ +@target=$(DESTEST); $(BUILD_CMD) - - $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) -- @target=$(RANDTEST); $(BUILD_CMD) -+ +@target=$(RANDTEST); $(BUILD_CMD) - - $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) -- @target=$(DHTEST); $(BUILD_CMD) -+ +@target=$(DHTEST); $(BUILD_CMD) - - $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) -- @target=$(DSATEST); $(BUILD_CMD) -+ +@target=$(DSATEST); $(BUILD_CMD) - - $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) -- @target=$(METHTEST); $(BUILD_CMD) -+ +@target=$(METHTEST); $(BUILD_CMD) - - $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) -- @target=$(SSLTEST); $(FIPS_BUILD_CMD) -+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD) - - $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) -- @target=$(ENGINETEST); $(BUILD_CMD) -+ +@target=$(ENGINETEST); $(BUILD_CMD) - - $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) -- @target=$(EVPTEST); $(BUILD_CMD) -+ +@target=$(EVPTEST); $(BUILD_CMD) - - $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO) -- @target=$(EVPEXTRATEST); $(BUILD_CMD) -+ +@target=$(EVPEXTRATEST); $(BUILD_CMD) - - $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) -- @target=$(ECDSATEST); $(BUILD_CMD) -+ +@target=$(ECDSATEST); $(BUILD_CMD) - - $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) -- @target=$(ECDHTEST); $(BUILD_CMD) -+ +@target=$(ECDHTEST); $(BUILD_CMD) - - $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) -- @target=$(IGETEST); $(BUILD_CMD) -+ +@target=$(IGETEST); $(BUILD_CMD) - - $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) -- @target=$(JPAKETEST); $(BUILD_CMD) -+ +@target=$(JPAKETEST); $(BUILD_CMD) - - $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) -- @target=$(ASN1TEST); $(BUILD_CMD) -+ +@target=$(ASN1TEST); $(BUILD_CMD) - - $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) -- @target=$(SRPTEST); $(BUILD_CMD) -+ +@target=$(SRPTEST); $(BUILD_CMD) - - $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) -- @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) -+ +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) - - $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o -- @target=$(CONSTTIMETEST) $(BUILD_CMD) -+ +@target=$(CONSTTIMETEST) $(BUILD_CMD) - - #$(AESTEST).o: $(AESTEST).c - # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c -@@ -512,7 +512,7 @@ - # fi - - dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) -- @target=dummytest; $(BUILD_CMD) -+ +@target=dummytest; $(BUILD_CMD) - - # DO NOT DELETE THIS LINE -- make depend depends on it. - diff --git a/dev-libs/openssl/files/openssl-1.0.1r-x32.patch b/dev-libs/openssl/files/openssl-1.0.1r-x32.patch deleted file mode 100644 index 9e490fd60c08..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.1r-x32.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- openssl-1.0.1r/Configure -+++ openssl-1.0.1r/Configure -@@ -368,6 +368,7 @@ - "linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-x86_64", "gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", - "linux-x86_64-clang","clang: -m64 -DL_ENDIAN -O3 -Wall -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+"linux-x32", "gcc:-DL_ENDIAN -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux64-s390x", "gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", - #### So called "highgprs" target for z/Architecture CPUs - # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see ---- openssl-1.0.1r/crypto/bn/asm/x86_64-gcc.c -+++ openssl-1.0.1r/crypto/bn/asm/x86_64-gcc.c -@@ -55,7 +55,7 @@ - * machine. - */ - --# ifdef _WIN64 -+# ifdef _WIN64 || !defined __LP64__ - # define BN_ULONG unsigned long long - # else - # define BN_ULONG unsigned long -@@ -211,9 +211,9 @@ - - asm volatile (" subq %2,%2 \n" - ".p2align 4 \n" -- "1: movq (%4,%2,8),%0 \n" -- " adcq (%5,%2,8),%0 \n" -- " movq %0,(%3,%2,8) \n" -+ "1: movq (%q4,%2,8),%0 \n" -+ " adcq (%q5,%2,8),%0 \n" -+ " movq %0,(%q3,%2,8) \n" - " leaq 1(%2),%2 \n" - " loop 1b \n" - " sbbq %0,%0 \n":"=&a" (ret), "+c"(n), -@@ -235,9 +235,9 @@ - - asm volatile (" subq %2,%2 \n" - ".p2align 4 \n" -- "1: movq (%4,%2,8),%0 \n" -- " sbbq (%5,%2,8),%0 \n" -- " movq %0,(%3,%2,8) \n" -+ "1: movq (%q4,%2,8),%0 \n" -+ " sbbq (%q5,%2,8),%0 \n" -+ " movq %0,(%q3,%2,8) \n" - " leaq 1(%2),%2 \n" - " loop 1b \n" - " sbbq %0,%0 \n":"=&a" (ret), "+c"(n), ---- openssl-1.0.1r/crypto/bn/bn.h -+++ openssl-1.0.1r/crypto/bn/bn.h -@@ -174,6 +174,16 @@ - # endif - - /* -+ * Address type. -+ */ -+#ifdef _WIN64 -+#define BN_ADDR unsigned long long -+#else -+#define BN_ADDR unsigned long -+#endif -+ -+ -+/* - * assuming long is 64bit - this is the DEC Alpha unsigned long long is only - * 64 bits :-(, don't define BN_LLONG for the DEC Alpha - */ diff --git a/dev-libs/openssl/openssl-0.9.8z_p7.ebuild b/dev-libs/openssl/openssl-0.9.8z_p7.ebuild deleted file mode 100644 index 817c1c870f5a..000000000000 --- a/dev-libs/openssl/openssl-0.9.8z_p7.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal - -PLEVEL=$(echo "${PV##*_p}" | tr '[1-9]' '[a-i]') -MY_PV=${PV/_p*/${PLEVEL}} -MY_P=${PN}-${MY_PV} -S="${WORKDIR}/${MY_P}" -DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" - -LICENSE="openssl" -SLOT="0.9.8" -KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib" -RESTRICT="!bindist? ( bindist )" - -RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r4 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - ) - !=dev-libs/openssl-0.9.8*:0" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - test? ( - sys-apps/diffutils - sys-devel/bc - )" - -# Do not install any docs -DOCS=() - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch - epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438 - epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130 - - # disable fips in the build - # make sure the man pages are suffixed #302165 - # don't bother building man pages if they're disabled - sed -i \ - -e '/DIRS/s: fips : :g' \ - -e '/^MANSUFFIX/s:=.*:=ssl:' \ - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ - -e $(has noman FEATURES \ - && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \ - Makefile{,.org} \ - || die - # show the actual commands in the log - sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared - # update the enginedir path. - # punt broken config we don't care about as it fails sanity check. - sed -i \ - -e '/^"debug-ben-debug-64"/d' \ - -e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \ - Configure || die - - # since we're forcing $(CC) as makedep anyway, just fix - # the conditional as always-on - # helps clang (#417795), and versioned gcc (#499818) - sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die - - # quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - - # allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed" - chmod a+rx gentoo.config - - append-flags -fno-strict-aliasing - append-flags -Wa,--noexecstack - - sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906 - sed -i '/^"debug-bodo/d' Configure # 0.9.8za shipped broken - ./config --test-sanity || die "I AM NOT SANE" - - multilib_copy_sources -} - -multilib_src_configure() { - unset APPS #197996 - unset SCRIPTS #312551 - - tc-export CC AR RANLIB - - # Clean out patent-or-otherwise-encumbered code - # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) - # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm - # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography - # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 - # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5 - - use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; } - echoit() { echo "$@" ; "$@" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - $(use_ssl !bindist ec) \ - enable-idea \ - enable-mdc2 \ - $(use_ssl !bindist rc5) \ - enable-tlsext \ - $(use_ssl gmp gmp -lgmp) \ - $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ - $(use_ssl zlib) \ - --prefix=/usr \ - --openssldir=/etc/ssl \ - shared threads \ - || die "Configure failed" - - # Clean out hardcoded flags that openssl uses - local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ - -e 's:^CFLAG=::' \ - -e 's:-fomit-frame-pointer ::g' \ - -e 's:-O[0-9] ::g' \ - -e 's:-march=[-a-z0-9]* ::g' \ - -e 's:-mcpu=[-a-z0-9]* ::g' \ - -e 's:-m[a-z0-9]* ::g' \ - ) - sed -i \ - -e "/^LIBDIR=/s|=.*|=$(get_libdir)|" \ - -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ - -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ - Makefile || die -} - -multilib_src_compile() { - # depend is needed to use $confopts - emake -j1 depend - emake -j1 build_libs -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - dolib.so lib{crypto,ssl}.so.0.9.8 -} diff --git a/dev-libs/openssl/openssl-1.0.1p.ebuild b/dev-libs/openssl/openssl-1.0.1p.ebuild deleted file mode 100644 index 40a538fe2cf2..000000000000 --- a/dev-libs/openssl/openssl-1.0.1p.ebuild +++ /dev/null @@ -1,259 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal - -REV="1.7" -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="mirror://openssl/source/${P}.tar.gz - http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}" - -LICENSE="openssl" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="bindist gmp kerberos rfc3779 cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" -RESTRICT="!bindist? ( bindist )" - -# The blocks are temporary just to make sure people upgrade to a -# version that lack runtime version checking. We'll drop them in -# the future. -RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) - kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - ) - !<net-misc/openssh-5.9_p1-r4 - !<net-libs/neon-0.29.6-r1" -DEPEND="${RDEPEND} - sys-apps/diffutils - >=dev-lang/perl-5 - test? ( sys-devel/bc )" -PDEPEND="app-misc/ca-certificates" - -src_unpack() { - unpack ${P}.tar.gz - SSL_CNF_DIR="/etc/ssl" - sed \ - -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \ - -e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \ - "${DISTDIR}"/${PN}-c_rehash.sh.${REV} \ - > "${WORKDIR}"/c_rehash || die #416717 -} - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -src_prepare() { - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile - - if ! use vanilla ; then - epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 - epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 - epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch - epatch "${FILESDIR}"/${PN}-1.0.1p-parallel-build.patch - epatch "${FILESDIR}"/${PN}-1.0.1m-x32.patch - epatch "${FILESDIR}"/${PN}-1.0.1m-ipv6.patch - epatch "${FILESDIR}"/${PN}-1.0.1f-revert-alpha-perl-generation.patch #499086 - epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 - epatch_user #332661 - fi - - # disable fips in the build - # make sure the man pages are suffixed #302165 - # don't bother building man pages if they're disabled - sed -i \ - -e '/DIRS/s: fips : :g' \ - -e '/^MANSUFFIX/s:=.*:=ssl:' \ - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ - -e $(has noman FEATURES \ - && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ - Makefile.org \ - || die - # show the actual commands in the log - sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared - - # since we're forcing $(CC) as makedep anyway, just fix - # the conditional as always-on - # helps clang (#417795), and versioned gcc (#499818) - sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die - - # quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - - # allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die - chmod a+rx gentoo.config - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - - sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 - # The config script does stupid stuff to prompt the user. Kill it. - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - ./config --test-sanity || die "I AM NOT SANE" - - multilib_copy_sources -} - -multilib_src_configure() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 - - tc-export CC AR RANLIB RC - - # Clean out patent-or-otherwise-encumbered code - # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) - # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm - # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography - # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 - # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5 - - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - echoit() { echo "$@" ; "$@" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths. #460790 - local ec_nistp_64_gcc_128 - # Disable it for now though #469976 - #if ! use bindist ; then - # echo "__uint128_t i;" > "${T}"/128.c - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - # fi - #fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - $(use_ssl !bindist ec) \ - ${ec_nistp_64_gcc_128} \ - enable-idea \ - enable-mdc2 \ - $(use_ssl !bindist rc5) \ - enable-tlsext \ - $(use_ssl gmp gmp -lgmp) \ - $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ - $(use_ssl rfc3779) \ - $(use_ssl tls-heartbeat heartbeats) \ - $(use_ssl zlib) \ - --prefix="${EPREFIX}"/usr \ - --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ - --libdir=$(get_libdir) \ - shared threads \ - || die - - # Clean out hardcoded flags that openssl uses - local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ - -e 's:^CFLAG=::' \ - -e 's:-fomit-frame-pointer ::g' \ - -e 's:-O[0-9] ::g' \ - -e 's:-march=[-a-z0-9]* ::g' \ - -e 's:-mcpu=[-a-z0-9]* ::g' \ - -e 's:-m[a-z0-9]* ::g' \ - ) - sed -i \ - -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ - -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ - Makefile || die -} - -multilib_src_compile() { - # depend is needed to use $confopts; it also doesn't matter - # that it's -j1 as the code itself serializes subdirs - emake -j1 depend - emake all - # rehash is needed to prep the certs/ dir; do this - # separately to avoid parallel build issues. - emake rehash -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - emake INSTALL_PREFIX="${D}" install -} - -multilib_src_install_all() { - dobin "${WORKDIR}"/c_rehash #333117 - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el - dohtml -r doc/* - use rfc3779 && dodoc engines/ccgost/README.gost - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - use static-libs || rm -f "${ED}"/usr/lib*/lib*.a - - # create the certs directory - dodir ${SSL_CNF_DIR}/certs - cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die - rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} - - # Namespace openssl programs to prevent conflicts with other man pages - cd "${ED}"/usr/share/man - local m d s - for m in $(find . -type f | xargs grep -L '#include') ; do - d=${m%/*} ; d=${d#./} ; m=${m##*/} - [[ ${m} == openssl.1* ]] && continue - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" - mv ${d}/{,ssl-}${m} - # fix up references to renamed man pages - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} - ln -s ssl-${m} ${d}/openssl-${m} - # locate any symlinks that point to this man page ... we assume - # that any broken links are due to the above renaming - for s in $(find -L ${d} -type l) ; do - s=${s##*/} - rm -f ${d}/${s} - ln -s ssl-${m} ${d}/ssl-${s} - ln -s ssl-${s} ${d}/openssl-${s} - done - done - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - - dodir /etc/sandbox.d #254521 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_preinst() { - has_version ${CATEGORY}/${PN}:0.9.8 && return 0 - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 -} - -pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null - eend $? - - has_version ${CATEGORY}/${PN}:0.9.8 && return 0 - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 -} diff --git a/dev-libs/openssl/openssl-1.0.1r.ebuild b/dev-libs/openssl/openssl-1.0.1r.ebuild deleted file mode 100644 index 8d590fa8277c..000000000000 --- a/dev-libs/openssl/openssl-1.0.1r.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal - -REV="1.7" -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="mirror://openssl/source/${P}.tar.gz - http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}" - -LICENSE="openssl" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="bindist gmp kerberos rfc3779 cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" -RESTRICT="!bindist? ( bindist )" - -# The blocks are temporary just to make sure people upgrade to a -# version that lack runtime version checking. We'll drop them in -# the future. -RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) - kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - ) - !<net-misc/openssh-5.9_p1-r4 - !<net-libs/neon-0.29.6-r1" -DEPEND="${RDEPEND} - sys-apps/diffutils - >=dev-lang/perl-5 - test? ( sys-devel/bc )" -PDEPEND="app-misc/ca-certificates" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -src_prepare() { - SSL_CNF_DIR="/etc/ssl" - sed \ - -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \ - -e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \ - "${DISTDIR}"/${PN}-c_rehash.sh.${REV} \ - > "${WORKDIR}"/c_rehash || die #416717 - - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile - - if ! use vanilla ; then - epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 - epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 - epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch - epatch "${FILESDIR}"/${PN}-1.0.1p-parallel-build.patch - epatch "${FILESDIR}"/${PN}-1.0.1r-x32.patch - epatch "${FILESDIR}"/${PN}-1.0.1m-ipv6.patch - epatch "${FILESDIR}"/${PN}-1.0.1f-revert-alpha-perl-generation.patch #499086 - epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 - epatch_user #332661 - fi - - # disable fips in the build - # make sure the man pages are suffixed #302165 - # don't bother building man pages if they're disabled - sed -i \ - -e '/DIRS/s: fips : :g' \ - -e '/^MANSUFFIX/s:=.*:=ssl:' \ - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ - -e $(has noman FEATURES \ - && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ - Makefile.org \ - || die - # show the actual commands in the log - sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared - - # since we're forcing $(CC) as makedep anyway, just fix - # the conditional as always-on - # helps clang (#417795), and versioned gcc (#499818) - sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die - - # quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - - # allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die - chmod a+rx gentoo.config - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - - sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 - # The config script does stupid stuff to prompt the user. Kill it. - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - ./config --test-sanity || die "I AM NOT SANE" - - multilib_copy_sources -} - -multilib_src_configure() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 - - tc-export CC AR RANLIB RC - - # Clean out patent-or-otherwise-encumbered code - # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) - # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm - # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography - # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 - # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5 - - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - echoit() { echo "$@" ; "$@" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths. #460790 - local ec_nistp_64_gcc_128 - # Disable it for now though #469976 - #if ! use bindist ; then - # echo "__uint128_t i;" > "${T}"/128.c - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - # fi - #fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - $(use_ssl !bindist ec) \ - ${ec_nistp_64_gcc_128} \ - enable-idea \ - enable-mdc2 \ - $(use_ssl !bindist rc5) \ - enable-tlsext \ - $(use_ssl gmp gmp -lgmp) \ - $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ - $(use_ssl rfc3779) \ - $(use_ssl tls-heartbeat heartbeats) \ - $(use_ssl zlib) \ - --prefix="${EPREFIX}"/usr \ - --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ - --libdir=$(get_libdir) \ - shared threads \ - || die - - # Clean out hardcoded flags that openssl uses - local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ - -e 's:^CFLAG=::' \ - -e 's:-fomit-frame-pointer ::g' \ - -e 's:-O[0-9] ::g' \ - -e 's:-march=[-a-z0-9]* ::g' \ - -e 's:-mcpu=[-a-z0-9]* ::g' \ - -e 's:-m[a-z0-9]* ::g' \ - ) - sed -i \ - -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ - -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ - Makefile || die -} - -multilib_src_compile() { - # depend is needed to use $confopts; it also doesn't matter - # that it's -j1 as the code itself serializes subdirs - emake -j1 depend - emake all - # rehash is needed to prep the certs/ dir; do this - # separately to avoid parallel build issues. - emake rehash -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - emake INSTALL_PREFIX="${D}" install -} - -multilib_src_install_all() { - dobin "${WORKDIR}"/c_rehash #333117 - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el - dohtml -r doc/* - use rfc3779 && dodoc engines/ccgost/README.gost - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - use static-libs || rm -f "${ED}"/usr/lib*/lib*.a - - # create the certs directory - dodir ${SSL_CNF_DIR}/certs - cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die - rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} - - # Namespace openssl programs to prevent conflicts with other man pages - cd "${ED}"/usr/share/man - local m d s - for m in $(find . -type f | xargs grep -L '#include') ; do - d=${m%/*} ; d=${d#./} ; m=${m##*/} - [[ ${m} == openssl.1* ]] && continue - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" - mv ${d}/{,ssl-}${m} - # fix up references to renamed man pages - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} - ln -s ssl-${m} ${d}/openssl-${m} - # locate any symlinks that point to this man page ... we assume - # that any broken links are due to the above renaming - for s in $(find -L ${d} -type l) ; do - s=${s##*/} - rm -f ${d}/${s} - ln -s ssl-${m} ${d}/ssl-${s} - ln -s ssl-${s} ${d}/openssl-${s} - done - done - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - - dodir /etc/sandbox.d #254521 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_preinst() { - has_version ${CATEGORY}/${PN}:0.9.8 && return 0 - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 -} - -pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null - eend $? - - has_version ${CATEGORY}/${PN}:0.9.8 && return 0 - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 -} diff --git a/dev-libs/openssl/openssl-1.0.2e.ebuild b/dev-libs/openssl/openssl-1.0.2e.ebuild deleted file mode 100644 index 444743d6c8e0..000000000000 --- a/dev-libs/openssl/openssl-1.0.2e.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal - -MY_P=${P/_/-} -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" - -LICENSE="openssl" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" -RESTRICT="!bindist? ( bindist )" - -# The blocks are temporary just to make sure people upgrade to a -# version that lack runtime version checking. We'll drop them in -# the future. -RDEPEND=">=app-misc/c_rehash-1.7-r1 - gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) - kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - ) - !<net-misc/openssh-5.9_p1-r4 - !<net-libs/neon-0.29.6-r1" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - )" -PDEPEND="app-misc/ca-certificates" - -S="${WORKDIR}/${MY_P}" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -src_prepare() { - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile - - if ! use vanilla ; then - epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 - epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 - epatch "${FILESDIR}"/${PN}-1.0.2e-parallel-build.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 - epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 - epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 - - epatch_user #332661 - fi - - # disable fips in the build - # make sure the man pages are suffixed #302165 - # don't bother building man pages if they're disabled - sed -i \ - -e '/DIRS/s: fips : :g' \ - -e '/^MANSUFFIX/s:=.*:=ssl:' \ - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ - -e $(has noman FEATURES \ - && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ - Makefile.org \ - || die - # show the actual commands in the log - sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared - - # since we're forcing $(CC) as makedep anyway, just fix - # the conditional as always-on - # helps clang (#417795), and versioned gcc (#499818) - sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die - - # quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - - # allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die - chmod a+rx gentoo.config - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 - # The config script does stupid stuff to prompt the user. Kill it. - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - ./config --test-sanity || die "I AM NOT SANE" - - multilib_copy_sources -} - -multilib_src_configure() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 - - tc-export CC AR RANLIB RC - - # Clean out patent-or-otherwise-encumbered code - # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) - # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm - # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography - # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 - # RC5: Expired http://en.wikipedia.org/wiki/RC5 - - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - echoit() { echo "$@" ; "$@" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths. #460790 - local ec_nistp_64_gcc_128 - # Disable it for now though #469976 - #if ! use bindist ; then - # echo "__uint128_t i;" > "${T}"/128.c - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - # fi - #fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - $(use_ssl !bindist ec) \ - ${ec_nistp_64_gcc_128} \ - enable-idea \ - enable-mdc2 \ - enable-rc5 \ - enable-tlsext \ - $(use_ssl asm) \ - $(use_ssl gmp gmp -lgmp) \ - $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ - $(use_ssl rfc3779) \ - $(use_ssl sctp) \ - $(use_ssl tls-heartbeat heartbeats) \ - $(use_ssl zlib) \ - --prefix="${EPREFIX}"/usr \ - --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ - --libdir=$(get_libdir) \ - shared threads \ - || die - - # Clean out hardcoded flags that openssl uses - local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ - -e 's:^CFLAG=::' \ - -e 's:-fomit-frame-pointer ::g' \ - -e 's:-O[0-9] ::g' \ - -e 's:-march=[-a-z0-9]* ::g' \ - -e 's:-mcpu=[-a-z0-9]* ::g' \ - -e 's:-m[a-z0-9]* ::g' \ - ) - sed -i \ - -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ - -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ - Makefile || die -} - -multilib_src_compile() { - # depend is needed to use $confopts; it also doesn't matter - # that it's -j1 as the code itself serializes subdirs - emake -j1 depend - emake all - # rehash is needed to prep the certs/ dir; do this - # separately to avoid parallel build issues. - emake rehash -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - emake INSTALL_PREFIX="${D}" install -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el - dohtml -r doc/* - use rfc3779 && dodoc engines/ccgost/README.gost - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - use static-libs || rm -f "${ED}"/usr/lib*/lib*.a - - # create the certs directory - dodir ${SSL_CNF_DIR}/certs - cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die - rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} - - # Namespace openssl programs to prevent conflicts with other man pages - cd "${ED}"/usr/share/man - local m d s - for m in $(find . -type f | xargs grep -L '#include') ; do - d=${m%/*} ; d=${d#./} ; m=${m##*/} - [[ ${m} == openssl.1* ]] && continue - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" - mv ${d}/{,ssl-}${m} - # fix up references to renamed man pages - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} - ln -s ssl-${m} ${d}/openssl-${m} - # locate any symlinks that point to this man page ... we assume - # that any broken links are due to the above renaming - for s in $(find -L ${d} -type l) ; do - s=${s##*/} - rm -f ${d}/${s} - ln -s ssl-${m} ${d}/ssl-${s} - ln -s ssl-${s} ${d}/openssl-${s} - done - done - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - - dodir /etc/sandbox.d #254521 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_preinst() { - has_version ${CATEGORY}/${PN}:0.9.8 && return 0 - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 -} - -pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null - eend $? - - has_version ${CATEGORY}/${PN}:0.9.8 && return 0 - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 -} diff --git a/dev-libs/pugixml/pugixml-1.7.ebuild b/dev-libs/pugixml/pugixml-1.7.ebuild index 2b07f83f4314..12670857f4ef 100644 --- a/dev-libs/pugixml/pugixml-1.7.ebuild +++ b/dev-libs/pugixml/pugixml-1.7.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" S=${WORKDIR}/${P}/scripts diff --git a/dev-libs/qcustomplot/qcustomplot-1.3.2.ebuild b/dev-libs/qcustomplot/qcustomplot-1.3.2.ebuild index 985ffe7c136e..adce5e166f05 100644 --- a/dev-libs/qcustomplot/qcustomplot-1.3.2.ebuild +++ b/dev-libs/qcustomplot/qcustomplot-1.3.2.ebuild @@ -14,7 +14,7 @@ SRC_URI=" SLOT="0" LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" IUSE="qt5" RDEPEND=" diff --git a/dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild b/dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild index 3465006f5322..e933c5439f62 100644 --- a/dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild +++ b/dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" CDEPEND="dev-libs/jerasure" diff --git a/dev-python/aioeventlet/Manifest b/dev-python/aioeventlet/Manifest index dfc7df906bfd..afc36c0710c9 100644 --- a/dev-python/aioeventlet/Manifest +++ b/dev-python/aioeventlet/Manifest @@ -1 +1,2 @@ DIST aioeventlet-0.4.tar.gz 64314 SHA256 fe78c2b227ce077b1581e2ae2c071f351111d0878ec1b0216435f6a898df79a6 SHA512 6d76bacd1ccaf477f121bf57f2963d37c86208547beb5fe7d2c8dc22d787d7ed98761869d3957b9c1f62dc40ca462363f4a7cb2a80b6dabf13f89950d314c2ce WHIRLPOOL 4be9753fb9d2784ffd7e1590d0cebb5a9163d9fa178d5cf3537bf1c297d0e64eb921172af5d50c9cf9ada62ec77be6adbd74679f0aa429cfdba5eb193aeb87c1 +DIST aioeventlet-0.5.1.tar.gz 62371 SHA256 cecb51ea220209e33b53cfb95124d90e4fcbee3ff8ba8a179a57120b8624b16a SHA512 b89d99c2ac1f59ed599f01bfaee6b1eb60fc7f3332cb64b7061e67b0c1de15c38b3787100c176995750b7f8debd04bc8651362c6c2d43beff6af35bc15b64204 WHIRLPOOL 7040a207163cf01c7325c6ad05b641a14b8b28e6b7170e21fb37bcafb14584b4b766193a24845e24ba99cf3430bd56a090a17587ad4158c92ae46a17f21a470d diff --git a/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild b/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild new file mode 100644 index 000000000000..2c8eef27a441 --- /dev/null +++ b/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit distutils-r1 + +DESCRIPTION="asyncio event loop scheduling callbacks in eventlet" +HOMEPAGE="https://pypi.python.org/pypi/aioeventlet https://bitbucket.org/haypo/aioeventlet" +SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-python/eventlet[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'virtual/python-asyncio[${PYTHON_USEDEP}]' 'python3*') + $(python_gen_cond_dep '>=dev-python/trollius-0.3[${PYTHON_USEDEP}]' 'python2_7')" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest index c39b11dcb542..d757210a4a84 100644 --- a/dev-python/argcomplete/Manifest +++ b/dev-python/argcomplete/Manifest @@ -2,3 +2,4 @@ DIST argcomplete-0.8.1.tar.gz 30272 SHA256 12e36f784160547ca855a2c9d753cf60cd3f8 DIST argcomplete-0.8.9.tar.gz 30575 SHA256 98f04fa2ca22479459d8ba04583dca653a41c2d7a57648ba7f3b4d7e19ea82be SHA512 21b7d267f2d5a43a299841ca05b3b4dc38587e9ac90db8634d8e13d089e58483b88506376eff16d8ea2d03a169e118a5be32549b74c5168a337e6a6d22a01f7f WHIRLPOOL 336d7096a0dbfd3fa2beeacee6189fe375586ddec7dfe5277687149701bb52befcc83234de6ea59c06f662c20e44de00420b51fc640517055d5505374f0fcd26 DIST argcomplete-0.9.0.tar.gz 35214 SHA256 f97577332d19aea09583ecb426a49e85dc7bbc9822ab345b9c790d923413af0e SHA512 e127a8d2e7914f2601d649963115595db40ed612d352c134c5b68acdcbcd52477728e6e1edddd405562b28329f960d87d1418fa8fe3b3f1dcb9c3ad10c42a65d WHIRLPOOL 03c5f4eac0aeac9887d8ba1d21b585854b91c7399c95260ecf58f92d709b9194f801b730ab26435e329e003f8041c96d11410983a83c21f262cd2ad68a32a100 DIST argcomplete-1.0.0.tar.gz 35480 SHA256 2cba862e5ce5b0057a33169484544c38bfdc17a1dd865c197adb7ce07800e36e SHA512 9f974833d4e699d87e575a51c024ae7782f51f6e085be291bbac645b6e72873597be6da3c75b0461a8ef5a33311ce3d1fcb6e58f999ad043099331e269f5e9a6 WHIRLPOOL 52ce076077cb4dca8777e55a265351e817b9369af66635dd89b9b2dd3c6ef27e8329864f6024be70d786c42139ccd784d1e3535700a4bea304b2ce8611f1c407 +DIST argcomplete-1.1.0.tar.gz 35809 SHA256 86eeb63632c00831d4c2a7f1158d3a102339a994763fd7492439811546129dc1 SHA512 189f2f417ca47834b97ae69a7bae8c601a7d5e4d22abbd7b927f9352752ab6b406f9b04593dfcb3eb45c5c5269bfbca38d68deb71101e275f13508ef5f23d13f WHIRLPOOL 2438700f41e4df004139d0b5f753e523966bf6394cdc5e0b2f46a3e62a6a2baa7f1f7b10d433f33115dde182fe7c480e0c5726e52940ae13ce67cd73e3c2aabc diff --git a/dev-python/argcomplete/argcomplete-1.1.0.ebuild b/dev-python/argcomplete/argcomplete-1.1.0.ebuild new file mode 100644 index 000000000000..153dded379f6 --- /dev/null +++ b/dev-python/argcomplete/argcomplete-1.1.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 bash-completion-r1 + +DESCRIPTION="Bash tab completion for argparse" +HOMEPAGE="https://pypi.python.org/pypi/argcomplete" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="Apache-2.0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +python_prepare_all() { + # purge test folder to avoid file collisions + sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die + distutils-r1_python_prepare_all +} + +python_test() { + ${EPYTHON} test/test.py || die +} + +python_install_all() { + sed \ + -e "/complete /d" \ + -i argcomplete/bash_completion.d/python-argcomplete.sh || die + + distutils-r1_python_install_all + newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN} +} diff --git a/dev-python/click/click-6.3.ebuild b/dev-python/click/click-6.3.ebuild index 6c9a3dcf7389..d4e8418d4de4 100644 --- a/dev-python/click/click-6.3.ebuild +++ b/dev-python/click/click-6.3.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86" IUSE="doc examples test" REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest index 894f6219fde8..83c866bd5b20 100644 --- a/dev-python/cx_Freeze/Manifest +++ b/dev-python/cx_Freeze/Manifest @@ -1,3 +1,2 @@ -DIST cx_Freeze-4.3.1.tar.gz 53441 SHA256 11f8818ab4e1754c81c1226ce3430f29e6ba231a22a153ce3794a5cc464fa11b SHA512 3fbd179e6b0dcdc926c8827745dfe52df01c0ba1a36f5ae01240d977a251517ce9dba6b6f276a2a292f4a0bd91e923899da1bbd08671cee687a912980481e9e9 WHIRLPOOL dcbc2d29eafd4e3f4361da7a6501fa929bd1bd66b0f29b0d9cd717609b30150ea43387468565d41e663d1f8425f7889122da929c8b160473cb0580d2630e02a5 -DIST cx_Freeze-4.3.2.tar.gz 55816 SHA256 d634aae1e1d20b660d24245450b8a5ea3ad9c443cd735d8fbe17c1d93b8b23df SHA512 2ff4d695ac5ff23b68d0ee32c94948beef7c6be9a2b606e43c77bf954fe96c0dba6fa5186e3995c2937c6b5862fb3b0dd3e21c518626c1905a13b6d0abdcd3ec WHIRLPOOL e3ee3cc1b893f18b3afea645bdb7d5c72d5363380aa18a2416d2693c9f185a57442083f4bf19760ffdf7fe8e587ab835c2dbe56ed713c3bf59679a0d92bb1fca DIST cx_Freeze-4.3.3.tar.gz 58975 SHA256 eaac9ab61117c64371384766e0b9c6603d3bdb23cf306b257f31b8a3a5740729 SHA512 a707d5acca4a01a762d6ba9fde35e47405c03d769c15bf828bfa16bacb48f41c75f28d08cefb7e1825e2b9c85fae46f7728ecd9d095a11e2740286cc2d798d52 WHIRLPOOL 9a5623705842c08b7e9efb67829abac164224170f513c8f021e9f6da36c83a9faf966e763dc2fe8ad8e4c2622cbbcfa9ce0f370cd01735741e3807b113b1520a +DIST cx_Freeze-4.3.4.tar.gz 60172 SHA256 40c7bbfa107e139d105fdf79d1a7540dbb9f84aaf0fecdd03420bf37f0031be2 SHA512 b523322c8199757245f3af2d9e3d68397708cfc8f318761f1eec6e011bd07ec12d3b748a60d33f43f0849f68ec064a729fb3250747216b90b8dd700d0a83699f WHIRLPOOL 829c5c017bdb0b07bbe3e941426d01e798db173fd68ce9b3ad2b96b610bb07262e71fb378fce83857233fd319fa1eb7fdb44477a354b39aa0a9bd1085897ba9c diff --git a/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild b/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild deleted file mode 100644 index 5635f916386e..000000000000 --- a/dev-python/cx_Freeze/cx_Freeze-4.3.1-r2.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python{2_7,3_3} ) -inherit distutils-r1 - -DESCRIPTION="Create standalone executables from Python scripts" -HOMEPAGE="http://cx-freeze.sourceforge.net" -SRC_URI="mirror://sourceforge/cx-freeze/${P}.tar.gz" - -LICENSE="PYTHON" -SLOT="0" -KEYWORDS="amd64 x86" - -DOCS=( README.txt ) - -PATCHES=( - "${FILESDIR}/${PN}-4.3.2-buildsystem.patch" # bug #491602 -) diff --git a/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-4.3.4.ebuild index effe661d5afe..9aad3f93a684 100644 --- a/dev-python/cx_Freeze/cx_Freeze-4.3.2.ebuild +++ b/dev-python/cx_Freeze/cx_Freeze-4.3.4.ebuild @@ -1,22 +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" +EAPI=6 -PYTHON_COMPAT=( python{2_7,3_3} ) +PYTHON_COMPAT=( python{2_7,3_4} ) inherit distutils-r1 DESCRIPTION="Create standalone executables from Python scripts" HOMEPAGE="http://cx-freeze.sourceforge.net" -SRC_URI="mirror://sourceforge/cx-freeze/${P}.tar.gz" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="PYTHON" SLOT="0" KEYWORDS="~amd64 ~x86" -DOCS=( README.txt ) - PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" # bug #491602 ) +# test folder missing half the source content. diff --git a/dev-python/cx_Freeze/files/cx_Freeze-4.3.4-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-4.3.4-buildsystem.patch new file mode 100644 index 000000000000..e55d0d324c30 --- /dev/null +++ b/dev-python/cx_Freeze/files/cx_Freeze-4.3.4-buildsystem.patch @@ -0,0 +1,16 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Tue Nov 19 11:20:21 UTC 2013 + +Respect LDFLAGS, remove stripping. +Fixes Gentoo bug #491602 + +--- a/setup.py ++++ b/setup.py +@@ -94,7 +94,6 @@ + extraArgs.extend(vars["BASEMODLIBS"].split()) + if vars["LOCALMODLIBS"]: + extraArgs.extend(vars["LOCALMODLIBS"].split()) +- extraArgs.append("-s") + self.compiler.link_executable(objects, fullName, + libraries = libraries, + library_dirs = libraryDirs, diff --git a/dev-python/datashape/Manifest b/dev-python/datashape/Manifest index 7da5f61c35fa..618475f04a18 100644 --- a/dev-python/datashape/Manifest +++ b/dev-python/datashape/Manifest @@ -3,3 +3,4 @@ DIST datashape-0.4.4.tar.gz 80923 SHA256 c4142eadbdb986a350941e5427d35a2aa106934 DIST datashape-0.4.5.tar.gz 93549 SHA256 34d4922fa924ef474de2ef8b69833fe2d5da51703d74426f8c4354c9bb209d0f SHA512 f8fcaf923640e42d0ceb6cd607e89b74145443f33ec1d4c0018dc0093518d572ae890bf582487b0c2de6c9d793e96ebb7dc901a330150f2ef2f203b329db5968 WHIRLPOOL cb78a9fd8337d9047c473914f216a06ff3797cc3fc494982696ba8c379d3e50e7cc194f84557eada06fe8459d3711589ad6e1404eb2ae9e389e81e104d447ce0 DIST datashape-0.4.6.tar.gz 94083 SHA256 872929d992929ee23ea939984d43d726458ddaa3367503bb4678edac81a4b854 SHA512 596b997ebf9f3b05d5c7d686514408630a987b5933ded24e5cfe1321ea32b1cb4b2f99b820c3e2ec608fdf5fcb1ec795f256bbc14c0ec2e6e8f21b61b083d696 WHIRLPOOL e85917492996b81d01f6c3c5577f5a446ce141c3518d332709a95d40584a77898b59264f3d03bd87a33d39df63854225020e604ca06341e090eeacd541a14047 DIST datashape-0.4.7.tar.gz 92581 SHA256 1028378bb56e8546a07cd3ad09247672516468ab395aa87646c4791488ba1794 SHA512 c5e4f9ef36456d6673c7cb50297d36cf0080cb08d9da81ff044853cc9bb52d659bc6c0beeb6d95d47ff6924aab50b67ac28eb906e7049624fe5d923a304c0ad0 WHIRLPOOL 7bfc2491a8598cc5a3574ced486d6b19308f45155002a0703e4d57fdc23f2ad270cde500ed65af9520a69c6538bf3622f733a19d56509bd65e5bb981d64118ec +DIST datashape-0.5.0.tar.gz 97748 SHA256 d0b7eafd84fbc75941e274b1bd9c26327ee90f3a1872e7e9b72693f49bee4f0f SHA512 670049fdc6e829805bdf4bf50ffb037bfa2b48fcc3e8772ac82a030fbb3d9c2dd084b6d2ed79cbe08a6e8d074b9fc54a7836f530f5fb45bf96df8b2fb9a8eaa1 WHIRLPOOL bc30f093889951ce47e9eacbad7dbfc5dd1257c9a6cc2a7692660b28b123fc40912f68dfb52bc387fc03043dd35cff5b7d51693ee69f153539653536738c6590 diff --git a/dev-python/datashape/datashape-0.5.0.ebuild b/dev-python/datashape/datashape-0.5.0.ebuild new file mode 100644 index 000000000000..9a7769308fcd --- /dev/null +++ b/dev-python/datashape/datashape-0.5.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="Language defining a data description protocol" +HOMEPAGE="https://github.com/ContinuumIO/datashape" +SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc test" + +RDEPEND=">=dev-python/numpy-1.7[${PYTHON_USEDEP}] + >=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}]" +DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( ${RDEPEND} + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] )" + +python_prepare_all() { + # Prevent un-needed d'loading + sed -e "s/'sphinx.ext.intersphinx', //" -i docs/source/conf.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + py.test || die "Tests failed under ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/django-grappelli/Manifest b/dev-python/django-grappelli/Manifest index 8053699e32f8..460e7f579a2f 100644 --- a/dev-python/django-grappelli/Manifest +++ b/dev-python/django-grappelli/Manifest @@ -1 +1,2 @@ DIST django-grappelli-2.7.1.tar.gz 1971448 SHA256 81a5dc24fd8e540d5acdb3cfecb44b6787bce328a0e9bd9581b77f7821d256cb SHA512 18afdb0c06360fda2fadb8af7918eb9a18372c964ac14a0faf350424fcd5f945a409adbf972d93ff7d7e89a3c6cda95f9d5e658b5980531e00363655ab2e07be WHIRLPOOL 377240b4fa4af8e9f700bfb6d52939cb4f273a4482b2a13678599d1ebc035a9a3505945a33d3e143949a99ad6f30e38d9a54c0daf4dea6255d606c85a9c755f4 +DIST django-grappelli-2.7.3.tar.gz 2288581 SHA256 230a9c83c28c9ba563df9583bd212354ef262689fb1467cb28d80229fd1f5ccf SHA512 92b252b49c63bda836cafc87f4910b7bb59072dd5ec44fb3c17140706a838257c7c5ba19170c69bc788988cd29e06af2d72278ef1732d5a94f39fb121cb28d61 WHIRLPOOL 25e4160be04185f7c74683b5f6db57e1de53b05234db3ae7925d4ac6f1e0e70e461d24f9fcf0860a833bc48a74df1f5087c4ceb9b8b71fa6c6aaf8afeeb49cf5 diff --git a/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild new file mode 100644 index 000000000000..bb1ca3905b29 --- /dev/null +++ b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit distutils-r1 + +DESCRIPTION="A jazzy skin for the Django Admin-Interface" +HOMEPAGE=" + https://pypi.python.org/pypi/django-grappelli + https://django-grappelli.readthedocs.org + https://github.com/sehmaschine/django-grappelli" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" diff --git a/dev-python/django-haystack/Manifest b/dev-python/django-haystack/Manifest index 541e729e56f8..c04c58b030bf 100644 --- a/dev-python/django-haystack/Manifest +++ b/dev-python/django-haystack/Manifest @@ -1,2 +1,3 @@ DIST django-haystack-2.2.0.tar.gz 155409 SHA256 31f5f08524dc46927a5ae1d4024d6496b5f990b0ed1012ad338293636d38fb78 SHA512 7bc27965650a759874c7e90b332994930a9318a4ca01245b04ade97559a6a125655c8a4fc182a3bcac63dbcd4bce76e71950218dff3116d3092d96f94e63e137 WHIRLPOOL 9869f57717a48edb3e27c7f7993ea03372620d81a71ee7f0dcbbd6a7e9bf09acda670b6d142f393ff242cb20af311962f99ca2f3821b161d92fe004dfc7d8d72 DIST django-haystack-2.3.1.tar.gz 973789 SHA256 a30df888ee0da32c4837c328ecf859e992edb6d185efa7d49341cc1949dbb24d SHA512 c051523a63f32e066e3d8c83ef5cc9eec77a969801f57a0826073317c4d80bb24a67b4487638d38028ae288d9698d32483b2755f171a1b3cbb66f13b2b28a623 WHIRLPOOL 8752bf5c6197ef921447520b7da2a1ed3ae9da641c6cdecedfba41749a14f7a69b0ada343fd0aafc40726de9e6706c200caa1e68ad03018285be9e62f5140145 +DIST django-haystack-2.4.1.tar.gz 160757 SHA256 8eac12672ad081f35bde9f32fce16e649c53efe48d2c883f79b1a7f330529b11 SHA512 5d711e13abf3fa7db5cbac31ddcdc2842aafb844cfafd8bad792aca8dfae8f91fa7586af8aacf266bb12e02aa04ad9aecfe903ae40d10f72ba38e0c4b1b1b298 WHIRLPOOL d4aeb6e26266e53a33920f3dac24e69f25833e37925794b1fba095634eb7624cadf80ac7925e74f716dc99bc22fed16a9c560ba15372c2f978bed326ffe51083 diff --git a/dev-python/django-haystack/django-haystack-2.4.1.ebuild b/dev-python/django-haystack/django-haystack-2.4.1.ebuild new file mode 100644 index 000000000000..df67e6d8d5cc --- /dev/null +++ b/dev-python/django-haystack/django-haystack-2.4.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Pluggable search for Django" +HOMEPAGE="http://haystacksearch.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RDEPEND=">=dev-python/django-1.6[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/elasticsearch-py[$(python_gen_usedep 'python*')] + dev-python/geopy[$(python_gen_usedep 'python*')] + dev-python/lxml[$(python_gen_usedep 'python*')] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + >=dev-python/pysolr-3.2.0[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/whoosh[${PYTHON_USEDEP}] + ) + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + " + +RESTRICT="test" + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + ${EPYTHON} test_haystack/solr_tests/server/wait-for-solr + esetup.py test +} + +python_install_all() { + use doc && HTML_DOCS=( docs/_build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/django-nose/Manifest b/dev-python/django-nose/Manifest index 6ad897c61809..8fc8e5dccd91 100644 --- a/dev-python/django-nose/Manifest +++ b/dev-python/django-nose/Manifest @@ -1,4 +1,5 @@ DIST django-nose-1.3.tar.gz 25149 SHA256 3667d26a41fec30364a0ef72580832ca5328802d553f6d6e72af5ac21cb36365 SHA512 0e7f18d32340f912fcde96c3ed4ff63caec71ad178f9bd01e61087a228d7e93ecfd87c5d320a66093bce438561638daacd586a4ecb3198573b28607d33eb853f WHIRLPOOL 0acbbe147c0e434ef641843d10f9781ef26f3dc428ba8e613165ed43d6f5d1dea27bf513d9efcbd551c38c7a1945ae3b06aafb0a6d01c8714479f0c4836f1863 DIST django-nose-1.4.1.tar.gz 26792 SHA256 224dd1bfd8fcdb9f67256c5430147b4c0105d72f6ac8ce3bca6b486449ec6062 SHA512 9ba42767bdfb0c359d9c693c5a7775767ba1a56c54531e75ff2b97e2e12d2a9f535c771c5b076b9024f3662a4143f115aa4bd84b9844ce8cb71f99c47722dcef WHIRLPOOL 49c285867adcbf0b17a388bfd6c8cd2603d8c7b50ec162b088409c1a049e43718f9bc37167d914327d474f6177fb38e01797a80f0c47bc02fd7db31cbe7e8761 DIST django-nose-1.4.2.tar.gz 44842 SHA256 736ae53e3ec47dbbb3049999c18ce54585af299ef88172d9a27cb5fda29daa00 SHA512 b29ac1e9b10b8316c851857498c4cea7e76f91da87583d83591d28348622be9aba19cde6067185a4870274c349857654ef4debde29fdd91974eb539cd5c7a281 WHIRLPOOL 03b6bbd16b079a1f9042d4b57af7f59f669798403927a619ab658f7c16001cf586dd3d661eb4efbff94ae7870007fcadfc852fb93fc09e3bd400f29acd5f6cb9 +DIST django-nose-1.4.3.tar.gz 46035 SHA256 19b8daf4cd5e66603dc58018f0384117097de18714775338cdb76a94d48d8966 SHA512 448ecfd9759811dc123cbc4bdc2e58e697f0f4c17caf9277fb5e0eb9215205d7814d45e86b2008e8a1233ddaf14e12112cdf64b0f5d54464ce77cbf896a48981 WHIRLPOOL f1c1883c0f86621b9752f9374ce30f7f4d25de7740de5d6e5b59a95a92d6786a2fe21f2fff3f699cb2c81175e60ba84e84fabbfc7079252e20f291596259482f DIST django-nose-1.4.tar.gz 26477 SHA256 26cef3c6f62df2eee955a25195de6f793881317c0f5fd1a1c6f9e22f351a9313 SHA512 2df1377146304bc0356e24a212bee8ee55c05ccaafcd6fceca4afe5ae528335192c4a89c842f4c2df6965965c9536f0862903aff2141139cfc83695b41d56e32 WHIRLPOOL 7da21678b2b955972f14dc806aac7c5615048b5edae96bdcc17ee4d1302d714519a223356398f89b0d512aa3aa6979567682dd81b8bb6c99cd7cdd340fa66293 diff --git a/dev-python/django-nose/django-nose-1.4.3.ebuild b/dev-python/django-nose/django-nose-1.4.3.ebuild new file mode 100644 index 000000000000..e63592d3bc08 --- /dev/null +++ b/dev-python/django-nose/django-nose-1.4.3.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Django test runner that uses nose" +HOMEPAGE="https://github.com/jbalogh/django-nose" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +#RESTRICT="test" # The testsuite currently broken See notes below + +RDEPEND=" + >=dev-python/nose-1.2.1[${PYTHON_USEDEP}] + dev-python/django[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( ${RDEPEND} + >=dev-python/dj-database-url-0.3.0[${PYTHON_USEDEP}] + )" + +python_test() { + ./runtests.sh --verbose || die +} diff --git a/dev-python/django-picklefield/Manifest b/dev-python/django-picklefield/Manifest index 9717f0ede7f4..a3b82b3920f8 100644 --- a/dev-python/django-picklefield/Manifest +++ b/dev-python/django-picklefield/Manifest @@ -1,2 +1,3 @@ DIST django-picklefield-0.3.0.tar.gz 10334 SHA256 d1db231b9bec426a7f0b1c37ebbf4e5448658a4714820d74f847e2f769baa2f0 SHA512 01ba2f5227c3a4613212b9049cf69dfdcccba3aa79309a71fb107cbb0dd3976b9fe0e481ba79180c0a5d1b6e8039dbc367df35a3250ce57008d7fd572b1020ba WHIRLPOOL c696006ee777049058cc04fc6457f1931b855d6f74424a3e73ad87f5d25901a1ee6122b366c481351433b13cb6f20b9e61f417fc59808b30f31749293e86c074 DIST django-picklefield-0.3.1.tar.gz 10410 SHA256 d99426be46fd92fe6b64b9f5c5926ea9859394e44ec3ef9e1f7c647d3a26657f SHA512 47e9aa8fda2374672c29dcb1068c9bddb0630bfc95cab401aa611123d1eeb3380f42efeee833542e187e052622d60aec1affb1c43cd96e9e69aadc187feba098 WHIRLPOOL eba9dc88dc688007568e5141e427eb9d49c80890d4da6df9487092471d52ab93556a919fda64e64d05e628f1715b03cba15b1cea7d225aba9f9546b35cf68ab1 +DIST django-picklefield-0.3.2.tar.gz 9715 SHA256 fab48a427c6310740755b242128f9300283bef159ffee42d3231a274c65d9ae2 SHA512 4a6f3c3cedf3d44d232e5801a6041309949dfe551429ddb06535c97148010b14dd40ef6a4a8f1c126a35185732ab319dff53d14da243933ac3de561ad15c0c2b WHIRLPOOL 0964598a40b1728cb02ac9b6e43b58e6ce867758281aa1ed161ae27d3a9f11a8ab8cfb2c99176d4c16b6b1168464428b9dbf0eedc706868f420714c058b049e3 diff --git a/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild b/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild new file mode 100644 index 000000000000..7fa3524d72a5 --- /dev/null +++ b/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="Implementation of a pickled object field for django" +HOMEPAGE="https://github.com/shrubberysoft/django-picklefield" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-python/django-1.1.1[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest index 6c2941d1e4db..dcc026962f1f 100644 --- a/dev-python/django-pipeline/Manifest +++ b/dev-python/django-pipeline/Manifest @@ -1,2 +1,3 @@ DIST django-pipeline-1.3.26.tar.gz 41054 SHA256 58433fc07cc81f213686b892caeb8d17d6ed4e00444ef95b35f21a5a3cc6357e SHA512 106c89e6a5509305548f6169f9b38d3a288bdf260c4b933ac1372c8471e897b8f6109cdecf70a4f77dff670e2b97abe4ed990903abfc188a59600189d0473284 WHIRLPOOL 7ead1f6dbc6df1a5c4b26869e6b4ae73cd416ed52f22ba1ff16b57a295f476c7973a56af9c05d1b50097e82dcd286207f648920b3acadd88fc40ad26aae10285 DIST django-pipeline-1.5.4.tar.gz 41115 SHA256 5e387e2a92880f67c299ade766577c8c66485ffb867fbcffb73f696ddb9b245d SHA512 2393d1b44ca38416589b5b0e731b66e4e95be0b1adcba89fd76905975df0f35857bcbe019fc239127c578ab3a1b77cec5892298068de3634b2020d79e74aa1ad WHIRLPOOL 79e63b07751fb4c216004ca8aa695690b2006346f6b65e075d59484c6411c2f29c7b138f9e12f2e523e8c68e68f11398e183ed4a6816b5a47ef833dbb22b2b02 +DIST django-pipeline-1.6.0.tar.gz 41822 SHA256 de2b6b068576fd5f4d08cae6a2d7768a0a47b92e20d13a4dd39974dd5a6876ee SHA512 4cf89f34a56aeb7cd5042617c265fb4bccfe7a0c32c26d50a0820d35c18207cdbf68b43e8f51ef7145fc48576ae0fe0a21553a75ec8a0a21a3c62e7699268d73 WHIRLPOOL d357b7f207a4c695cbae3a57ef0916e5f66add06c2f9cb45d7e4046326c2cfbd1a6de43eff2af23ff9966099761868c6b9b8a87740e555201eca2c8e2b33f4d2 diff --git a/dev-python/django-pipeline/django-pipeline-1.6.0.ebuild b/dev-python/django-pipeline/django-pipeline-1.6.0.ebuild new file mode 100644 index 000000000000..9f9095a446d4 --- /dev/null +++ b/dev-python/django-pipeline/django-pipeline-1.6.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="An asset packaging library for Django" +HOMEPAGE="https://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline" + +# PyPi releases lack docs/ subdir: +# https://github.com/cyberdelia/django-pipeline/pull/254 +SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RDEPEND=" + >=dev-python/django-1.7[${PYTHON_USEDEP}] + dev-python/jsmin[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + virtual/python-futures[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( ${RDEPEND} + dev-python/mock[${PYTHON_USEDEP}] )" + +# As usual for test phase +DISTUTILS_IN_SOURCE_BUILD=1 + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + # https://github.com/cyberdelia/django-pipeline/issues/381 + PYTHONPATH=. django-admin.py test --settings=tests.settings tests \ + || die "Tests failed under ${EPYTHON}" +} + +python_install_all() { + use doc && HTML_DOCS=( docs/_build/html/. ) + distutils-r1_python_install_all +} + +python_install() { + export PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor' + distutils-r1_python_install +} diff --git a/dev-python/django-recaptcha/Manifest b/dev-python/django-recaptcha/Manifest index 32c49fb26f6c..2ad710408b18 100644 --- a/dev-python/django-recaptcha/Manifest +++ b/dev-python/django-recaptcha/Manifest @@ -1,2 +1,3 @@ DIST django-recaptcha-1.0.3.tar.gz 11268 SHA256 ca47210207e81d8237ff0c5cf51ce07b95ff83dcf5f1e03bb813b6e0cb853af6 SHA512 9288ba1b4145dd6a08f39d226eeaa5f9ea6d9ff63714ff497fe808dfbe249918e4bb67790566044bceeb59ed293a8fcfe4fb41e279b17b2d7a0a0c5a53dd6463 WHIRLPOOL 079349c118a163c6ba6addd18001b1a50a3139c1ff7cd8729e0c77d51f2a798d6aa32e911fcdfc57727eddb5e9bde58639256ba254a759790a0077b6aeb766a5 DIST django-recaptcha-1.0.4.tar.gz 12036 SHA256 8af0da767b07ca4d7a5a2be329776fe6dbab183c3da61ae30796e1a9354eea6c SHA512 45a149250c2f2ca9d00591027bd9f8264fc2ba90a5f09b4a96484326c0805d86f690bf02255a1a112d5705d357b6db2fdf97ca8f26681692f7c1f07118c9c2e4 WHIRLPOOL 620afa904beb41e09b9e178de08785f915c21170e43c558f66fb6f1fba175839bf9d39eeb7094056f1a4fef7b52d79074436699708932639be7f24419d06718b +DIST django-recaptcha-1.0.5.tar.gz 12827 SHA256 62081dd411dfddcc0b7cb97c358fe449788f7974d19e6e95afd1487574852d6a SHA512 2ccf0a6c25d242d86ef7e89705d3f299c94c0ee2fc40853db9bb8cf1f7397650dcde85f1a6d995d452d432ce947bd8fa850d64334d4c124ddc9315cab6fe222c WHIRLPOOL a0759e1e717aaf34ecd000abc3c9978a965e3559eb1a51c522eb4f236616cb71046a4494d156e82a8ed8887e7fc1119dfe9226b9c2add5fb290c1eabc38599dc diff --git a/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild new file mode 100644 index 000000000000..9f3d4c77b49b --- /dev/null +++ b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +inherit distutils-r1 + +DESCRIPTION="Django recaptcha form field/widget app" +HOMEPAGE="https://github.com/praekelt/django-recaptcha https://pypi.python.org/pypi/django-recaptcha" +#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND="dev-python/django[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( ${RDEPEND} + >=dev-python/django-setuptest-0.2.1[${PYTHON_USEDEP}] )" + +python_test() { + esetup.py test +} diff --git a/dev-python/django-setuptest/Manifest b/dev-python/django-setuptest/Manifest index 2a4da5f55412..9f5aecddcbed 100644 --- a/dev-python/django-setuptest/Manifest +++ b/dev-python/django-setuptest/Manifest @@ -1 +1,2 @@ DIST django-setuptest-0.1.6.tar.gz 6929 SHA256 bdce4cf9cfc485b6324b3847fb84af69bdc965370073bc1c983bbf0901902eed SHA512 c2f2c1329d3541ac2e8d5895ddde2e1d1d1c2a819b3cc7168d333894e15128ff49b973a1570917abf06152634c915dada6df9f27ec9463ef79f02411c022d80d WHIRLPOOL e1c45eb3658b75bc82d0b3a5397c4199f5339c19c95e76e2fba0dddd02928da3c3480dc51eb41cef39c283c534a73f90bfbf5edc3289d24f6a5e44aea71e81e5 +DIST django-setuptest-0.2.1.tar.gz 7131 SHA256 539dac135a8b3e7244e50b3b4859782ea5598b794741dc6691e890b779d14169 SHA512 de0ba14ca451974ffa10b2fe822e6a7a927f2009dd1cc345abd6d4b192a5d9dbd1c9034463cbfbc8b5b66ab35d694282513a33dc55e8c1b0385fa32619c3f31d WHIRLPOOL 508d16f928e715a7c583c5190768554c274ad5b4b84d6368f09b98f78bd9cbf4eab62281445159a39369b3a7b91218406bb9d89eac0214d9ae3e42fcec10f5a3 diff --git a/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild new file mode 100644 index 000000000000..96bfaaff1650 --- /dev/null +++ b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Simple test suite enabling Django app testing via setup.py" +HOMEPAGE="https://github.com/praekelt/django-setuptest" +SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" + +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-python/pep8[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/django[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/django-tagging/Manifest b/dev-python/django-tagging/Manifest index fe17ffa645c1..b285ae1aa0ec 100644 --- a/dev-python/django-tagging/Manifest +++ b/dev-python/django-tagging/Manifest @@ -1,3 +1,4 @@ DIST django-tagging-0.3.4.tar.gz 30792 SHA256 a3cee6e36c3cb7ccd9d13d71ca42cb8826914d66b20c3a5e987efa12b3a83a3d SHA512 f782aeedfa6133922e1223bea4a04b955ee44508e37acac57338b0b45df94f55cdf5e1c75142b92642df01019ff553a592f3c64ed7f3d758b3777feed15eb1bd WHIRLPOOL bc9c856ff253ada3ed1103ad5c6145a43309c87bbcc0eac232d9685a7e75fb4d8cd8cf4acb1a2be911ce66045cc8b62a1eb04cf4539d4282480f49bb14be8f8c DIST django-tagging-0.3.6.tar.gz 31914 SHA256 419a8e5c5fdc55f9ec88a15b5ca5343d4dc9461f5302c89180aef93c025ef40f SHA512 7124ab28de3e3cbf9c34ab0ba62d70c13bfe5f75ff8c36be8de0511d4dfa01d1b09904adcd5679ad885a100c4c563d6163aa2187b5e742b280543bf87a3b6c06 WHIRLPOOL 739e14ab4cfb2f150efbf07ab17e2632dd21b54ea74d02a926d114f8279b434387edea369d8b8a4a5dc808ddefa21e6f7423f4a412f9d418e8b084719743a8ac +DIST django-tagging-0.4.1.tar.gz 44260 SHA256 35802daf35f90aa022d59f7d7d485c719c29c4efbde1bf966d44017e1e64602b SHA512 6f6899084fd5067ec2e49649bba4aad225ed738f39f999b7ea5156d38fa28c272d4a1f688d4de712db15fe8f2c2ecfd4532eb6e9c0c1de6dd530c09d7d767a26 WHIRLPOOL 491144cdd90fb7f9f8ea96b4e81d2b248fe7f2ee7d24bf2f6db6e1a2db2f48d8717c870fe3de927ff95f9f531ffd30fd4c5324424444df47c0a795a85273a31c DIST django-tagging-0.4.tar.gz 44225 SHA256 033e3d1b352f0dacdf8588dc83521ac602a020f34f4c1c389912eaff2915e557 SHA512 96ee928a035cb195d0d6057f05028bf21e37bb3bb68a73f9d8915c04fa71837ea20e88f2dfe22bb1a8bdec8dd37d6b98543731fbf980cf4556f951366eae5526 WHIRLPOOL d2f05ca93a45f16943aeade92a2c8a9f1e42842430d7a93661b69340c8edc7c6e8c12f0ea24be5fbcfb90fc600348f4e1202b0ddab42166c07a50f6613a4a6a3 diff --git a/dev-python/django-tagging/django-tagging-0.4.1.ebuild b/dev-python/django-tagging/django-tagging-0.4.1.ebuild new file mode 100644 index 000000000000..6282aaef0121 --- /dev/null +++ b/dev-python/django-tagging/django-tagging-0.4.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="Generic tagging application for Django" +HOMEPAGE="https://code.google.com/p/django-tagging/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND=">=dev-python/django-1.0[${PYTHON_USEDEP}]" + +python_install_all() { + use doc && dodoc docs/overview.txt + distutils-r1_python_install_all +} diff --git a/dev-python/flask-socketio/Manifest b/dev-python/flask-socketio/Manifest index 74e11d0a0cb5..e7fe1b735549 100644 --- a/dev-python/flask-socketio/Manifest +++ b/dev-python/flask-socketio/Manifest @@ -1,4 +1,2 @@ -DIST flask-socketio-0.6.0.tar.gz 6804 SHA256 5b004bc9a74421ec3983f5167a7cab70853b132a9c9c09d808c07f96bbf6ecd9 SHA512 3093fb659e8fe86a866bf9183401995a6615b3dfc8687549fa5845747935b6cd6bfc7bb56c969489f47fdb1a5420d744817b6a7dce636ab653ef62a08d353b1e WHIRLPOOL 1ff182a51ac24a61e02a6bf46612932bfdb4121737e27c34e324c859e9fe43a6db408fa162d0ff3b3952e8cb9bfa1e9d0f7b9e57149bce8af461fe5f4e829356 -DIST flask-socketio-1.1.tar.gz 7992 SHA256 fdeefa4d3a87b789308e5144d0c58299d50d35fb97c6cc0a76f1d12e255b20bb SHA512 a7257698c32e8b57a63b86ae5bffa8c5c32d9198186b98e2d2f306562ca7b188c5eb260f2716556973e2c0902a37ec66f7809a61a83c6fab4d6a950eda963580 WHIRLPOOL 621e49ef3cdfb94cbd8042d2d1a396d47272541e06d901b6fcbc4fa83951ce7cb30d6cf065405cdb58f01be002901b3b2ab9378f26dd8664ea5949bdecbe6d58 DIST flask-socketio-2.0.tar.gz 8730 SHA256 f6fb24762d0c6e430f215beb8d62c262816733c4d9726714f9b7badbe1058bb2 SHA512 2a3e28dce72f448dc763bfe533330a0d80aca82ee5e9b9b6538e66853f809424550a3a005d558d11ae6b89266c3946811b4c8811f04b0e2282390414a9b458f8 WHIRLPOOL 19853187d924f74b4b5d6b20e05e3f74b2198853453ea6982878625dd40c75826cb6c001c1e9f07a7a084124fcf2279ac8f5ea307b652ef027fc9fc7a919460d DIST flask-socketio-2.1.tar.gz 8888 SHA256 232674f2fad4b1adaf1d045f89a9688d74a77efc1d4a6a4094f2d16f711e80c4 SHA512 cc8410c20bd9ad66cd327acdd66cfa741d006c0937a4571d7a2571d0e03d93885f75e9065f2c244e06fd2add4a3997399e92530ff8618de6bad4a57e814284cd WHIRLPOOL fc1432d4df8ceb891cf02324d7e274efadc4f41fc8060870fd8a6c8efa1df2f984bd1404febc2a164f3638748251d37c3b32a322bc140623d71491d7c9f6ffdb diff --git a/dev-python/flask-socketio/flask-socketio-0.6.0.ebuild b/dev-python/flask-socketio/flask-socketio-0.6.0.ebuild deleted file mode 100644 index 4348a53db7ba..000000000000 --- a/dev-python/flask-socketio/flask-socketio-0.6.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_PN="Flask-SocketIO" -DESCRIPTION="Socket.IO integration for Flask applications." -HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}] - >=dev-python/gevent-socketio-0.3.6[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_PN}-${PV}" - -# pypi tarball does not contain tests -RESTRICT="test" - -python_test() { - PYTHONPATH="${PWD}" python ./test_socketio.py || die -} diff --git a/dev-python/flask-socketio/flask-socketio-1.1.ebuild b/dev-python/flask-socketio/flask-socketio-1.1.ebuild deleted file mode 100644 index a70aef90e418..000000000000 --- a/dev-python/flask-socketio/flask-socketio-1.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 ) - -inherit distutils-r1 - -MY_PN="Flask-SocketIO" -DESCRIPTION="Socket.IO integration for Flask applications." -HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}] - dev-python/python-socketio[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/coverage[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -# pypi tarball does not contain tests -RESTRICT="test" - -python_test() { - PYTHONPATH="${PWD}" python ./test_socketio.py || die -} diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest index f9abd3b44947..c2bfc247b0cd 100644 --- a/dev-python/neovim-python-client/Manifest +++ b/dev-python/neovim-python-client/Manifest @@ -1,3 +1,4 @@ DIST neovim-python-client-0.0.37.tar.xz 38008 SHA256 615120048e0bac403fe85dd9bc74a5b2fe92cc9d1dc7c65f92f8a2bf361e0ec9 SHA512 23c3557564a16f9d1c4561d6ebb6d546d52c1cdc0216f36e77edf4567f7143f30e6832296324a3897a1eb38992973c63f99c373d88e330650cd8de6e4ba665cd WHIRLPOOL d0099e8f149eea2b115129b226253d848aa1b5be2685bab5eff6cd2fa5c5c5d0de6f070ed2fca860d9bc8105a139bbb6bb9d7a4f02baef1bf337d13046803463 DIST neovim-python-client-0.0.38.tar.xz 38524 SHA256 40599735f14dc6f715fbdc3b8e91ec4e1dd7e4a184ee0b4c7f4d69e768b557dd SHA512 b6f912802a1807eef4353fb6c8f15f9f43b9a1cde449e2c23a031b099de448dd6a2856dc4545ee33094e7f9e8842fd1101008fe4272d21e3fcf6eb38a3c144df WHIRLPOOL 218d46cc61b8e8a7e386c61fe68958888f46cf0e8da96edcd926e67ad236371d80b2a58ed385cb20526440910488265e6661537f579a2fc37dd8d63d81e98096 DIST neovim-python-client-0.1.0.tar.gz 43142 SHA256 2a9a1f07bd6d5617b1b85ee1772feed9aabd1f7a6ddb24664a48896c7db6121a SHA512 31d9c7ac32513871d7121a07269c643da97bba76469de0756aa3b71db3ff70b638d56b4da8b91d550ca41be6f53d2bd3e320e9c751ee5a6ce4e6230bd423b41a WHIRLPOOL 9192eff0dec934e949e201e425ee3bb316988078e9887290735b15b7c44f7a27a81556909f963e58414adf65e89354bcc26b9c7e7b1d372f73eff1d27cb6f901 +DIST neovim-python-client-0.1.2.tar.gz 43428 SHA256 2d85a493194b5dfbc08cad1fd2e252f7ad35b65eb826dd61f67f4fecfc8476b2 SHA512 a050cd7fcc3ab9863bd777331a6ebce3b9ac110682c445ca3e18a59ef4296b4da486a2586ae8be36f4fc6c9ac5e0d5513c19d06f2783bdf37554f37ca547c908 WHIRLPOOL d5f08178bc8738fcdae7c50a43d4e58731ce8665e93d6b8e905c6a83e1b6fe0655dabc9c5ee96a1415b84710ec043f25cea72761af3fe4977d96b862ca81bb31 diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.2.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.2.ebuild new file mode 100644 index 000000000000..83767617edc7 --- /dev/null +++ b/dev-python/neovim-python-client/neovim-python-client-0.1.2.ebuild @@ -0,0 +1,31 @@ +# 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_3,3_4,3_5} ) +inherit distutils-r1 + +DESCRIPTION="Python client for Neovim" +HOMEPAGE="https://github.com/neovim/python-client" +SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk" +REQUIRED_USE="gtk? ( python_targets_python2_7 )" # experimental gui only works with py2 + +DEPEND=" + >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}] + virtual/python-greenlet[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3}) + gtk? ( + >=dev-python/click-3.0[${PYTHON_USEDEP}] + dev-python/pygobject:2 + dev-python/pygtk:2 + x11-libs/gtk+:2[introspection] + )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/python-client-${PV}" diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest index 185bed62d7e4..74a433a16ee0 100644 --- a/dev-python/python-engineio/Manifest +++ b/dev-python/python-engineio/Manifest @@ -1,2 +1,3 @@ DIST python-engineio-0.8.1.tar.gz 11608 SHA256 82973bcf1c32df594bb78c527d9406f301691ecc5ab93c38fc318c1b0142b9fd SHA512 71a6002753f77440fe118004e7ace11eeb348b2d63274e81fe66e8eace899b8b3f1b8b130f86cedb0d78c995f1f83053ab7811e68fbb6e977072d9491a35b6b7 WHIRLPOOL c2a62848b2a83adb5eea255c60c77d6355053a360d885dacfe117a104974987c9379236c62eed6f496e115c8181428a09ccd51720438b4110902b43c06778450 DIST python-engineio-0.8.6.tar.gz 11855 SHA256 cdb7381d6ba28d13e02cec61f3d1b254341b784452c629fba524784c0b774363 SHA512 4fd4e492655340798ca7c34127d26d0fcba864b95e3ab21c423867c21ee7d37dd3b5f564bd3013cc0f9f235a57b5dd4bf705648e21cf07fbe417e4fa69e632f2 WHIRLPOOL df96a513112a21b3dbc4262f156d4332ca71547d0882a0cc473a128a8c3a9ca1dd5a29b19e2b56f5b819fdc8ea415b8f092f974fd2d35f963e321dc2afdd0375 +DIST python-engineio-0.8.8.tar.gz 11792 SHA256 1dbe9ad8ca4b36b92d6c2f9c5c4a3ddc25e70858d39e90b9e5e1cb337f0c0924 SHA512 b411565b5144039e680ecb1ebb26c206f8b18f3fe10fd3e62efde5540fb84e80c9085bb9339ef214791921f3f62c46ad75379a0472430db2316a2388b0ecd398 WHIRLPOOL 638ebb4323c5e5c4e8854fdecf6cc187af744f5ba4a895f4d15c6874510512575d981d799660aa016d2638c7a5e5761340890ce0ecda759d7da592f4a349efc0 diff --git a/dev-python/python-engineio/python-engineio-0.8.8.ebuild b/dev-python/python-engineio/python-engineio-0.8.8.ebuild new file mode 100644 index 000000000000..8640ed9e4322 --- /dev/null +++ b/dev-python/python-engineio/python-engineio-0.8.8.ebuild @@ -0,0 +1,28 @@ +# 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} pypy pypy3 ) + +inherit distutils-r1 + +MY_PN="" +DESCRIPTION="Python implementation of the Engine.IO realtime server." +HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND="dev-python/six[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +# pypi tarball does not contain tests +RESTRICT="test" + +python_test() { + esetup.py test || die +} diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest index 17758bfcd63f..7b0f28cc4975 100644 --- a/dev-ruby/bunny/Manifest +++ b/dev-ruby/bunny/Manifest @@ -1,3 +1,4 @@ DIST bunny-2.0.1.gem 183296 SHA256 ceff06015fa1ddc3aeea397f23242a9de13f3bc7f3481ace1a0b194d66a84236 SHA512 53ef3ec503f4ed5cbcec72343a492f102c358f7f2bd6f4833a3306384faf03195e59f9ca5ef9a7e0d7dc21ae1428c9b107bbbc5a4691853920d3410765e576be WHIRLPOOL 465ea17a2c1ed51127ed37f4ad8fc916d9227111debec127bfcd4e539a7c697c8f5395c3f26cc47c4665948f7e67027d1d0b20c1235b93482aa17302bcbf7771 DIST bunny-2.2.1.gem 184320 SHA256 ff05d3a86257e0cc8c1480a7918da9d476bed90ece06fbfbb19319b9c224a81b SHA512 649aa1e1110a5feda751e471251b24ab3e43fabe9c95d9502bc18e5b0ff39543de329f7135fbc6adbe8dd4d12324dfe9a01a254fdf6e79e4daa12c782138fe03 WHIRLPOOL c0972565ee3e0213eb2b98d30af1f90a94bf3db19fa36b24da33388e4345a323ee536f7bbd2dd5b685abd14bcdec67ca278e63fbc20c5fc108e3b273b3bcd26e DIST bunny-2.2.2.gem 184320 SHA256 36a2b307dcc7f271e9027cb8dde5827b7e02c6a8e4694c0e693b746e4d171a9b SHA512 f87994ab4e491c7e4527189a5a76ce2e4d0a6c7555f913ddefed77d95c62a080b7b629020c66afc0a6cb8ea1d7a310aba0e4dedfc6c3e5b97daf4d4c9378f517 WHIRLPOOL 42fa1e2ed8737dfcaf91a900d282a33adc151d5f996ca6bdc840b4919d1bba16c6c1e7f9240a6e1bef02a37e73d722e3e9ed5bafeb4045687b2ece33cb0054a6 +DIST bunny-2.3.0.gem 184832 SHA256 798d16dcecb47bbfea5226aa4a433e8aa4a530f0d1249746e6cea2620ce6fb66 SHA512 b3b38f52a789629ae62ba4c224ba62c8cd2423339b711b359e414c6ed39abae37a6da6d3ee61ae4400b5eda32fa426f805c27179f21d27b4400f24ecf6644e7f WHIRLPOOL a2c6b7b81cace8fe5f23a0c69b14946a59dc4d2ab5b79e04bcd751359aa581b1efbb9547511dafde2d9533c4f906ded02e81ab00a44fc99aca6082a74f1291af diff --git a/dev-ruby/bunny/bunny-2.3.0.ebuild b/dev-ruby/bunny/bunny-2.3.0.ebuild new file mode 100644 index 000000000000..0c980eb612ed --- /dev/null +++ b/dev-ruby/bunny/bunny-2.3.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_TASK_DOC="" + +# Tests require a live AMQP server. +RUBY_FAKEGEM_TASK_TEST="" + +RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md" + +inherit ruby-fakegem + +DESCRIPTION="Another synchronous Ruby AMQP client" +HOMEPAGE="https://github.com/celldee/bunny" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +ruby_add_rdepend ">=dev-ruby/amq-protocol-2.0.1:2" + +all_ruby_install() { + all_fakegem_install + + insinto /usr/share/doc/${PF} + doins -r examples || die +} diff --git a/dev-ruby/css_parser/Manifest b/dev-ruby/css_parser/Manifest index 1c28956093a1..adf3c3dc654d 100644 --- a/dev-ruby/css_parser/Manifest +++ b/dev-ruby/css_parser/Manifest @@ -1,2 +1,3 @@ DIST css_parser-1.3.5.tar.gz 23699 SHA256 d08f0a28e97d2d8e80bebe1253ed68f98a75f6afbc5f453a570170972d3af08e SHA512 92897839387649379f35d9b0368cab9d5c8148c588a421f155f5ff6bdc6e7b9d776ccc267d73a2484c48c4d4d6084f99c86ba84c20f3025952dcb9b84c1a3901 WHIRLPOOL f32766fb8727245db9d9f6b8f764fbbddff865e0378b42904da58a6385ed697df053be6948244278bf231ec8d667c81693c6753840d17a48f4d7c8f03fca51b6 DIST css_parser-1.3.6.tar.gz 24422 SHA256 1931ca0a02d14a0ae7863921a18f3475fa6beee58585e9949af70ceffed8fc80 SHA512 a9d09a95320b3a6853a5f079c17d2913868a3d97ee20d9df8076d9206721bf23442e793a722e67c87d4083d3734ba9eaf98b81d93e6257aaaa43ff32b8e6e65b WHIRLPOOL 13ca571034974d09bf4165f1ca8cc947d66aafdacbd098e25e1f16e312bcbe3bf850b2d1f62d404c0878641f0e9b60c5a00f2b24007295cc0881299f5eb4767f +DIST css_parser-1.3.7.tar.gz 24559 SHA256 4b21cf4ffd2d6bca40e11f350aaf2bfb2970913145771aeff97bcfdec86c31e1 SHA512 98ea3d5c806887ea3a6ddc4a8b3780bac92150db6be1fe9011035bc2a5d72e64002d36b06a80c5d49eb0ed7a5e51bce29d3b07dc83238d8128b580c8ff455ed7 WHIRLPOOL 9192e9b08f5bca2743d3d81d836fdcb16230e4c673760f4a1d8d8deece04c143ffe64d46cc903165459749ce204ebdff1cf1d5a01e3c54616da17fa40cb1487a diff --git a/dev-ruby/css_parser/css_parser-1.3.7.ebuild b/dev-ruby/css_parser/css_parser-1.3.7.ebuild new file mode 100644 index 000000000000..3a55f8990b5b --- /dev/null +++ b/dev-ruby/css_parser/css_parser-1.3.7.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_DOC_DIR="doc" +RUBY_FAKEGEM_EXTRADOC="Readme.md" +RUBY_FAKEGEM_TASK_TEST="" +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +GITHUB_USER="premailer" +GITHUB_PROJECT="${PN}" +inherit ruby-fakegem + +DESCRIPTION="Sass-based Stylesheet Framework" +HOMEPAGE="http://compass-style.org/ https://github.com/premailer/css_parser/" +LICENSE="MIT" + +SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc test" + +ruby_add_rdepend "dev-ruby/addressable + virtual/ruby-ssl" + +ruby_add_bdepend "test? ( dev-ruby/maxitest )" + +all_ruby_prepare() { + # get rid of bundler usage + rm Gemfile || die + sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die + sed -i -e '/bundler/d' test/test_helper.rb || die + # Avoid tests using the network. + sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die + +} + +each_ruby_test() { + ${RUBY} -Ilib test/*.rb || die +} diff --git a/dev-ruby/d3_rails/Manifest b/dev-ruby/d3_rails/Manifest index 67ca54781111..559cdde413a5 100644 --- a/dev-ruby/d3_rails/Manifest +++ b/dev-ruby/d3_rails/Manifest @@ -1,2 +1,3 @@ DIST d3_rails-3.5.10.gem 134656 SHA256 ac04dedf5d0a5aad2d467f898fe161ec69d8e90416613e63918f53c8c5bb9456 SHA512 aad51fcabcc7ec120ed99eebbbce33d92319d2e6654a76d06e0b01fb16c7f687b1c146afd83391ed5c945f2dd4cac8f65025ac4db7c7efd9e7ae24abccb62397 WHIRLPOOL fc066f61679b483a747beba632c9cad4af6451ede4e1be34bb530f71462f7f68a8feb3894931c5666082935e9ad8dee1455974d09572226725a3fb4825bffbd6 DIST d3_rails-3.5.11.gem 134656 SHA256 3d3da310fd4a9caac0d5b9113a79daac7e5e9c976a552ea6ea6c5a4b5d8c7d8b SHA512 2b01538e25a302a4954f01035f628da3d4f5ce5e5d643c42dd4abe70afac826acd211634911d758dd05394b885c4f9fd69814c91dd3dea753ffc4737a82d4969 WHIRLPOOL f47a05095ba15840e15a37171402e6ec4874ee35eb4f1dc14b2bd9a21b5cebe3790fba538ef3afd60ad688621abfd105d0dd3833abbe5be269870e3eadc77c36 +DIST d3_rails-3.5.16.gem 134656 SHA256 617d2aca6138b9d99374cd87ee9b0658a782376f237e2805723dc68143fd0e0f SHA512 b566d161dd1999523106f87f78522fffb7b5ec5615db53cf9d9c8e39145baca00d6f12a94438603ad395fd515de6297afd4afd17ec1186ea141b54a724585268 WHIRLPOOL 2fd259969bba4d424742766f45cf4d75fe84a31294a712d404a79b2085c99f163f9a8b4aa525704cf9545cace9909ab101174c9b0a79cce995d0ed86ccdf50b2 diff --git a/dev-ruby/d3_rails/d3_rails-3.5.16.ebuild b/dev-ruby/d3_rails/d3_rails-3.5.16.ebuild new file mode 100644 index 000000000000..ad225e7ab52e --- /dev/null +++ b/dev-ruby/d3_rails/d3_rails-3.5.16.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_TEST="none" +RUBY_FAKEGEM_RECIPE_DOC="none" +RUBY_FAKEGEM_EXTRADOC="README.md" +RUBY_FAKEGEM_EXTRAINSTALL="app" + +inherit ruby-fakegem + +DESCRIPTION="Ruby on Rails integration for the Javascript Data Visualization Framework, D3" +HOMEPAGE="https://github.com/logical42/d3_rails" + +LICENSE="MIT BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend ">=dev-ruby/railties-3.1:*" diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest index 5838d9512fb7..9105fd6f2a89 100644 --- a/dev-ruby/dnsruby/Manifest +++ b/dev-ruby/dnsruby/Manifest @@ -1,3 +1,2 @@ -DIST dnsruby-1.58.0.gem 230912 SHA256 b21ded4f62fd935f1c2409201ed5f2b97f90f2598baab00e1a6ec0be0149c16d SHA512 e7fc9073574429433aa05d088bfafd8919216f8461d25b967fccad52d22dd820702ae62d503f9b63207a25d335675f1601c2654685493165c1ad4ef912f5cebe WHIRLPOOL daf1427ad9947cd478b70ec39c72bdfc58059e448dad7e7d40f828ef56b9b49f1d31497f820e5ba118f15902a90424042a3f46396a34de2189dd87a0f0b17139 -DIST dnsruby-1.59.0.gem 232960 SHA256 45d7236b1d6346fca03522e3192f9545875d887c491d1e63c4dcedf6a87819b8 SHA512 769111d24fd745288b41e083630e7ea7cd078ff6297afe8eff7eb0a95f57a74c9b1dbfd09db122eb45c340243e1eaee86faa3175e750c2b243ac6b92f7c3a804 WHIRLPOOL b9c0f858346d9bb38a92dc4a67fefc3f6dd7fedc468a7ab2b9794fa528c0a7d80426402ee5a812d4598d7177f7b19959d0ca13401a55967ecfca63692997b2b4 DIST dnsruby-1.59.1.gem 233984 SHA256 ffc1e7c98eb7d57e1325736654193a047d0e384c678ac2996c7a4e58245a649a SHA512 809072ae82056aeb9be085713116412b8cf6b21313c4aba1b112c0526f06d4ba1068e66149265f9fe0effd604641392732d09c28fd31a048a4d460fbf59f884e WHIRLPOOL b1a76dfab5598bcd3eb3c3181b0c0abe1c229e5d470eabbfa538f95ddbfb1b905533a1189ea8515063512bea067b34ff96a077a366740ef0f34d78892fd08181 +DIST dnsruby-1.59.2.gem 233984 SHA256 22b55fb116797c4676919eea6ddfdfe101e40bb9019ce4a72e21330fc0b301c8 SHA512 f8b75d98860c6b5e2753b79b59d0b30db47af1b8739564fdaeac93b702ae0a39fdf547422426c2a4cabe3fc9b5b4e1c9b09d687f976d06aa0b0c31cc7a474fdd WHIRLPOOL 5c32217f415fe799e4a976a693bb9ea0ace7b4ccdb90cfff4ead55ace88c6c198a7864b347670ef954a9ce082c9d5b4d78ba7b4552feaefe0c4f4fba540ce28d diff --git a/dev-ruby/dnsruby/dnsruby-1.58.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.58.0.ebuild deleted file mode 100644 index 5538c5f77b38..000000000000 --- a/dev-ruby/dnsruby/dnsruby-1.58.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_TASK_TEST="" -RUBY_FAKEGEM_DOCDIR="html" -RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md" -inherit ruby-fakegem - -DESCRIPTION="A pure Ruby DNS client library" -HOMEPAGE="http://rubyforge.org/projects/dnsruby" - -KEYWORDS="~amd64 ~x86" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )" - -all_ruby_prepare() { - sed -i -e "/[Cc]overall/d" Rakefile || die -} - -each_ruby_test() { - # only run offline tests - #${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed" - ${RUBY} -I .:lib test/ts_offline.rb || die "test failed" -} diff --git a/dev-ruby/dnsruby/dnsruby-1.59.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.59.2.ebuild index 064e75d8cce5..90451b8bec87 100644 --- a/dev-ruby/dnsruby/dnsruby-1.59.0.ebuild +++ b/dev-ruby/dnsruby/dnsruby-1.59.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" RUBY_FAKEGEM_TASK_TEST="" RUBY_FAKEGEM_DOCDIR="html" @@ -23,6 +23,8 @@ ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )" all_ruby_prepare() { sed -i -e "/[Cc]overall/d" Rakefile || die + sed -i -e '/display/d' \ + -e '/Display/,/^}/d' test/spec_helper.rb || die } each_ruby_test() { diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest index 83a29b1adc98..30a5d8c6a768 100644 --- a/dev-ruby/domain_name/Manifest +++ b/dev-ruby/domain_name/Manifest @@ -1,2 +1,3 @@ +DIST domain_name-0.5.20160216.gem 113664 SHA256 d9880da350cb447a05a2081d237dfbd1df3e0deb92b2fd795eb223e15b038c4f SHA512 2b4e3edacf84ff8cfcbe5534778370841e02d7162703cff449e986a23a8b118c083544af81082ad79ef113fec5025c0b6a78d4767905b72f60cf220d23b98197 WHIRLPOOL 03a12183165715b5043e33e8de9d024b0698418d34c4f9c849cc4f145f0e8928392bb3057e763ec0c1b3e7cd0f5eefbdcfcd5df9f7c6b426b1137197d0e5336a DIST domain_name-0.5.24.gem 104448 SHA256 8cbd6aea8859823f89aefeec49232e9d4377456fd42d08accfbc0cc6b32a55f6 SHA512 46caf0be89c3b2f38f79180c14f4eaa1096f12f80feb881dafb394033d2c6118f481c898310d281d15acd5b9a54473c9d9ee8f0e77dda5b03c40a0d6f137f602 WHIRLPOOL df40be6b18f08f242bafeb985a93692e3286a3889b738790108c7df64eff90dfe28c874b06f7cefd7e8ee295753126ee2d32ceb89dca65c71b95721064301161 DIST domain_name-0.5.25.gem 112128 SHA256 5b492888a095f2f00027a268932c93d0432bf8ada568a5c601ff53ce6a761b9b SHA512 cdc89ef2cc93d014727e203ffaa3921f3548077bcf4dfacc83a03f887a88393cea01efcf072ca785b375a6b24cdbd69f201f2fbd81a7341595e6ed2a5d2b362c WHIRLPOOL 1f5a9577aab4aea61eb88d590bd52b07cb21c597646ad28fce6631baee3ea527282393ce392a830232081a70c0628c6666e0fb29d5aec640cae44ff887d0261b diff --git a/dev-ruby/domain_name/domain_name-0.5.20160216.ebuild b/dev-ruby/domain_name/domain_name-0.5.20160216.ebuild new file mode 100644 index 000000000000..f0bb1c3e2148 --- /dev/null +++ b/dev-ruby/domain_name/domain_name-0.5.20160216.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_TEST="none" +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Domain Name manipulation library for Ruby" +HOMEPAGE="https://github.com/knu/ruby-domain_name" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="test" + +ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0" + +ruby_add_bdepend " + test? ( + >=dev-ruby/test-unit-2.5.5 + dev-ruby/shoulda + )" + +all_ruby_prepare() { + sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die + rm Gemfile* || die + + # Remove development dependencies + sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \ + ${RUBY_FAKEGEM_GEMSPEC} || die + + # Avoid dependency on git. + sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die +} + +each_ruby_test() { + ruby-ng_testrb-2 -Ilib:test test/test_*.rb +} diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest index fbfd41c57932..26119abd6525 100644 --- a/dev-ruby/fakefs/Manifest +++ b/dev-ruby/fakefs/Manifest @@ -2,3 +2,4 @@ DIST fakefs-0.6.0.gem 41984 SHA256 43a668e9a436654d66eff7e896793800b4b8d87c3ecd5 DIST fakefs-0.6.5.gem 44032 SHA256 4c3c5378c839bd8f8e94dab767b417c74273cefda703bf338358d8e964bbf9ed SHA512 eef1500627eac9d2df312a74783ee43f3bcc8aaa83824cfb2ccf11bb6d21cc0e6d95d72a4aab78eaa15edbe9a856146ec3ef97408569d5eac56fc4bba2a12f56 WHIRLPOOL 09c03ae8500343ac771f019a21b19494d94e3fd1f114d78c9ba037d214e40a2927b083652a24d044190bb9cb81ded0ac2b1e1ea1dab953fbce462c541184b3da DIST fakefs-0.6.7.gem 44544 SHA256 2fd9f56aecac9de55db0b4111f4f53d6ebbe00e68dd1cc089cc4c2d8589eb9a1 SHA512 1fe50b7692a153dfc2d48cb0fb4eb545a52c04362154d72a8b887f7d8f9fb5973abc13c685eba0f9cd4dbdf5a783ab8de2bd978747050b72b4f248c1a0d271c2 WHIRLPOOL cf7a3a96f1efcd70b233fa129f0c5782b6b19bb3039960d2de981c9dc889c60956d313e8b17a21fab31a23013cce2b3fc2fd8f33f2603323c2e315aa85c18370 DIST fakefs-0.7.0.gem 45568 SHA256 26f222a646ca113c5cb0a7c0adb90a521e5c791a809801270f55c1462769bced SHA512 881342155a153211a0f76b37722e60de08be953a3345fffab9f57f141d3e5443636e5d82a97620487319fb61b9932051ff73e9fc8aa9f12fb7acaf02ea31e4e4 WHIRLPOOL 8ed1060a9ac3fbe8b334f5dc7ab23371d156faa0afcae76eb069b365df7a3e2e8b723931358ab065cd1e5bd9fae384abadc77b385c239847f2a09c9ca00b4440 +DIST fakefs-0.8.0.tar.gz 42199 SHA256 fa0fd9e0c7abdada30c590983d37d6748b3abd9b54a8717d19ff933cec64b5c9 SHA512 f20165375bf28eff8328ed15883591abc5148ad302b42fc36154d807b004ea863ae7fdf95938d7468fe3506bb2dee9c020e1dfef30d70deaa2a4983e3c52ec0f WHIRLPOOL 520e2d74bc4db63e36e46b0edbb75d34c37eb46d42327a7500e3b87d648432f34381b69ba9be4ea14ea791f50556501c700a002066883313358ad6b2063d45aa diff --git a/dev-ruby/fakefs/fakefs-0.8.0.ebuild b/dev-ruby/fakefs/fakefs-0.8.0.ebuild new file mode 100644 index 000000000000..09665862ff44 --- /dev/null +++ b/dev-ruby/fakefs/fakefs-0.8.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_TEST="none" + +# requires sdoc +RUBY_FAKEGEM_TASK_DOC="" + +RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.markdown" + +inherit ruby-fakegem eutils + +DESCRIPTION="A fake filesystem. Use it in your tests" +HOMEPAGE="https://github.com/defunkt/fakefs" +SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="" + +ruby_add_bdepend " + test? ( + >=dev-ruby/rspec-3.1:3 + >=dev-ruby/minitest-5.5 + )" + +all_ruby_prepare() { + # Remove bundler + rm Gemfile || die + + # Avoid unneeded minitest-rg dependency. + sed -i -e '1igem "minitest", "~>5.5"' \ + -e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die +} + +each_ruby_test() { + RSPEC_VERSION=3 ruby-ng_rspec + ${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die +} diff --git a/dev-util/codeblocks/codeblocks-13.12-r1.ebuild b/dev-util/codeblocks/codeblocks-13.12-r1.ebuild deleted file mode 100644 index fa0a728898c8..000000000000 --- a/dev-util/codeblocks/codeblocks-13.12-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -WX_GTK_VER="3.0" - -inherit eutils wxwidgets - -DESCRIPTION="The open source, cross platform, free C++ IDE" -HOMEPAGE="http://www.codeblocks.org/" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" -SRC_URI="mirror://sourceforge/codeblocks/${P/-/_}-1.tar.gz" - -IUSE="contrib debug pch static-libs" - -RDEPEND="app-arch/zip - x11-libs/wxGTK:${WX_GTK_VER}[X] - contrib? ( - app-text/hunspell - dev-libs/boost:= - dev-libs/libgamin - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - need-wxwidgets unicode - econf \ - --with-wx-config="${WX_CONFIG}" \ - $(use_enable debug) \ - $(use_enable pch) \ - $(use_enable static-libs static) \ - $(use_with contrib contrib-plugins all) -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild index d103c986e13c..6504279fb352 100644 --- a/dev-util/codeblocks/codeblocks-9999.ebuild +++ b/dev-util/codeblocks/codeblocks-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -WX_GTK_VER="3.0" +WX_GTK_VER="2.8" inherit autotools eutils subversion wxwidgets diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest index d3a66eeef35c..a7f744a18a29 100644 --- a/dev-util/jenkins-bin/Manifest +++ b/dev-util/jenkins-bin/Manifest @@ -1,4 +1,2 @@ -DIST jenkins-bin-1.625.3.war 63322455 SHA256 9964b10581414b5504921dd8a717b172c07bcdf5f9d1bae50595aca07ddacf20 SHA512 daa739c902d417949dd348780fe4c3d088d64917231273083638bbfe87a47c69007669298175d5bc60623aa7bb6c3ce19c250764b6108ae026e0622d968a3b26 WHIRLPOOL da0e99183bb22ef4b1475acd840c67c3d0e2cc2f3d998340ea0d6cbb0ce4cc4e26d60871d65aaf08d9af0026b51152274640c485592e6cb36cd95813848eddc6 -DIST jenkins-bin-1.642.1.war 63664516 SHA256 ce036e227fe1fed15e3da9be8d29e859bdcda7118895fd269d1c9ac35925de66 SHA512 1fa79b6029078d8a8c0996b63dc7c411f9a56037257dbb3080e07559cb949af819f6245846b5c586ba7c9a61d5a25137d3c2d9c91a7a63fe2b4f3358d7c439c2 WHIRLPOOL 2b54f22895f7de1ced34bd99a03d37b4f06211e6dd5bdd56ac49eff2b010797f82f4d67f2a2b051feb2eba08f5eb87ca7223c46a75c690588361eb11aa007d62 -DIST jenkins-bin-1.647.war 63359416 SHA256 52778609d34cb532c934509bb2a63c77986ae8e9b7e85186bad0235f58e4200f SHA512 cf8130453b52a19d6fa1f54a6676496f7d3ffe2a0793fe2b95ecb9296ab0bae831aebb5d3af81d8e7ee5c51e0942f315ba3c720be09e31e6c0d7e1a972bb6c29 WHIRLPOOL 4c4e388fc6909608f340d9e3eb6c379d228193b9f00d2875d096b0d938bbe14af2c3cab0285510b45ee3d1ed048dbf1a07b6f39279077fc91f5516d356b8080c -DIST jenkins-bin-1.649.war 64590491 SHA256 ca270b2a7e3d8927e7765e516c7cff9b90a85c7a3010d632f8f3b96a5acb9b82 SHA512 5480692cdb2efd94ea6c6f5f56909f69b2b0be7d794dd7e8860a2e31a650992aa63ffbdc67686dfd7cb484d07766227151dc40b8729340d5a07daa461216b57c WHIRLPOOL 5828194b863d64cd2d80c30306622479347846f56b517d2df3ccc26ba1b37861ecf2e98b10196d2e62f1f6764015376802cbb04bd8a70dd0aa8cff29d40e6fa8 +DIST jenkins-bin-1.642.2.war 63668826 SHA256 024b04524f230dea62424de95f372d8c89ed942b21dbef68117b259842b96907 SHA512 9f4b06bdd72e61c732e0ae87abf3dcaad347744934e6d634be7b182a4d77aba1f41bc6c762cbd4ae804b822c52d06bad825b07a487e6424b28ecc8d90e62b280 WHIRLPOOL 30b93639b356d81ff2e7fde09336497db606b9fc4e52576a2dae7fa3f8bf221a3cba5445225bcd8c400c747ebfc7fa531e416fcd68330930167ebdda9280cb14 +DIST jenkins-bin-1.650.war 64593723 SHA256 16008a85246a9d2b36eaae18405135347280898edea8818c34433acda49fd747 SHA512 cedcd11b877bfd5c10cc3a08ea2666090da02fb655d3e7d532da24458ee175468bed38e5ff74ecf7524dcaf857c103652259d9ab0d36af8bdc1f866e85bf477a WHIRLPOOL cf13574e8661a691240704b701664650d308853d0ba650506e6dccf6c1d7484295a3754b1a6a75604393b65110b25598b10e184fd19fbef0322c93ed0f67d710 diff --git a/dev-util/jenkins-bin/jenkins-bin-1.625.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.625.3.ebuild deleted file mode 100644 index 49fa34a8423c..000000000000 --- a/dev-util/jenkins-bin/jenkins-bin-1.625.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit user systemd - -DESCRIPTION="Extensible continuous integration server" -HOMEPAGE="http://jenkins-ci.org/" -LICENSE="MIT" -SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war" -RESTRICT="mirror" -SLOT="lts" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-fonts/dejavu - media-libs/freetype - !dev-util/jenkins-bin:0 - >=virtual/jre-1.7.0" - -S=${WORKDIR} - -JENKINS_DIR=/var/lib/jenkins - -pkg_setup() { - enewgroup jenkins - enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins -} - -src_install() { - keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home - - insinto /opt/jenkins - newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war - - insinto /etc/logrotate.d - newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/} - - newinitd "${FILESDIR}"/${PN}.init2 jenkins - newconfd "${FILESDIR}"/${PN}.confd jenkins - - systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service - - fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup -} diff --git a/dev-util/jenkins-bin/jenkins-bin-1.642.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.642.2.ebuild index 88dc7f8565d4..88dc7f8565d4 100644 --- a/dev-util/jenkins-bin/jenkins-bin-1.642.1.ebuild +++ b/dev-util/jenkins-bin/jenkins-bin-1.642.2.ebuild diff --git a/dev-util/jenkins-bin/jenkins-bin-1.649.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.649.ebuild deleted file mode 100644 index 96dfaf75f07d..000000000000 --- a/dev-util/jenkins-bin/jenkins-bin-1.649.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit user systemd - -DESCRIPTION="Extensible continuous integration server" -HOMEPAGE="http://jenkins-ci.org/" -LICENSE="MIT" -SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war" -RESTRICT="mirror" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-fonts/dejavu - media-libs/freetype - !dev-util/jenkins-bin:lts - >=virtual/jre-1.7.0" - -S=${WORKDIR} - -JENKINS_DIR=/var/lib/jenkins - -pkg_setup() { - enewgroup jenkins - enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins -} - -src_install() { - keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home - - insinto /opt/jenkins - newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war - - insinto /etc/logrotate.d - newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/} - - newinitd "${FILESDIR}"/${PN}.init2 jenkins - newconfd "${FILESDIR}"/${PN}.confd jenkins - - systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service - - fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup -} diff --git a/dev-util/jenkins-bin/jenkins-bin-1.647.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.650.ebuild index 96dfaf75f07d..96dfaf75f07d 100644 --- a/dev-util/jenkins-bin/jenkins-bin-1.647.ebuild +++ b/dev-util/jenkins-bin/jenkins-bin-1.650.ebuild diff --git a/mail-client/claws-mail/claws-mail-3.13.2.ebuild b/mail-client/claws-mail/claws-mail-3.13.2.ebuild index 8aae5c0c7747..cac1724e1edf 100644 --- a/mail-client/claws-mail/claws-mail-3.13.2.ebuild +++ b/mail-client/claws-mail/claws-mail-3.13.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" SLOT="0" LICENSE="GPL-3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface" REQUIRED_USE="libcanberra? ( notification ) diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest index 3fbd7e778868..792858bcbc6a 100644 --- a/mail-client/sylpheed/Manifest +++ b/mail-client/sylpheed/Manifest @@ -1,2 +1,3 @@ DIST sylpheed-3.4.2.tar.bz2 3474176 SHA256 198de08d01a5c150adae6b6612da80674bbc7ed59b58bbd7508124b869322ba3 SHA512 1bfaf5636facb6ca55173e914904be7f9fb9ca98eb440f5b548fbbbe03f5dfb5428801e878f3275d3683e715d0b4bd33f63f69f5f98578ce1a25cef695406b5e WHIRLPOOL a7dda342adb598027765c5ab6d14ae3e850bf39ff63d90a79927fa2aec1bf539454357cb6dea8664d21f68deeccf78fada264d04b0a14ff311ff5827717c4aa8 DIST sylpheed-3.4.3.tar.bz2 3474313 SHA256 09fae954c775073b43ce2f660a6bed1087237659eade1c68913cb86add1fb905 SHA512 cadae6a6855fae8c2df249d83cfd2d7b214062e3e49c74f6d64b3c2f97a9eb2586f14e2b766715e07fa1b229e4462cd39eee69bd02c26053b1ed93a497c3836b WHIRLPOOL 4d76ba80a60c3f0513b80af8854292712a74e5a9b5d2e53b82de0edee4fea7b76316b807af396bcda918a0e5c9e66b05e4201d89992a443cc3bb582574653431 +DIST sylpheed-3.5.0.tar.bz2 3519735 SHA256 4a0b62d17bca6f1a96ab951ef55a9a67813d87bc1dc3ee55d8ec2c045366a05c SHA512 fa2803c41a935089989d93cd78ef0dd04d5c0117283f37b82f3d5e76eb753d38960ce3cc122936883cb3057e834acaa03b1a565cd31202331527d07a24e8d5b0 WHIRLPOOL 6f7b6df00a75cab868fdaae0856d7a7080d45ee361cd1f41c5f356199f3ac630926b1b22e549e5e0ce6d78b8a4553c440460f2882fa28e5bbdb2af9dfb8df6a5 diff --git a/mail-client/sylpheed/sylpheed-3.4.2.ebuild b/mail-client/sylpheed/sylpheed-3.4.2.ebuild index fb700aa08d2d..1e2f537f4577 100644 --- a/mail-client/sylpheed/sylpheed-3.4.2.ebuild +++ b/mail-client/sylpheed/sylpheed-3.4.2.ebuild @@ -1,10 +1,10 @@ -# 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 eutils +inherit eutils multilib DESCRIPTION="A lightweight email client and newsreader" HOMEPAGE="http://sylpheed.sraoss.jp/" @@ -22,7 +22,7 @@ CDEPEND="x11-libs/gtk+:2 oniguruma? ( dev-libs/oniguruma ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 ) - ssl? ( dev-libs/openssl )" + ssl? ( dev-libs/openssl:0 )" RDEPEND="${CDEPEND} app-misc/mime-types net-misc/curl" @@ -41,6 +41,7 @@ src_configure() { $(use_enable spell gtkspell) \ $(use_enable ssl) \ $(use_enable xface compface) \ + --with-plugindir=/usr/$(get_libdir)/${PN}/plugins \ --with-manualdir=${htmldir}/manual \ --with-faqdir=${htmldir}/faq \ --disable-updatecheck @@ -54,7 +55,7 @@ src_install() { domenu *.desktop cd plugin/attachment_tool - docinto plugin/attachment_tool emake DESTDIR="${D}" install-plugin + docinto plugin/attachment_tool dodoc README } diff --git a/mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild b/mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild index febe5932947c..ee8c88fb1090 100644 --- a/mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild +++ b/mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild @@ -1,10 +1,10 @@ -# 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 eutils +inherit eutils multilib DESCRIPTION="A lightweight email client and newsreader" HOMEPAGE="http://sylpheed.sraoss.jp/" @@ -44,6 +44,7 @@ src_configure() { $(use_enable spell gtkspell) \ $(use_enable ssl) \ $(use_enable xface compface) \ + --with-plugindir=/usr/$(get_libdir)/${PN}/plugins \ --with-manualdir=${htmldir}/manual \ --with-faqdir=${htmldir}/faq \ --disable-updatecheck @@ -57,7 +58,7 @@ src_install() { domenu *.desktop cd plugin/attachment_tool - docinto plugin/attachment_tool emake DESTDIR="${D}" install-plugin + docinto plugin/attachment_tool dodoc README } diff --git a/mail-client/sylpheed/sylpheed-3.4.3.ebuild b/mail-client/sylpheed/sylpheed-3.4.3.ebuild index 1b53b30d7e68..41684e15dee0 100644 --- a/mail-client/sylpheed/sylpheed-3.4.3.ebuild +++ b/mail-client/sylpheed/sylpheed-3.4.3.ebuild @@ -1,10 +1,10 @@ -# 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 eutils +inherit eutils multilib DESCRIPTION="A lightweight email client and newsreader" HOMEPAGE="http://sylpheed.sraoss.jp/" @@ -41,6 +41,7 @@ src_configure() { $(use_enable spell gtkspell) \ $(use_enable ssl) \ $(use_enable xface compface) \ + --with-plugindir=/usr/$(get_libdir)/${PN}/plugins \ --with-manualdir=${htmldir}/manual \ --with-faqdir=${htmldir}/faq \ --disable-updatecheck @@ -54,7 +55,7 @@ src_install() { domenu *.desktop cd plugin/attachment_tool - docinto plugin/attachment_tool emake DESTDIR="${D}" install-plugin + docinto plugin/attachment_tool dodoc README } diff --git a/mail-client/sylpheed/sylpheed-3.5.0.ebuild b/mail-client/sylpheed/sylpheed-3.5.0.ebuild new file mode 100644 index 000000000000..b0b1451e42e1 --- /dev/null +++ b/mail-client/sylpheed/sylpheed-3.5.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +inherit eutils + +DESCRIPTION="A lightweight email client and newsreader" +HOMEPAGE="http://sylpheed.sraoss.jp/" +SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface" + +CDEPEND="x11-libs/gtk+:2 + crypt? ( app-crypt/gpgme ) + ldap? ( net-nds/openldap ) + nls? ( sys-devel/gettext ) + oniguruma? ( dev-libs/oniguruma ) + pda? ( app-pda/jpilot ) + spell? ( app-text/gtkspell:2 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + )" +RDEPEND="${CDEPEND} + app-misc/mime-types + net-misc/curl" +DEPEND="${CDEPEND} + virtual/pkgconfig + xface? ( media-libs/compface )" + +src_configure() { + local htmldir=/usr/share/doc/${PF}/html + econf \ + $(use_enable crypt gpgme) \ + $(use_enable ipv6) \ + $(use_enable ldap) \ + $(use_enable oniguruma) \ + $(use_enable pda jpilot) \ + $(use_enable spell gtkspell) \ + $(use_enable ssl) \ + $(use_enable xface compface) \ + --with-plugindir=/usr/$(get_libdir)/${PN}/plugins \ + --with-manualdir=${htmldir}/manual \ + --with-faqdir=${htmldir}/faq \ + --disable-updatecheck +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS ChangeLog* NEWS* PLUGIN* README* TODO* + + doicon *.png + domenu *.desktop + + cd plugin/attachment_tool + emake DESTDIR="${D}" install-plugin + docinto plugin/attachment_tool + dodoc README +} diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest index 3c09a19db012..5c8b25ac0c21 100644 --- a/mail-mta/postfix/Manifest +++ b/mail-mta/postfix/Manifest @@ -4,5 +4,5 @@ DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa139 DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9 DIST postfix-3.0.4.tar.gz 4240805 SHA256 b81ce81176b9df7183ad99b9c98000135f5e88e659493ab50db5d9fe5b8dba0e SHA512 ca1ad1b7a0c552825d820e1ea017bdd79cf31e6262c9d2b801fa11011be5e10549cfb57745cec4177046a178fab104f3b7f79bf08708bb7772b127970970949d WHIRLPOOL e1a00ba9733522109ebbefa902021abda3bed0316da98cfb98a305122e736f5889b8b5a6426f152d0c68a9f8cb675683fddb80fd12fa6b278f1ae8c024c5fc1c DIST postfix-3.1.0.tar.gz 4336709 SHA256 88ac3e92755629077d9363319b1fa0db406efb10c2f22cdbb941bd8ab36fd733 SHA512 06cf4c827de8d613cab6a57a8e76198d293660a263f60d17dd189f511da4b1e12eb98bbcf75695697a62959e26ca204bf2a53eb6657e8bd756a816977e717783 WHIRLPOOL 5fe4350d47051cfda00505012493f5c6f70598be901cd94a598a7e3332bc022b41050935c5263f140f0df573e3a3e00f6b97dd1d90c01a4e3d78a039f47a16a8 -DIST postfix-3.2-20160221.tar.gz 4328066 SHA256 f9cd8af9bde5b5b10ce401ef69da5344da1c6d12d34c90e5215972a339de0eb6 SHA512 3be6f1cf53f18c0df129794338e3bef12357290fcbc9bddd04d64425e13f45bb4ad8282d5d8eefacf4d56a444bc09adb22f719935d83181d03bc131b28c67c10 WHIRLPOOL b3b4a8d3bb7a497b084b4c6426208c646f7e291a51977ab0572c396b4c217650d15ffef720b65392658794e1cd9eecd169d40d031589bba8b5be38521c6cd40e +DIST postfix-3.2-20160224.tar.gz 4329124 SHA256 e64094c6adceff25ce069e464b67bffcc1cafe60b65d58202030fe7335ae83b9 SHA512 209874ec04fedd7d37e3fa57408885f1893b3e1530d239712f4720e0a66b26c5a3b5b38c6d7c84c30628527b9b84aeb98632d5745ef5569d84bcf67449ba8c74 WHIRLPOOL 34f07481cba0b3acbb5c95982cfb0e6dc874dc8e5d5aef05c77b28fdfa0ba07c02b06a83c695dfa63478db52c9d5a0dfe2b7285a3a56f47472f9594e4e46ad6e DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3 diff --git a/mail-mta/postfix/files/postfix-linux4.patch b/mail-mta/postfix/files/postfix-linux4.patch deleted file mode 100644 index a28ad52627b1..000000000000 --- a/mail-mta/postfix/files/postfix-linux4.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/makedefs -+++ b/makedefs -@@ -500,7 +500,12 @@ EOF - : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} - : ${PLUGIN_LD="${CC-gcc} -shared"} - ;; -- Linux.3*) SYSTYPE=LINUX3 -+ Linux.[34]*) -+ case "$RELEASE" in -+ 3.*) SYSTYPE=LINUX3;; -+ 4.*) SYSTYPE=LINUX4;; -+ *) error "Unknown Linux version: `uname -r`.";; -+ esac - case "$CCARGS" in - *-DNO_DB*) ;; - *-DHAS_DB*) ;; ---- a/src/util/sys_defs.h -+++ b/src/util/sys_defs.h -@@ -756,7 +756,7 @@ extern int initgroups(const char *, int); - /* - * LINUX. - */ --#if defined(LINUX2) || defined(LINUX3) -+#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) - #define SUPPORTED - #include <sys/types.h> - #define UINT32_TYPE unsigned int diff --git a/mail-mta/postfix/postfix-3.2_pre20160221.ebuild b/mail-mta/postfix/postfix-3.2_pre20160224.ebuild index 790c62efd05d..fba7b857b2b0 100644 --- a/mail-mta/postfix/postfix-3.2_pre20160221.ebuild +++ b/mail-mta/postfix/postfix-3.2_pre20160224.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils flag-o-matic multilib pam systemd toolchain-funcs user versionator +EAPI=6 +inherit flag-o-matic pam systemd toolchain-funcs user MY_PV="${PV/_pre/-}" MY_SRC="${PN}-${MY_PV}" @@ -68,13 +68,11 @@ pkg_setup() { } src_prepare() { + default sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \ src/util/sys_defs.h || die "sed failed" - # change default paths to better comply with portage standard paths sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed" - - epatch_user } src_configure() { diff --git a/media-gfx/graphite2/graphite2-1.3.5-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.5-r1.ebuild new file mode 100644 index 000000000000..a9d1fa83843a --- /dev/null +++ b/media-gfx/graphite2/graphite2-1.3.5-r1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +GENTOO_DEPEND_ON_PERL="no" +inherit eutils perl-module python-any-r1 cmake-multilib + +DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" +HOMEPAGE="http://graphite.sil.org/" +SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="perl test" + +RDEPEND=" + perl? ( dev-lang/perl:= ) +" +DEPEND="${RDEPEND} + perl? ( + dev-perl/Module-Build + dev-perl/Locale-Maketext-Lexicon + ) + test? ( + dev-libs/glib:2 + media-libs/fontconfig + media-libs/silgraphite + $(python_gen_any_dep ' + dev-python/fonttools[${PYTHON_USEDEP}] + ') + ${PYTHON_DEPS} + perl? ( virtual/perl-Test-Simple ) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" +) + +pkg_setup() { + use perl && perl_set_version + use test && python-any-r1_pkg_setup +} + +python_check_deps() { + has_version "dev-python/fonttools[${PYTHON_USEDEP}]" +} + +src_prepare() { + cmake-utils_src_prepare + + # make tests optional + if ! use test; then + sed -i \ + -e '/tests/d' \ + CMakeLists.txt || die + fi +} + +multilib_src_configure() { + local mycmakeargs=( + "-DVM_MACHINE_TYPE=direct" + # http://sourceforge.net/p/silgraphite/bugs/49/ + $([[ ${CHOST} == powerpc*-apple* ]] && \ + echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON") + ) + + cmake-utils_src_configure + + # fix perl linking + if multilib_is_native_abi && use perl; then + _cmake_check_build_dir init + sed -i \ + -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \ + "${S}"/contrib/perl/Build.PL || die + fi +} + +src_compile() { + cmake-multilib_src_compile + if use perl; then + cd contrib/perl || die + perl-module_src_configure + perl-module_src_compile + fi +} + +multilib_src_test() { + if multilib_is_native_abi; then + cmake-utils_src_test + else + einfo Cannot test since python is not multilib. + fi +} + +src_test() { + cmake-multilib_src_test + if use perl; then + cd contrib/perl || die + # SRC_TEST=do + # Perl tests fail due to missing POD coverage... + perl-module_src_test + fi +} + +src_install() { + cmake-multilib_src_install + if use perl; then + cd contrib/perl || die + perl-module_src_install + perl_delete_localpod + fi + + prune_libtool_files --all +} diff --git a/media-gfx/splash-themes-livecd/Manifest b/media-gfx/splash-themes-livecd/Manifest index 582a47eac07f..118daac2688e 100644 --- a/media-gfx/splash-themes-livecd/Manifest +++ b/media-gfx/splash-themes-livecd/Manifest @@ -2,6 +2,5 @@ DIST gentoo-livecd-2005.0-0.9.1.tar.bz2 4887028 SHA256 433e9b2b1a4d3e03c000c56b9 DIST gentoo-livecd-2005.1-0.9.2.tar.bz2 13000381 SHA256 5b9c4c20af8efefa987608957bd57e1c8dd788360f7d7660e9394bd74a419234 SHA512 eca90d70cc0f3d8e7f5d10a56f7e7fcbc7ed251d43506ae2797b8cbb5be506a12a60454804917c535b17fb8fd8fb47fb9864f7c27d0d12da10869a3288f8b7e4 WHIRLPOOL db5581c076f6d8e1afa8ddd1919669dd30fae26aa27d5787a485439d8802e3d0429f1ed43ccbed33d554f914052b68b89713da80af4bade980ae659f1e9644de DIST gentoo-livecd-2006.0-0.9.3.tar.bz2 3207382 SHA256 f6cd2120a2c139a5a0607151efd7a62f71e9fb915c46d1abebc2b894b0adda5a SHA512 79f0007f6c4d3b0056ca8d1d1ed6f021140ffefb5cdaa651483f2c4d8cfbd0b001cf27ab96474c17eeb61ffb72cb8d9d003db8bfa6fc7b737071c46ed9c6aca1 WHIRLPOOL 68d9c9329c8fef42f43fb69fa6dbea0fe8654d6cfca599f63b6ea06fef96b6b886ca7df637556a6ebeee797bc6a1ab82816f16c9682ef37fe8011c98ec96659a DIST gentoo-livecd-2006.1-0.9.4.tar.bz2 3447608 SHA256 8d87c4bd6d2677ff11566aee6bfadfbbf12f9dabc60c7c9b76eeaac5c86cbaa3 SHA512 e2928b547c6e7fe5e8c633f0a2e0363802c2b8f1fc5eb112a7be727b1a81b95bbb9889509efacbe7d6f555750438a1da7ad3705d9a2315ab15152c3794ac024c WHIRLPOOL 79f7cd1505b689d5dad6a582b5eea67f27de5b097239c4d093e328f6c1d546f433723f1d285c634c1fd09b93d763cd0b587152db150294e280a6e84b55c9188c -DIST gentoo-livecd-2007.0-0.9.5.tar.bz2 4760038 SHA256 58b6ef88458996dddd47567cbc6b1fb4ffe2c4cd5ff0f637b3b3155cd936ae4b SHA512 82081788f69a01677cd68640ef8b9a7c147120ebc2f7cd97e36cb6d1268ab1b93f0e61feaf42cfbcee191d37d647072c5828edb2c55a832f5a06a6708979c6ca WHIRLPOOL c8ac22fe27c4d3147dc725fa67f5923e37d7fbc8b8fed00a03e282f6754ef861016dbc8da8a924359e81465981e90d64b5277b67a7851e80465b6a61fca59755 DIST gentoo-livecd-2007.0-0.9.6.tar.bz2 4760433 SHA256 ed6a097cf1e33c55cb1f98dda1f7ae33be8e785e12ba00df82d497f04131e01f SHA512 a5a1ef2f10c9880d546184772108c56d5c700707199408ae63389a5bd7bec9c526f73631dfe782cceb88242ab8e8a56d14755552500c589fe1958e75e8b5015d WHIRLPOOL 7d7b3ddc3ad97a80917e52c483ceb0d53264dba9aed999e59d1b4245b7df16d56c9877fc5d89fd33cec1bc1b81394ad5fad05d91b791f9a3163a7d548d0d10d8 DIST splash-themes-livecd-2004.3.tar.bz2 1790707 SHA256 9b14e8c9a2124e3f1683fd6b3aa9a39ba9d090984c86ec7fcc3c7b1bf0e0b511 SHA512 75c897965cec7173c09027a8578e5047f7121e4b64f09f169ab40616bda412d555e5a4e42375082d685dd73d2d1026e18788408b36e9a690c41a0ba83759498f WHIRLPOOL 84b0a23771a7e85784551deab87cbb42a155581096f7e0b102b878f99495ed54847d9e68f2984ccb742febcfe2eca81db2065409237f58259c3508897caf8211 diff --git a/media-gfx/splash-themes-livecd/files/splash-themes-livecd-2007.0-rounding.patch b/media-gfx/splash-themes-livecd/files/splash-themes-livecd-2007.0-rounding.patch deleted file mode 100644 index 9239d37d551e..000000000000 --- a/media-gfx/splash-themes-livecd/files/splash-themes-livecd-2007.0-rounding.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp gentoo-livecd-2007.0-orig/scripts/rc_init-pre gentoo-livecd-2007.0/scripts/rc_init-pre ---- gentoo-livecd-2007.0-orig/scripts/rc_init-pre 2007-09-08 11:43:00.000000000 +0200 -+++ gentoo-livecd-2007.0/scripts/rc_init-pre 2007-09-08 11:43:17.000000000 +0200 -@@ -89,7 +89,7 @@ fi - P_RESOLUTION="$($C_FBRES)" - if [ -n "${P_RESOLUTION}" -a -n "${P_ICONW}" -a -n "${P_ICONH}" ]; then - P_ICONX="$(($((${P_RESOLUTION%x*} / 2)) - $((${P_ICONW} / 2))))" -- P_ICONY="$(echo "" | awk "{f=${P_RESOLUTION#*x};ih=${P_ICONH};print ((f/2)+((f/2)-(ih/3))/2)}")" -+ P_ICONY="$(echo "" | awk "{f=${P_RESOLUTION#*x};ih=${P_ICONH};print int((f/2)+((f/2)-(ih/3))/2)}")" - else - log err "failed to configure resolution and icon positioning" - exit "${E_RESOLUTION}" diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r1.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r1.ebuild deleted file mode 100644 index 220021a19157..000000000000 --- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils - -MY_P="gentoo-livecd-${PV}" -MY_REV="0.9.5" -DESCRIPTION="Gentoo theme for gensplash consoles" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="https://dev.gentoo.org/~wolf31o2/sources/${PN}/${MY_P}-${MY_REV}.tar.bz2" - -SLOT=${PV} -LICENSE="Artistic GPL-2 BitstreamVera" -KEYWORDS="amd64 ~ppc x86" -IUSE="" -RESTRICT="binchecks strip" - -DEPEND=">=media-gfx/splashutils-1.4.1" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! built_with_use media-gfx/splashutils mng - then - ewarn "MNG support is missing from splashutils. You will not see the" - ewarn "service icons as services are starting." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' \ - scripts/rc_init-pre - epatch "${FILESDIR}"/${P}-rounding.patch -} - -src_install() { - dodir /etc/splash/livecd-${PV} - cp -r "${S}"/* "${D}"/etc/splash/livecd-${PV} -} diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r2.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r2.ebuild deleted file mode 100644 index 7056e0fc0116..000000000000 --- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils - -MY_P="gentoo-livecd-${PV}" -MY_REV="0.9.6" -DESCRIPTION="Gentoo theme for gensplash consoles" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="mirror://gentoo/${PN}/${MY_P}-${MY_REV}.tar.bz2" - -SLOT=${PV} -LICENSE="Artistic GPL-2 BitstreamVera" -KEYWORDS="amd64 ~ppc x86" -IUSE="" -RESTRICT="binchecks strip" - -RDEPEND=">=media-gfx/splashutils-1.5.4[png]" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! built_with_use media-gfx/splashutils mng - then - ewarn "MNG support is missing from splashutils. You will not see the" - ewarn "service icons as services are starting." - fi -} - -src_install() { - dodir /etc/splash/livecd-${PV} - cp -r "${S}"/* "${D}"/etc/splash/livecd-${PV} -} diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r3.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r3.ebuild index ee8fface6a76..9574a38ba324 100644 --- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r3.ebuild +++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0-r3.ebuild @@ -3,7 +3,6 @@ # $Id$ EAPI="5" - inherit eutils MY_P="gentoo-livecd-${PV}" @@ -15,7 +14,6 @@ SRC_URI="mirror://gentoo/${PN}/${MY_P}-${MY_REV}.tar.bz2" SLOT=${PV} LICENSE="Artistic GPL-2 BitstreamVera" KEYWORDS="amd64 ~ppc x86" -IUSE="" RESTRICT="binchecks strip" RDEPEND=">=media-gfx/splashutils-1.5.4[png] @@ -24,14 +22,6 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" -pkg_setup() { - if ! built_with_use media-gfx/splashutils mng - then - ewarn "MNG support is missing from splashutils. You will not see the" - ewarn "service icons as services are starting." - fi -} - src_prepare() { epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch } diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0.ebuild deleted file mode 100644 index 1b3bf037e10a..000000000000 --- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils - -MY_P="gentoo-livecd-${PV}" -MY_REV="0.9.5" -DESCRIPTION="Gentoo theme for gensplash consoles" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="https://dev.gentoo.org/~wolf31o2/sources/${PN}/${MY_P}-${MY_REV}.tar.bz2" - -SLOT=${PV} -LICENSE="Artistic GPL-2 BitstreamVera" -KEYWORDS="amd64 ~ppc x86" -IUSE="" -RESTRICT="binchecks strip" - -DEPEND=">=media-gfx/splashutils-1.4.1" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! built_with_use media-gfx/splashutils mng - then - ewarn "MNG support is missing from splashutils. You will not see the" - ewarn "service icons as services are starting." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' scripts/rc_init-pre -} - -src_install() { - dodir /etc/splash/livecd-${PV} - cp -r "${S}"/* "${D}"/etc/splash/livecd-${PV} -} diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest index 46cb69b5697e..014282838e59 100644 --- a/media-libs/libsixel/Manifest +++ b/media-libs/libsixel/Manifest @@ -1,3 +1 @@ -DIST libsixel-1.4.12.tar.gz 4060158 SHA256 79ba3ed747aa5c02b28d16540bd399e9dfa897b824731584b664c6f9f3ef7148 SHA512 e210bff8a1944bdb0baa33e5cce402965bc82d776ed4e1a92ecc78063e9174ffa418ac7852560ccdddfdbca1fe215f34257efb42f36b5954ffa1d5f87c6d85fc WHIRLPOOL 396472c753b6fccdd69f62e95d5ba0d6d5c4eaf5f1e946f9142649ea8f222a71611250e4ce36cd5745f3a7ceddfaae2750cf0cb507e4ce5bc5225c4baeaea764 -DIST libsixel-1.4.13.tar.gz 4061302 SHA256 9f69097ee798807038c39345c5f596b2d12a22cef16690e701a0fab77cab7b63 SHA512 668ed894986473d63386f2c867029fa74e4f56b57a9ab993d93340a802aab1842359d7600950d95d11e47e41725c1e04284d6b5142e1263e8c7285dcbf344336 WHIRLPOOL 882a5b9280092d16940a6b0b85df8ea87e8fef87b773ce066555ae32b63ac68d991a1912d8311ce254c1f66ce4ca359b904e6c56c3c9a5df5bd955f07ab564a1 DIST libsixel-1.5.2.tar.gz 4731977 SHA256 f83a187a59753873dad630609bd895a33ef566df43ec93c0f8e2605d50ca60d1 SHA512 32d2c2683dcd7ec247d88552204e0bfc2d543565363a85ed965039ce26f8cb98b1d0b18ce5f0a621d161cee52b707d82f40626752490cf8d5ebca3e3e959f289 WHIRLPOOL 089d89e01785600c7b7851d484e142ba305f0d687ab506879283adffc3eb4dfd4c54d999f1590371127731dcb3789c4cc8419c6a3166511cf5bc8ea0a0298d54 diff --git a/media-libs/libsixel/files/libsixel-gd.patch b/media-libs/libsixel/files/libsixel-gd.patch new file mode 100644 index 000000000000..6c947490a0c5 --- /dev/null +++ b/media-libs/libsixel/files/libsixel-gd.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -354,7 +354,7 @@ + [gdImageCreateFromGifPtr], + [AC_CHECK_DECLS([gdImageCreateFromGifPtr], [], [], [ #include <gd.h> ])]) + AC_CHECK_LIB([gd], +- [gdImageCreateFromBmpPtr], ++ [gdImageCreateFromPngPtr], + [AC_CHECK_DECLS([gdImageCreateFromPngPtr], [], [], [ #include <gd.h> ])]) + AC_CHECK_LIB([gd], + [gdImageCreateFromBmpPtr], diff --git a/media-libs/libsixel/libsixel-1.4.12.ebuild b/media-libs/libsixel/libsixel-1.4.12.ebuild deleted file mode 100644 index a002b935ad70..000000000000 --- a/media-libs/libsixel/libsixel-1.4.12.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit bash-completion-r1 - -DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec" -HOMEPAGE="https://github.com/saitoha/libsixel" -SRC_URI="https://github.com/saitoha/libsixel/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="curl gd gtk jpeg png" - -RDEPEND="curl? ( net-misc/curl ) - gd? ( media-libs/gd ) - gtk? ( x11-libs/gdk-pixbuf:2 ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - econf \ - --with-bashcompletiondir=$(get_bashcompdir) \ - $(use_with curl libcurl) \ - $(use_with gd) \ - $(use_with gtk gdk-pixbuf2) \ - $(use_with jpeg) \ - $(use_with png) -} - -src_test() { - emake test -} - -src_install() { - default - - docompress -x /usr/share/doc/${PF}/images - dodoc -r images -} diff --git a/media-libs/libsixel/libsixel-1.4.13.ebuild b/media-libs/libsixel/libsixel-1.4.13.ebuild deleted file mode 100644 index 6358dc9ccd95..000000000000 --- a/media-libs/libsixel/libsixel-1.4.13.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit bash-completion-r1 - -DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec" -HOMEPAGE="https://github.com/saitoha/libsixel" -SRC_URI="https://github.com/saitoha/libsixel/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT public-domain" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~x86" -IUSE="curl gd gtk jpeg png" - -RDEPEND="curl? ( net-misc/curl ) - gd? ( media-libs/gd ) - gtk? ( x11-libs/gdk-pixbuf:2 ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - econf \ - --with-bashcompletiondir=$(get_bashcompdir) \ - $(use_with curl libcurl) \ - $(use_with gd) \ - $(use_with gtk gdk-pixbuf2) \ - $(use_with jpeg) \ - $(use_with png) -} - -src_test() { - emake test -} - -src_install() { - default - - docompress -x /usr/share/doc/${PF}/images - dodoc -r images -} diff --git a/media-libs/libsixel/libsixel-1.5.2.ebuild b/media-libs/libsixel/libsixel-1.5.2.ebuild index ef878d281e61..076be8b219ff 100644 --- a/media-libs/libsixel/libsixel-1.5.2.ebuild +++ b/media-libs/libsixel/libsixel-1.5.2.ebuild @@ -1,10 +1,10 @@ -# 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 bash-completion-r1 +inherit autotools bash-completion-r1 eutils DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec" HOMEPAGE="https://github.com/saitoha/libsixel" @@ -23,6 +23,11 @@ RDEPEND="curl? ( net-misc/curl ) DEPEND="${RDEPEND} virtual/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${PN}-gd.patch + eautoreconf +} + src_configure() { econf \ --disable-python \ diff --git a/media-sound/moc/moc-2.6_alpha1-r1.ebuild b/media-sound/moc/moc-2.6_alpha1-r1.ebuild index 3901a156b09d..62ab9f90067c 100644 --- a/media-sound/moc/moc-2.6_alpha1-r1.ebuild +++ b/media-sound/moc/moc-2.6_alpha1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${PN}-${MY_PV}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack oss sid sndfile speex timidity tremor +unicode vorbis wavpack" diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest index abf606a2bf7f..8bb8aa25bfb1 100644 --- a/media-video/dvdstyler/Manifest +++ b/media-video/dvdstyler/Manifest @@ -1,6 +1 @@ -DIST DVDStyler-2.7.2.tar.bz2 5982155 SHA256 b30df3870b9cfcac5bc4387d276aec10e0913ce66c63007f1393123afda180be SHA512 f4913ff5ed11e7cedccb8408bea9adbfae7494afde9062c4acc7e65014af821d4b5acacbce57fd07225cf3af8c21ba552897b50be67f21e242fb6f4baeed000d WHIRLPOOL 070254838db445175401c6d2fb05dc6ee5d79620a598f5a5f0c6d4d8bf9cb5b3ecfc1ad0e708b6289b37b0a5cd0a5c2b0c089c87951b60fe0d48eab85cc9410f -DIST DVDStyler-2.9.2.tar.bz2 7861116 SHA256 88abd17b0dcdfccbdfffe6e80bcfa59df023f1ff2eed782e58d1f793a81dbd1f SHA512 5688f383b03cb0ec6c57659494d1f4f98f72c21e3e125e16ec3adfeac20555d6f26a12d3629417b46f833933f504e1d55a7fcdb2c0926643e0bfadcab8c998be WHIRLPOOL cd857c39a5de581b201b2d78d7a676b05f5dbdef3592fe835158cceb05d8b8e37cf5a4f88514469bbfac908f827843718b733566cac6fd86f6c7700bc49e0431 -DIST DVDStyler-2.9.3.tar.bz2 7861272 SHA256 ffbc22454e210ba8fcad9a7954b426d9dc5ff933527a6e39391d310101128c39 SHA512 c39a1c08ea5e86e05c25443685524c61c26a5fe11e66240884db6b54c117f1cc446634145bc99673eb7de2ed44e3d03277686470dfde3ab78a5943b2667e7b73 WHIRLPOOL d08202272c5ec9fbaec7b049e854cdb413a929b59ee047a99a4d70699f80a2a0a47786335a9bc05d8d7ca905f9137d4f81bc31fd56a78943c71b169999cc0cd3 -DIST DVDStyler-2.9.4.tar.bz2 7863263 SHA256 8b15ec98e3e5ec8c5a1f23eee316f646476e76b86b80d44b7c842887946a39e0 SHA512 8ef8e0241f31957b6c1695876a2067510750b3e997d57c688ceed640110488c2989af12d23147a5b439625cafc5bf7f2d3a8cdda8304b96555f48b6f5553cde4 WHIRLPOOL 07f3a96f83e0d7bbaea4cf01f9c440d63590f632de3ebbb516d7551ced21c9597790149f252f517f627c5d8800e5a1d8737ad15a015eb1f76e7fef4d7dc15dbf -DIST DVDStyler-2.9.5.tar.bz2 7864947 SHA256 4717a58fc5980e1007624be7c14ebb8b1ace7839ad38fe7fbfdc0db4e26d3e1b SHA512 fef02eb3a10b46fe6345610aa49e40a8a47e8a4fce35541f23762e75546788ab628ad70a76bf9362bdd5161101ac6be8057222f4bdcc84fb9f1eb49042de1526 WHIRLPOOL 70ffac3ca9ca9c1b38224f66a32d893ab1c92f3129be815d7b4cfec0cebf53098cee3f7169ddc942f58efc1268ea8553a3444df63a69e307df2d4a0851bd1edf DIST DVDStyler-2.9.6.tar.bz2 8373340 SHA256 d9ac1c2fa8812c194d4a79a5954f96919a4823498a4200018964df549270c6e3 SHA512 7e45a61ecc5df29957c6ff71bf7d5032bc1cba3b43b8444f7cd065aabf3991961f998e220d41c05c3d4e9a3bc213c96bc484b467a40d1b10ab33630ea4cbbcea WHIRLPOOL d7b6f714fcde76c74f5f4dee66918ddfb17066f85147a7efd355fe19d057d3c56bf0f1116595cfa361b09f1d82ebc09ab0fad6f5fc8ab029df01a9abe267b564 diff --git a/media-video/dvdstyler/dvdstyler-2.7.2.ebuild b/media-video/dvdstyler/dvdstyler-2.7.2.ebuild deleted file mode 100644 index 5c30788315ef..000000000000 --- a/media-video/dvdstyler/dvdstyler-2.7.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P=${P/dvds/DVDS} -WX_GTK_VER=2.8 - -inherit wxwidgets - -DESCRIPTION="A cross-platform free DVD authoring application" -HOMEPAGE="http://www.dvdstyler.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +udev" - -COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1 - media-libs/libexif:= - >=media-libs/wxsvg-1.2:= - >=media-video/dvdauthor-0.7.1 - >=media-video/xine-ui-0.99.7 - virtual/cdrtools - >=virtual/ffmpeg-9-r1[encode] - virtual/jpeg:0 - >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X] - udev? ( >=virtual/libudev-215:= )" -RDEPEND="${COMMON_DEPEND} - >=app-cdr/dvdisaster-0.72.4 - media-video/mjpegtools" -DEPEND="${COMMON_DEPEND} - app-arch/zip - app-text/xmlto - sys-devel/gettext - virtual/yacc - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # disable obsolete GNOME 2.x libraries wrt #508854 - sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die - # rmdir: failed to remove `tempfoobar': Directory not empty - sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die - # fix underlinking wrt #367863 - sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die - # silence desktop-file-validate QA check - sed -i \ - -e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \ - data/dvdstyler.desktop || die -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable debug) \ - --with-wx-config=${WX_CONFIG} -} - -src_install() { - default - rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} -} diff --git a/media-video/dvdstyler/dvdstyler-2.9.2.ebuild b/media-video/dvdstyler/dvdstyler-2.9.2.ebuild deleted file mode 100644 index c5bc193a50f9..000000000000 --- a/media-video/dvdstyler/dvdstyler-2.9.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P=${P/dvds/DVDS} -WX_GTK_VER=2.8 - -inherit wxwidgets - -DESCRIPTION="A cross-platform free DVD authoring application" -HOMEPAGE="http://www.dvdstyler.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +udev" - -COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1 - media-libs/libexif:= - >=media-libs/wxsvg-1.2:= - >=media-video/dvdauthor-0.7.1 - >=media-video/xine-ui-0.99.7 - virtual/cdrtools - >=virtual/ffmpeg-9-r1[encode] - virtual/jpeg:0 - >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X] - udev? ( >=virtual/libudev-215:= )" -RDEPEND="${COMMON_DEPEND} - >=app-cdr/dvdisaster-0.72.4 - media-video/mjpegtools" -DEPEND="${COMMON_DEPEND} - app-arch/zip - app-text/xmlto - sys-devel/gettext - virtual/yacc - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # disable obsolete GNOME 2.x libraries wrt #508854 - sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die - # rmdir: failed to remove `tempfoobar': Directory not empty - sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die - # fix underlinking wrt #367863 - sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die - # silence desktop-file-validate QA check - sed -i \ - -e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \ - data/dvdstyler.desktop || die -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable debug) \ - --with-wx-config=${WX_CONFIG} -} - -src_install() { - default - rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} -} diff --git a/media-video/dvdstyler/dvdstyler-2.9.3.ebuild b/media-video/dvdstyler/dvdstyler-2.9.3.ebuild deleted file mode 100644 index 914cefef65d9..000000000000 --- a/media-video/dvdstyler/dvdstyler-2.9.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P=${P/dvds/DVDS} -WX_GTK_VER=2.8 - -inherit wxwidgets eutils - -DESCRIPTION="A cross-platform free DVD authoring application" -HOMEPAGE="http://www.dvdstyler.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +udev" - -COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1 - media-libs/libexif:= - >=media-libs/wxsvg-1.2:= - >=media-video/dvdauthor-0.7.1 - >=media-video/xine-ui-0.99.7 - virtual/cdrtools - >=virtual/ffmpeg-9-r1[encode] - virtual/jpeg:0 - >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X] - udev? ( >=virtual/libudev-215:= )" -RDEPEND="${COMMON_DEPEND} - >=app-cdr/dvdisaster-0.72.4 - media-video/mjpegtools" -DEPEND="${COMMON_DEPEND} - app-arch/zip - app-text/xmlto - sys-devel/gettext - virtual/yacc - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # disable obsolete GNOME 2.x libraries wrt #508854 - sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die - # rmdir: failed to remove `tempfoobar': Directory not empty - sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die - # fix underlinking wrt #367863 - sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die - # silence desktop-file-validate QA check - sed -i \ - -e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \ - data/dvdstyler.desktop || die - has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/ffmpeg29.patch" -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable debug) \ - --with-wx-config=${WX_CONFIG} -} - -src_install() { - default - rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} -} diff --git a/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild b/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild deleted file mode 100644 index 8e6f47d33e31..000000000000 --- a/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P=${P/dvds/DVDS} -WX_GTK_VER=3.0 - -inherit wxwidgets eutils - -DESCRIPTION="A cross-platform free DVD authoring application" -HOMEPAGE="http://www.dvdstyler.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug libav +udev" - -COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1 - media-libs/libexif:= - >=media-libs/wxsvg-1.3:= - >=media-video/dvdauthor-0.7.1 - >=media-video/xine-ui-0.99.7 - virtual/cdrtools - libav? ( >=media-video/libav-9:0=[encode] ) - !libav? ( >=media-video/ffmpeg-2.6:0=[encode] ) - virtual/jpeg:0 - x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X] - sys-apps/dbus - udev? ( >=virtual/libudev-215:= )" -RDEPEND="${COMMON_DEPEND} - >=app-cdr/dvdisaster-0.72.4 - media-video/mjpegtools" -DEPEND="${COMMON_DEPEND} - app-arch/zip - app-text/xmlto - sys-devel/gettext - virtual/yacc - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - need-wxwidgets unicode - # disable obsolete GNOME 2.x libraries wrt #508854 - sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die - # rmdir: failed to remove `tempfoobar': Directory not empty - sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die - # fix underlinking wrt #367863 - sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die - # silence desktop-file-validate QA check - sed -i \ - -e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \ - data/dvdstyler.desktop || die - epatch "${FILESDIR}/${PN}-2.9.4-ffmpeg29.patch" -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable debug) \ - --with-wx-config=${WX_CONFIG} -} - -src_install() { - default - rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} -} diff --git a/media-video/dvdstyler/dvdstyler-2.9.4.ebuild b/media-video/dvdstyler/dvdstyler-2.9.4.ebuild deleted file mode 100644 index 8587dc494e14..000000000000 --- a/media-video/dvdstyler/dvdstyler-2.9.4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P=${P/dvds/DVDS} -WX_GTK_VER=2.8 - -inherit wxwidgets eutils - -DESCRIPTION="A cross-platform free DVD authoring application" -HOMEPAGE="http://www.dvdstyler.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +udev" - -COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1 - media-libs/libexif:= - >=media-libs/wxsvg-1.3:= - >=media-video/dvdauthor-0.7.1 - >=media-video/xine-ui-0.99.7 - virtual/cdrtools - >=virtual/ffmpeg-9-r1[encode] - virtual/jpeg:0 - >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X] - sys-apps/dbus - udev? ( >=virtual/libudev-215:= )" -RDEPEND="${COMMON_DEPEND} - >=app-cdr/dvdisaster-0.72.4 - media-video/mjpegtools" -DEPEND="${COMMON_DEPEND} - app-arch/zip - app-text/xmlto - sys-devel/gettext - virtual/yacc - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # disable obsolete GNOME 2.x libraries wrt #508854 - sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die - # rmdir: failed to remove `tempfoobar': Directory not empty - sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die - # fix underlinking wrt #367863 - sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die - # silence desktop-file-validate QA check - sed -i \ - -e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \ - data/dvdstyler.desktop || die - has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/ffmpeg29.patch" -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable debug) \ - --with-wx-config=${WX_CONFIG} -} - -src_install() { - default - rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} -} diff --git a/media-video/dvdstyler/dvdstyler-2.9.5.ebuild b/media-video/dvdstyler/dvdstyler-2.9.5.ebuild deleted file mode 100644 index b5f8e7b8b70c..000000000000 --- a/media-video/dvdstyler/dvdstyler-2.9.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P=${P/dvds/DVDS} -WX_GTK_VER=3.0 - -inherit wxwidgets eutils - -DESCRIPTION="A cross-platform free DVD authoring application" -HOMEPAGE="http://www.dvdstyler.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug libav +udev" - -COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1 - media-libs/libexif:= - >=media-libs/wxsvg-1.3:= - >=media-video/dvdauthor-0.7.1 - >=media-video/xine-ui-0.99.7 - virtual/cdrtools - libav? ( >=media-video/libav-9:0=[encode] ) - !libav? ( >=media-video/ffmpeg-2.6:0=[encode] ) - virtual/jpeg:0 - x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X] - sys-apps/dbus - udev? ( >=virtual/libudev-215:= )" -RDEPEND="${COMMON_DEPEND} - >=app-cdr/dvdisaster-0.72.4 - media-video/mjpegtools" -DEPEND="${COMMON_DEPEND} - app-arch/zip - app-text/xmlto - sys-devel/gettext - virtual/yacc - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - need-wxwidgets unicode - # disable obsolete GNOME 2.x libraries wrt #508854 - sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die - # rmdir: failed to remove `tempfoobar': Directory not empty - sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die - # fix underlinking wrt #367863 - sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die - # silence desktop-file-validate QA check - sed -i \ - -e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \ - data/dvdstyler.desktop || die -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable debug) \ - --with-wx-config=${WX_CONFIG} -} - -src_install() { - default - rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} -} diff --git a/media-video/dvdstyler/dvdstyler-2.9.6.ebuild b/media-video/dvdstyler/dvdstyler-2.9.6-r1.ebuild index b5f8e7b8b70c..c1603a7ad6fb 100644 --- a/media-video/dvdstyler/dvdstyler-2.9.6.ebuild +++ b/media-video/dvdstyler/dvdstyler-2.9.6-r1.ebuild @@ -18,9 +18,10 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug libav +udev" -COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1 +COMMON_DEPEND=" + >=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= - >=media-libs/wxsvg-1.3:= + >=media-libs/wxsvg-1.5.5:= >=media-video/dvdauthor-0.7.1 >=media-video/xine-ui-0.99.7 virtual/cdrtools @@ -29,18 +30,21 @@ COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1 virtual/jpeg:0 x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X] sys-apps/dbus - udev? ( >=virtual/libudev-215:= )" + udev? ( >=virtual/libudev-215:= ) +" RDEPEND="${COMMON_DEPEND} >=app-cdr/dvdisaster-0.72.4 - media-video/mjpegtools" + media-video/mjpegtools +" DEPEND="${COMMON_DEPEND} app-arch/zip app-text/xmlto sys-devel/gettext virtual/yacc - virtual/pkgconfig" + virtual/pkgconfig +" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_prepare() { need-wxwidgets unicode diff --git a/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch deleted file mode 100644 index 2ddd41408b59..000000000000 --- a/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp -=================================================================== ---- DVDStyler-2.9.4.orig/src/mediaenc_ffmpeg.cpp -+++ DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp -@@ -179,7 +179,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea - c->time_base.den = isNTSC(videoFormat) ? 30000 : 25; - c->time_base.num = isNTSC(videoFormat) ? 1001 : 1; - c->gop_size = m_gopSize > 0 ? m_gopSize : (isNTSC(videoFormat) ? 15 : 12); -- c->pix_fmt = PIX_FMT_YUV420P; -+ c->pix_fmt = AV_PIX_FMT_YUV420P; - c->rc_buffer_size = VIDEO_BUF_SIZE; - c->rc_max_rate = 9000000; - c->rc_min_rate = 0; -@@ -280,7 +280,7 @@ void wxFfmpegMediaEncoder::CloseAudioEnc - m_audioStm = NULL; - } - --AVFrame* allocPicture(PixelFormat pix_fmt, int width, int height) { -+AVFrame* allocPicture(AVPixelFormat pix_fmt, int width, int height) { - AVFrame* frame = av_frame_alloc(); - if (!frame) - return NULL; -@@ -329,7 +329,7 @@ bool wxFfmpegMediaEncoder::OpenVideoEnco - return false; - } - -- m_imgConvertCtx = sws_getContext(c->width, c->height, PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, -+ m_imgConvertCtx = sws_getContext(c->width, c->height, AV_PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, - NULL, NULL, NULL); - if (!m_imgConvertCtx) { - wxLogError(wxT("Cannot initialize the conversion context")); diff --git a/media-video/dvdstyler/files/ffmpeg29.patch b/media-video/dvdstyler/files/ffmpeg29.patch deleted file mode 100644 index 22ab9a6451da..000000000000 --- a/media-video/dvdstyler/files/ffmpeg29.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: DVDStyler-2.9.3/src/mediaenc_ffmpeg.cpp -=================================================================== ---- DVDStyler-2.9.3.orig/src/mediaenc_ffmpeg.cpp -+++ DVDStyler-2.9.3/src/mediaenc_ffmpeg.cpp -@@ -178,7 +178,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea - c->time_base.den = isNTSC(videoFormat) ? 30000 : 25; - c->time_base.num = isNTSC(videoFormat) ? 1001 : 1; - c->gop_size = isNTSC(videoFormat) ? 15 : 12; -- c->pix_fmt = PIX_FMT_YUV420P; -+ c->pix_fmt = AV_PIX_FMT_YUV420P; - c->rc_buffer_size = VIDEO_BUF_SIZE; - c->rc_max_rate = 9000000; - c->rc_min_rate = 0; -@@ -279,7 +279,7 @@ void wxFfmpegMediaEncoder::CloseAudioEnc - m_audioStm = NULL; - } - --AVFrame* allocPicture(PixelFormat pix_fmt, int width, int height) { -+AVFrame* allocPicture(AVPixelFormat pix_fmt, int width, int height) { - AVFrame* frame = av_frame_alloc(); - if (!frame) - return NULL; -@@ -318,7 +318,7 @@ bool wxFfmpegMediaEncoder::OpenVideoEnco - return false; - } - -- m_imgConvertCtx = sws_getContext(c->width, c->height, PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, -+ m_imgConvertCtx = sws_getContext(c->width, c->height, AV_PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, - NULL, NULL, NULL); - if (!m_imgConvertCtx) { - wxLogError(wxT("Cannot initialize the conversion context")); diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest index af34872a6704..0fbe8fb78ece 100644 --- a/media-video/movit/Manifest +++ b/media-video/movit/Manifest @@ -2,3 +2,4 @@ DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3 DIST movit-1.2.0.tar.gz 534145 SHA256 aeda1212288277ca136f2483765577a43ebd718be835dde73d81cf4b682fd473 SHA512 7c75ae60e2b5248e2691074d67005728555d6b7fea320ac9d7bcd401c1640467f18f78e446e57894d9b3b3b6a597ee0603ccdd963f21a408e96c7f0d0f5ac154 WHIRLPOOL 3b937f8964e79066f2b9811f80d0bd8d97375d3a2154a8763f5caac0a416432c6229de7c711edd606f1d7b7970ba2da97b2b2647b61b435a677267c0d24187ac DIST movit-1.3.0.tar.gz 546075 SHA256 6a4b4fd6a49d6231d0ab84a2b98c822ed67bb32a803eea5a985557094b84abb3 SHA512 fea5419c4e5034f8e43d0a88845e6bdbd0b7b45bd2517368e8575432c564a62a3b14e290bc2751f046c5345c4dd64961f1829eb0b238237fbb1e09da58686658 WHIRLPOOL 3ad785ec72aca7aa8e24e448478ccf663c4f63dc638b24c574e688dd9d0aeb41d3ad357033d8e9e73749e1bab62cb5443ae74a6225250dbc24d6ff7f20310885 DIST movit-1.3.1.tar.gz 574203 SHA256 8755d1a93b923dac21897faad883fec3aa793cb04938e05b16d96422ec7a664f SHA512 44610609ab85a8684e7e1469d50f4e6fa3a786e9bdeba58ccbb093c2312572b01e710ddec598e765bf81fa504bb31455ae430959180f326463da7a535d20b01b WHIRLPOOL 3f772cbd259a2600e850a42dca75a39569b3194ecc82c2337ffb23245a12fe5e0a9bcaec71ecbb2ccfe737d868bc0695c2c48eef6a4f35447f67742e4983784c +DIST movit-1.3.2.tar.gz 574225 SHA256 1d41043e8db1363c69b897c970f5740b583ad9c1b6923ebe97790b8f9e72ed66 SHA512 662cf88cf294b9e2b3172ec02f74766a6dc36b28f3057894bd46090dfa26afc24219155f23225434244543238a1df37c039ad73f2de3aae8346a3d9a8aee23c7 WHIRLPOOL c038fb2e2b1f7e97661732f287969cbcfaf4aacf29fdc0ef1408efc1ded72d0ff2c3e5a65c8df15af0a8f47ace534e66656bd5fe5cb84f37c96c43f224d7d32c diff --git a/media-video/movit/movit-1.3.2.ebuild b/media-video/movit/movit-1.3.2.ebuild new file mode 100644 index 000000000000..4f5ac9607a6e --- /dev/null +++ b/media-video/movit/movit-1.3.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +# no sane way to use OpenGL from within tests? +RESTRICT="test" + +DESCRIPTION="Modern Video Toolkit" +HOMEPAGE="http://movit.sesse.net/" +# Tests need gtest, makefile unconditionally builds tests, so ... yey! +SRC_URI="http://movit.sesse.net/${P}.tar.gz + https://googletest.googlecode.com/files/gtest-1.7.0.zip" +LICENSE="GPL-2+" +SLOT="0" + +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="" + +RDEPEND="media-libs/mesa + >=dev-cpp/eigen-3.2.0:3 + media-libs/libepoxy + sci-libs/fftw + media-libs/libsdl2 + " +DEPEND="${RDEPEND}" + +src_compile() { + GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake +} + +src_test() { + GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check +} diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 6bf61e7b781b..05a0479ee2a3 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1 +1,2 @@ DIST wireshark-2.0.1.tar.bz2 31016295 SHA256 c9bd07dd0d0045d6ca7537390a1afbcdf33716d193ea7d7084ae4f6c30b683ab SHA512 fc029759cecd10d20bd323d6ea41d6bd1326a1a0f8d847d681ce218eb0e7ece84fba4e91709adab556e9495812bf0fa8bcb40318053e6403c3d5c9d899d544ca WHIRLPOOL 45a1a37ef3fb229d762e85a2833b4760428e91caa0b6958d3c6b79bbea76acae6f8685ecd1190ac1ef9daffd49bee9276391ac09653d75f61e6e6dc20de52789 +DIST wireshark-2.0.2.tar.bz2 31073440 SHA256 e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1 SHA512 a3645f0c2600091d3af76d12db4b73f83e6af4686a1bd7a336a420e4d7505ed281dfabb05c05cd6f58084fa3f25b6b9014b6f273b875c713ee39c77b4c5c715f WHIRLPOOL 4041698412d96ce495e2b564c897b4d770eea1851e431b43b2ef1bc6834bf57460ace5cc2e3f9ae6e05babbbec85e096ee1a87bc68211677202215c4dd0b53e5 diff --git a/net-analyzer/wireshark/wireshark-2.0.2.ebuild b/net-analyzer/wireshark/wireshark-2.0.2.ebuild new file mode 100644 index 000000000000..479c692c4912 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-2.0.2.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user + +DESCRIPTION="A network protocol analyzer formerly known as ethereal" +HOMEPAGE="http://www.wireshark.org/" +SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE=" + adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua + +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark + cpu_flags_x86_sse4_2 ssl zlib +" +REQUIRED_USE=" + ssl? ( crypt ) + ?? ( qt4 qt5 ) +" + +S=${WORKDIR}/${P/_/} + +GTK_COMMON_DEPEND=" + x11-libs/gdk-pixbuf + x11-libs/pango + x11-misc/xdg-utils +" +CDEPEND=" + >=dev-libs/glib-2.14:2 + netlink? ( dev-libs/libnl:3 ) + adns? ( >=net-dns/c-ares-1.5 ) + crypt? ( dev-libs/libgcrypt:0 ) + caps? ( sys-libs/libcap ) + geoip? ( dev-libs/geoip ) + gtk3? ( + ${GTK_COMMON_DEPEND} + x11-libs/gtk+:3 + ) + kerberos? ( virtual/krb5 ) + lua? ( >=dev-lang/lua-5.1:* ) + pcap? ( net-libs/libpcap ) + portaudio? ( media-libs/portaudio ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4[accessibility] + x11-misc/xdg-utils + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + x11-misc/xdg-utils + ) + sbc? ( media-libs/sbc ) + smi? ( net-libs/libsmi ) + ssl? ( net-libs/gnutls ) + zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) +" +# We need perl for `pod2html`. The rest of the perl stuff is to block older +# and broken installs. #455122 +DEPEND=" + ${CDEPEND} + dev-lang/perl + !<virtual/perl-Pod-Simple-3.170 + !<perl-core/Pod-Simple-3.170 + doc? ( + app-doc/doxygen + app-text/asciidoc + dev-libs/libxml2 + dev-libs/libxslt + doc-pdf? ( dev-java/fop ) + www-client/lynx + ) + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" +RDEPEND=" + ${CDEPEND} + gtk3? ( virtual/freedesktop-icon-theme ) + qt4? ( virtual/freedesktop-icon-theme ) + qt5? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" + +pkg_setup() { + enewgroup wireshark +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ + "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \ + "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \ + "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \ + "${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \ + "${FILESDIR}"/${PN}-2.1.0-sse4_2.patch + + epatch_user + + eautoreconf +} + +src_configure() { + local myconf + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + myconf+=( "--with-ssl" ) + ;; + esac + fi + + # Enable wireshark binary with any supported GUI toolkit (bug #473188) + if use gtk3 || use qt4 || use qt5; then + myconf+=( "--enable-wireshark" ) + else + myconf+=( "--disable-wireshark" ) + fi + + if ! use qt4 && ! use qt5; then + myconf+=( "--with-qt=no" ) + fi + + if use qt4; then + export QT_MIN_VERSION=4.6.0 + fi + + if use qt5; then + export QT_MIN_VERSION=5.3.0 + append-cxxflags -fPIC -DPIC + fi + + # Hack around inability to disable doxygen/fop doc generation + use doc || export ac_cv_prog_HAVE_DOXYGEN=false + use doc-pdf || export ac_cv_prog_HAVE_FOP=false + + # dumpcap requires libcap + # --disable-profile-build bugs #215806, #292991, #479602 + econf \ + $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ + $(use_enable androiddump) \ + $(use_enable ipv6) \ + $(use_enable tfshark) \ + $(use_with adns c-ares) \ + $(use_with caps libcap) \ + $(use_with crypt gcrypt) \ + $(use_with geoip) \ + $(use_with gtk3) \ + $(use_with kerberos krb5) \ + $(use_with lua) \ + $(use_with pcap dumpcap-group wireshark) \ + $(use_with pcap) \ + $(use_with portaudio) \ + $(usex qt4 --with-qt=4 '') \ + $(usex qt5 --with-qt=5 '') \ + $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \ + $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \ + $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \ + $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ + $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ + $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ + $(use_with sbc) \ + $(use_with smi libsmi) \ + $(use_with ssl gnutls) \ + $(use_with zlib) \ + $(usex netlink --with-libnl=3 --without-libnl) \ + $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \ + --disable-profile-build \ + --disable-usr-local \ + --disable-warnings-as-errors \ + --sysconfdir="${EPREFIX}"/etc/wireshark \ + --without-adns \ + ${myconf[@]} +} + +src_compile() { + default + if use doc; then + use doc-pdf && addpredict "/root/.java" + emake -j1 -C docbook + fi +} + +src_install() { + default + + if use doc; then + dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} + if use doc-pdf; then + insinto /usr/share/doc/${PF}/pdf/ + doins docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf + fi + fi + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \ + doc/{randpkt.txt,README*} + + # install headers + local wsheader + for wsheader in \ + color.h \ + config.h \ + epan/*.h \ + epan/crypt/*.h \ + epan/dfilter/*.h \ + epan/dissectors/*.h \ + epan/ftypes/*.h \ + epan/wmem/*.h \ + register.h \ + wiretap/*.h \ + ws_symbol_export.h \ + wsutil/*.h + do + insinto /usr/include/wireshark/$( dirname ${wsheader} ) + doins ${wsheader} + done + + #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/ + insinto /usr/include/wiretap + doins wiretap/wtap.h + + if use gtk3 || use qt4 || use qt5; then + local c d + for c in hi lo; do + for d in 16 32 48; do + insinto /usr/share/icons/${c}color/${d}x${d}/apps + newins image/${c}${d}-app-wireshark.png wireshark.png + done + done + for d in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes + newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png + done + fi + + if use gtk3; then + domenu wireshark.desktop + fi + + if use qt4 || use qt5; then + sed \ + -e '/Exec=/s|wireshark|&-qt|g' \ + -e 's|^Name.*=Wireshark|& (Qt)|g' \ + wireshark.desktop > wireshark-qt.desktop \ + || die + domenu wireshark-qt.desktop + fi + + prune_libtool_files +} + +pkg_postinst() { + # Add group for users allowed to sniff. + enewgroup wireshark + + if use pcap; then + fcaps -o 0 -g wireshark -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + ewarn "NOTE: To capture traffic with wireshark as normal user you have to" + ewarn "add yourself to the wireshark group. This security measure ensures" + ewarn "that only trusted users are allowed to sniff your traffic." +} diff --git a/net-ftp/filezilla/filezilla-3.15.0.2.ebuild b/net-ftp/filezilla/filezilla-3.15.0.2.ebuild index 4749c32e59ce..0a3044dfa536 100644 --- a/net-ftp/filezilla/filezilla-3.15.0.2.ebuild +++ b/net-ftp/filezilla/filezilla-3.15.0.2.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="dbus nls test" # pugixml 1.7 minimal dependency is for c++11 proper configuration diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index c6a5fec9c059..dd6a94fa0005 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -2,3 +2,4 @@ DIST gsoap_2.7.17.zip 10224444 SHA256 d3af1ce9464b28cacdf1dfbe09b689f8927cbcf394 DIST gsoap_2.8.23.zip 22482000 SHA256 e1c30743f1c2cf40b2760568127e14af1b2a00c3026b2e5f0750e8c33d94c061 SHA512 cc90aadfe09aa6406172c9ffa07696851ff594ca7c5b40819494badd8ce978d908d66de63a5831e7aec1bca18ee8b51ed02187057688a3b36eb0a21fe6e0f5a4 WHIRLPOOL e5cfc9c5758847d1fc94cbd38108b80c7548abc0316fe201b58604a3b22d30b9748c81d4aec13f53356593f3ddc2dcba14170a53d63795eab9229ec49d4bc585 DIST gsoap_2.8.27.zip 22643224 SHA256 cdd9188f3a00caf14fae54d7cc975227128118e818036e5b6bd6e87550e1dc35 SHA512 45c2a653ef588acf41b23c14fdfe2524b37b3324d9ca332a1f8c7ec37fd6e1cf297c798dc7eeb2f90aaa2dd3a72a87f5cde1daf0a513b0259e08a89e386846ad WHIRLPOOL b82a7e9e4ff7b1042ef0c3346ea9cdeb343232d0cc23ec96845adcc44a4b4d773df42fe72a1eaeadb4e33cc63d5458d7bcb0dc97184ab6d0f5e82682eaaba8ad DIST gsoap_2.8.28.zip 23729531 SHA256 453b36d97a98b35c2829284219dd09a4d60f073a5b77c658c403961c54cfa328 SHA512 1ada2993ca2fe52ff8337484f1be387a0d74b894c633fb0a947f0c160bf875a17825983c174d6e0d84dc8292964f854638dbd9bb54402a8de618036a7db9623b WHIRLPOOL 5c2255d868b140646d0609d25681dea7cf2861d5ee39c771c84e16af77d4f2b6a8541f93bcf1dcefb642f35571936b63fc69acdcec0ae46de87fc96fb7af75bd +DIST gsoap_2.8.29.zip 24006374 SHA256 a9dacc4f862892df6cf9119d1c5d627af3a864c17f17b6542c560e72070b1381 SHA512 ce79cf52210e8ce34b39dc25931dbdc36bdd770ac01e70583e1e4a2f1006f20d259dd57d02a1baf2f937016c63837b9a9befca3d71f992f7a798a55de70a8c61 WHIRLPOOL a5c884b7c7e9144d293674d4977edbe8fda780003cca554acd08db5aade0f09702b294d69bb67f26f668d3a6f195791f9f6483d4a94df83f09ab79bc8985fb08 diff --git a/net-libs/gsoap/gsoap-2.8.29.ebuild b/net-libs/gsoap/gsoap-2.8.29.ebuild new file mode 100644 index 000000000000..e8c1c2e6b7c7 --- /dev/null +++ b/net-libs/gsoap/gsoap-2.8.29.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools eutils + +MY_P="${PN}-2.8" + +DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services" +HOMEPAGE="http://gsoap2.sourceforge.net" +SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip" + +LICENSE="GPL-2 gSOAP" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc debug examples ipv6 libressl gnutls +ssl" + +RDEPEND=" + sys-libs/zlib + gnutls? ( net-libs/gnutls ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) +" +DEPEND="${RDEPEND} + app-arch/unzip + sys-devel/flex + sys-devel/bison +" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Fix Pre-ISO headers + eapply "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch" + + eautoreconf +} + +src_configure() { + local myconf=() + use ssl || myconf+=( --disable-ssl ) + use gnutls && myconf+=( --enable-gnutls ) + use ipv6 && myconf+=( --enable-ipv6 ) + econf \ + ${myconf[@]} \ + $(use_enable debug) \ + $(use_enable examples samples) +} + +src_compile() { + emake -j1 +} + +src_install() { + emake DESTDIR="${D}" install + + # yes, we also install the license-file since + # it contains info about how to apply the licenses + dodoc *.txt + + dohtml changelog.md + + prune_libtool_files --all + + if use examples; then + rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die + insinto /usr/share/doc/${PF}/examples + doins -r gsoap/samples/* + fi + + if use doc; then + dohtml -r gsoap/doc/* + fi +} diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest index a35a89f4ce95..c94a38d0941e 100644 --- a/net-libs/libssh/Manifest +++ b/net-libs/libssh/Manifest @@ -1,4 +1,3 @@ -DIST libssh-0.6.5-compilefix.patch 737 SHA256 952c6a617791c35fe8d44a47d1252aebd2d844f40480170b14391c80f2092fff SHA512 fa9d8322778ca93b6ae62e0012722a2df94179891f5bafefc67a7502f4bc96ec86768e07f374f37486641614298472227eb48aa5747dabf840636e9f1ce9cbde WHIRLPOOL 575bca37a3dbe892e44b362c02f370cc13f94ef2706c435a9d3e2604941cece285637dd6831c27337ab5fc76c4e8588092f106e2ea963dc15d46129cecd1f2cb DIST libssh-0.6.5.tar.xz 281564 SHA256 0fd52763e033d5e9b1cd55f60a74e619731c5ba630938eec95682dbe4cf7dc2c SHA512 55d614ff311a29a20b93094ac1dd16a2ad1345368b874a0e385f0c235e8defde8816948ab04eab68ade477a0a6901b317c7884df1ba3078cf12db89dfc4169cc WHIRLPOOL 9801eee45a178306b0645d75c268df381d206a8c566695d8b6c228ea7f5638a313bdbdf990ad7bd299c24d280595007b44fd16449ee3a0643b6e2084bb148d09 DIST libssh-0.7.2.tar.xz 350540 SHA256 a32c45b9674141cab4bde84ded7d53e931076c6b0f10b8fd627f3584faebae62 SHA512 9cb15254478e2522e736688052e0862c856e2c1321d090c9b9d9562504fcb59cee344c07576eeee9c6d0ac5ead137d9ff05216d973c457c6a17ffa9fba475f5a WHIRLPOOL bf878264b900bfbbfe76f08d1c22e5ca2f1300024fc561841ed3fbef374ceab7a08ba0211c093d90d7e4047a896cce9f73e78268300362beaec194025eda1ed8 DIST libssh-0.7.3.tar.xz 350464 SHA256 26ef46be555da21112c01e4b9f5e3abba9194485c8822ab55ba3d6496222af98 SHA512 6797ea9492c9d07e0169163e6559a7880dd368ee763eff297b3cbddda5e892703cf32506f9513e7d9b5135984e1e888c4893b342df07da1b7ee30968c9185869 WHIRLPOOL f22c3f4ef8c3cbf4e93c5603224ae4d0f598639a471bc002c0917243c487e1de61a79db09308bcb570791cd1ab3b95f43d44f92652a7f0ec596d552cab0031c5 diff --git a/net-libs/libssh/files/libssh-0.6.5-compilefix.patch b/net-libs/libssh/files/libssh-0.6.5-compilefix.patch new file mode 100644 index 000000000000..658c1592b875 --- /dev/null +++ b/net-libs/libssh/files/libssh-0.6.5-compilefix.patch @@ -0,0 +1,29 @@ +From 6e0dee7845cea22f59bd353ef42b31cb67170030 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@cryptomilk.org> +Date: Thu, 2 Apr 2015 15:02:29 +0200 +Subject: poll: Fix compilation with struct ssh_timestamp + +Signed-off-by: Andreas Schneider <asn@cryptomilk.org> +(cherry picked from commit e0a73d3dbe909f8e2cb486ed344e5beb8148032e) +--- + src/poll.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/poll.c b/src/poll.c +index dfa687a..05faba7 100644 +--- a/src/poll.c ++++ b/src/poll.c +@@ -35,9 +35,9 @@ + #include "libssh/poll.h" + #include "libssh/socket.h" + #include "libssh/session.h" ++#include "libssh/misc.h" + #ifdef WITH_SERVER + #include "libssh/server.h" +-#include "libssh/misc.h" + #endif + + +-- +cgit v0.12 + diff --git a/net-libs/libssh/libssh-0.6.5.ebuild b/net-libs/libssh/libssh-0.6.5.ebuild index 46cce2ba0676..30b9ff43e676 100644 --- a/net-libs/libssh/libssh-0.6.5.ebuild +++ b/net-libs/libssh/libssh-0.6.5.ebuild @@ -9,8 +9,7 @@ inherit eutils cmake-multilib multilib DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="http://www.libssh.org/" -SRC_URI="https://red.libssh.org/attachments/download/121/${MY_P}.tar.xz -> ${P}.tar.xz - https://git.libssh.org/projects/libssh.git/patch/?id=6e0dee7845cea22f59bd353ef42b31cb67170030 -> ${PN}-0.6.5-compilefix.patch" +SRC_URI="https://red.libssh.org/attachments/download/121/${MY_P}.tar.xz -> ${P}.tar.xz" LICENSE="LGPL-2.1" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" @@ -35,7 +34,7 @@ S=${WORKDIR}/${MY_P} PATCHES=( "${FILESDIR}"/${PN}-0.5.0-tests.patch - "${DISTDIR}"/${P}-compilefix.patch + "${FILESDIR}"/${P}-compilefix.patch ) src_prepare() { diff --git a/net-libs/libssh/libssh-0.7.2.ebuild b/net-libs/libssh/libssh-0.7.2.ebuild index 88697e458f1f..507ff40bd055 100644 --- a/net-libs/libssh/libssh-0.7.2.ebuild +++ b/net-libs/libssh/libssh-0.7.2.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.libssh.org/" SRC_URI="https://red.libssh.org/attachments/download/177/${MY_P}.tar.xz -> ${P}.tar.xz" LICENSE="LGPL-2.1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" SLOT="0/4" # subslot = soname major version IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake diff --git a/net-libs/libssh/libssh-0.7.3.ebuild b/net-libs/libssh/libssh-0.7.3.ebuild index da20cc8482dd..2ad39579caef 100644 --- a/net-libs/libssh/libssh-0.7.3.ebuild +++ b/net-libs/libssh/libssh-0.7.3.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.libssh.org/" SRC_URI="https://red.libssh.org/attachments/download/195/${MY_P}.tar.xz -> ${P}.tar.xz" LICENSE="LGPL-2.1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" SLOT="0/4" # subslot = soname major version IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib" # Maintainer: check IUSE-defaults at DefineOptions.cmake diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest index 774146db19fe..5018976317b1 100644 --- a/net-libs/libssh2/Manifest +++ b/net-libs/libssh2/Manifest @@ -1,2 +1,3 @@ DIST libssh2-1.5.0.tar.gz 728222 SHA256 83196badd6868f5b926bdac8017a6f90fb8a90b16652d3bf02df0330d573d0fc SHA512 9dada6d86e962ce35d6d30625d3a8743b5f269b325d4f1e072206e73c4ef87f216fe54c0c5bfc06eb969a07e221c21ce6f7b9e5524afdb3f957a25f714c62f73 WHIRLPOOL 94e897f59a02ca7ab4b3006cc9c84228a202f16a8e898f202e89015275e95324cb7a71c722324134f1b7f5a85a45718a2c7d25de1d806e0534c1d61683da5487 DIST libssh2-1.6.0.tar.gz 734110 SHA256 5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c8e8215 SHA512 aa28bf782b5de1f09d1b85aa8b480069bf08494ed3505e59ed522799dd710905b8d3464b3447e35393764632d5e43d21990ceab9584a8df17abda4f85dfc2ec7 WHIRLPOOL 0702eb089483b5047e517e89eca0c23719528b3672e24bf3f3a3ff3c0ca5335e1d00ff328f0c6458ae1cdd25d73d222cb3dfb5d95445df80a6bd9d8c4f17b9ff +DIST libssh2-1.7.0.tar.gz 811714 SHA256 e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584 SHA512 0f9dfd83196129568c00383e2e4fea29b3d8c4f3b1690f550a6748d1db68cc437b4ed083f5d3d4646365fdc839819619aea96eeaef5ab072c7023d13f08b5153 WHIRLPOOL dceefdc11b6b88f4320bfdd01044dc9c81e4d1e3e54a9e2ec8f6869ba091668e5957a3e2a56934196c87f1877d61ebe0b45f450ca12bf1802da9812db8a4ffb6 diff --git a/net-libs/libssh2/libssh2-1.7.0.ebuild b/net-libs/libssh2/libssh2-1.7.0.ebuild new file mode 100644 index 000000000000..ddcfe4165e62 --- /dev/null +++ b/net-libs/libssh2/libssh2-1.7.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +inherit autotools-multilib + +DESCRIPTION="Library implementing the SSH2 protocol" +HOMEPAGE="http://www.libssh2.org/" +SRC_URI="http://www.${PN}.org/download/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +IUSE="gcrypt libressl static-libs test zlib" + +DEPEND=" + !gcrypt? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + ) + gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND}" + +DOCS=( README ) + +src_prepare() { + sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die + autotools-multilib_src_prepare +} + +multilib_src_configure() { + # Disable tests that require extra permissions (bug #333319) + use test && local -x ac_cv_path_SSHD= + + local myeconfargs=( + $(use_with zlib libz) + $(usex gcrypt --with-libgcrypt --with-openssl) + ) + autotools-utils_src_configure +} diff --git a/net-mail/mpop/mpop-1.2.2.ebuild b/net-mail/mpop/mpop-1.2.2.ebuild index 89b55c059c53..32a02e3be6ce 100644 --- a/net-mail/mpop/mpop-1.2.2.ebuild +++ b/net-mail/mpop/mpop-1.2.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="gnutls idn libsecret nls sasl ssl vim-syntax" RDEPEND=" diff --git a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild b/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild index 2a1f46ca56e4..7a5e857c385d 100644 --- a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild @@ -11,7 +11,7 @@ else MY_P="${MY_P/_beta/-beta}" MY_P="${MY_P/_rc/-rc}" SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest index 46fb0743f824..69076d457966 100644 --- a/net-misc/nxplayer/Manifest +++ b/net-misc/nxplayer/Manifest @@ -1,2 +1,4 @@ DIST nomachine-enterprise-client_5.0.63_3_i686.tar.gz 28334138 SHA256 02566c89c4af790f93ea8b19598948b5fa2cd99a88fa1f5980bb3b968ebc1b83 SHA512 27cde31a8805862617e898bf27eec99c9d848d455aea5e021e99da5cf920baf45d487bbeef75cd98142c6e65fa299ce6fc8c40ce8370f69698db6e0d6f00d937 WHIRLPOOL fce14d52e83322e3ee0199bfb8e7d985ddf9ba3221f757e54ec8b5f4fdac9c67fd223e6c445d54567ce530ca5d8227fe809ed02b950f76bb566e17926a25d846 DIST nomachine-enterprise-client_5.0.63_3_x86_64.tar.gz 29300554 SHA256 c91965df38ae370142b17bdcd73fae87e88d88e5310e7dea3c89006cb8fa1938 SHA512 aa9e37b4a9b52e534289f4879be2c98ee7db6aa0379270a1a757bfc6bc3550a258987c365329732f162ebd26d0b442649756c33426e28bb2c84c041d88f3eea0 WHIRLPOOL df50c1f6aa0e89612a956289db686b358bfcdb73fe835f5c73345166448fcecdfe23958384ba9da79a05bac4ec92743e4bdaf86b819bf869334eb5551dae8144 +DIST nomachine-enterprise-client_5.1.7_6_i686.tar.gz 46115 SHA256 7d9c3cbb96315a63b6a2e5a317d301ef0ceddff21ddc229f642de73b872cba3c SHA512 97cc898063a4c27ec0eb6924fa0b778b4a7844b7bb9884477fc42c7407ada16182b2e48e0d45c5e21405afaf092a7fd9934446e7d15d63b35ff59e476d90c79e WHIRLPOOL 0ef513f412da0f30f0d3d150d615ec1278b26fc82faee09532a8816584abdb677c5322bf67e2f58eca2338043838e58d77c155671ce7e62088897d685fd73b06 +DIST nomachine-enterprise-client_5.1.7_6_x86_64.tar.gz 29373847 SHA256 7a2d43bae7bfdc6e47980f827cfe764bb767601520fcd6a5e78c40b7aa4ab4cd SHA512 a297fae2a81ce0add4042caba05e2f5d0779f312a91ad9bc71e6498363fad2ec45f40a638b9b6dc1daea986f30dd6bff27896b74ae7ebf3a4cb37abeda126b2e WHIRLPOOL b5a72d7905a7431855f188b718f1ad5da7be3c350f6979bc50df609cc8458315ec5f2cac65f037444d90f20f50a2daaa0e0062a53295e5cf6bee707181b3f231 diff --git a/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild b/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild new file mode 100644 index 000000000000..3568c86e9cad --- /dev/null +++ b/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit eutils versionator + +MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)" + +DESCRIPTION="Client for NoMachine remote servers" +HOMEPAGE="http://www.nomachine.com" +SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz ) + x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )" +LICENSE="nomachine" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="" +RESTRICT="strip" + +DEPEND="" +RDEPEND="dev-libs/glib:2 + dev-libs/openssl:0" + +S=${WORKDIR}/NX/etc/NX/player/packages + +QA_PREBUILT="*" + +src_install() +{ + local NXROOT=/opt/NX + +# dodir /etc/NX/localhost +# echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg + + dodir /opt + tar xozf nxclient.tar.gz -C "${D}"/opt + tar xozf nxplayer.tar.gz -C "${D}"/opt + + make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin +} diff --git a/net-proxy/squid/squid-3.5.15.ebuild b/net-proxy/squid/squid-3.5.15.ebuild index f92b88f09c41..02542ffa9e24 100644 --- a/net-proxy/squid/squid-3.5.15.ebuild +++ b/net-proxy/squid/squid-3.5.15.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ ecap esi ssl-crtd \ mysql postgres sqlite \ diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index aea5783838b5..003a84e31a00 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -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$ @@ -18,6 +18,10 @@ #--- END OF EXAMPLES --- +# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (26 Feb 2016) +# KDE Frameworks 5 not yet stable. +>=net-irc/kvirc-4.4_pre20150000000000 kde + # Mikle Kolyada <zlogene@gentoo.org> (14 Jun 2015) # app-emulation/lxc has no stable versions app-emulation/docker lxc diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index 00d84c22e8dc..bd6b540ae629 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Markus Meier <maekke@gentoo.org> (26 Feb 2016) +# unmask scanner for net-print/hplip, bug #518456 +media-sound/moc timidity + # Justin Lecher <jlec@gentoo.org> (22 Feb 2016) # Missing test deps keyword #575366 dev-cpp/eigen test diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask index fbb652ec815a..de042f7d4f7d 100644 --- a/profiles/arch/hppa/package.use.mask +++ b/profiles/arch/hppa/package.use.mask @@ -4,10 +4,6 @@ # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>. -# Justin Lecher <jlec@gentoo.org> (22 Feb 2016) -# Missing test deps keyword #575366 -dev-cpp/eigen test - # Mike Frysinger <vapier@gentoo.org> (21 Feb 2016) # Needs arch love for elementary. #575322 media-libs/elementary javascript diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask index 2cecfa1d9507..e3b66a5ed34c 100644 --- a/profiles/arch/x86/package.use.stable.mask +++ b/profiles/arch/x86/package.use.stable.mask @@ -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$ @@ -18,6 +18,10 @@ #--- END OF EXAMPLES --- +# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (26 Feb 2016) +# KDE Frameworks 5 not yet stable. +>=net-irc/kvirc-4.4_pre20150000000000 kde + # Justin Lecher <jlec@gentoo.org> (27 Oct 2015) # No stable dev-python/PyQt5 for now # 552394 diff --git a/profiles/prefix/linux/parent b/profiles/prefix/linux/parent index 085c1b8aefb9..f3229c5b9876 100644 --- a/profiles/prefix/linux/parent +++ b/profiles/prefix/linux/parent @@ -1,2 +1 @@ -../../features/prefix/rpath .. diff --git a/profiles/prefix/parent b/profiles/prefix/parent index a88ecf69d275..4085e5ad378d 100644 --- a/profiles/prefix/parent +++ b/profiles/prefix/parent @@ -1,2 +1,2 @@ -../base ../features/prefix/rpath +../base diff --git a/sci-astronomy/aatm/Manifest b/sci-astronomy/aatm/Manifest index 50c9077216f4..33d00e5aff30 100644 --- a/sci-astronomy/aatm/Manifest +++ b/sci-astronomy/aatm/Manifest @@ -1,2 +1 @@ -DIST aatm-0.4.3.1-ac-boost.patch.gz 4519 SHA256 7bf274010fb6df06faf06d287c2faf2b3b8ef4aa5f5b8f2624393cdc0cb13746 SHA512 b27e4859e475ea5411a8c1a17f20d19baacc456a436977589f65b9897c56e946bfc09e5532bbfd5bf7d63bbbcdddeccb4e5ea2800959e9cd39d791feb668e579 WHIRLPOOL a35450c8dba7b801352f4c81c8e52149167e5cb5a2a3d7b627949a9af98f15795409278ee59776a6ca9db96e838c093988f60cd0731aad08c2695cfb29bdf883 -DIST aatm-0.4.3.1.tar.gz 611919 SHA256 b41c5b524bc66559357a20ef032b407385aa919e07fd5742afffd33847fa42c9 SHA512 dce1b52ea2396d40f3f413b9ea40987b5eaa0d9902e4713d8a242d2c04e7fb93078f94f08a30af42195083919289d3fc8a449dd891ce1c8cb40d7358203d43ff WHIRLPOOL 9c76381c0b937f9bdea82df274dc85aa4136a1993247899b351754d88765340a2c597d6eed04ad766ec023977b8850ba4c464bad4bf33fe8d1c54e1e6654e038 +DIST aatm-0.6.tar.gz 613800 SHA256 9fdfb7d0bba71ad32c091baf6242a5bd17041277016473959c5e90d6dcac1b68 SHA512 aef2d0fccc83a8a5817bd414b60c5167f7e378b434f9a3e9ce2bc2eeceec1cc1fb1b141cec07d78cb325dbfceac2804c07866291b2863f6839dfb6143ed9188a WHIRLPOOL 1d8fff78f72810b53f86452a930701d7910314dbd06d0060a7e677260bd29526de44e2b8658c584fd9692727af02a5ee918b319e8932be1cfe428fc579e520d0 diff --git a/sci-astronomy/aatm/aatm-0.4.3.1.ebuild b/sci-astronomy/aatm/aatm-0.4.3.1.ebuild deleted file mode 100644 index afb448abd4c5..000000000000 --- a/sci-astronomy/aatm/aatm-0.4.3.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=1 -inherit autotools-utils - -DESCRIPTION="Atmospheric Modelling for ALMA Observatory" -HOMEPAGE="http://www.mrao.cam.ac.uk/~bn204/alma/atmomodel.html" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz - https://dev.gentoo.org/~bicatali/distfiles/${P}-ac-boost.patch.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -RDEPEND="dev-libs/boost" -DEPEND="${RDEPEND}" - -PATCHES=( "${WORKDIR}"/${P}-ac-boost.patch ) diff --git a/sci-astronomy/aatm/aatm-0.6.ebuild b/sci-astronomy/aatm/aatm-0.6.ebuild new file mode 100644 index 000000000000..4e3de126deb4 --- /dev/null +++ b/sci-astronomy/aatm/aatm-0.6.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils + +DESCRIPTION="Atmospheric Modelling for ALMA Observatory" +HOMEPAGE="https://svn.cv.nrao.edu/view/aatm/devel/casa/" +# tar ball is made from the HOMEPAGE and running ./configure && make dist +SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/4" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc static-libs" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-libs/boost:= + doc? ( app-doc/doxygen[dot] )" + +src_configure() { + econf $(use_enable static-libs static) +} + +src_compile() { + emake + use doc && doxygen doc/developer.doxy +} + +src_install() { + default + use static-libs || prune_libtool_files --all + if use doc; then + insinto /usr/share/doc/${PF} + doins -r developer/html + fi +} diff --git a/sci-astronomy/cdsclient/Manifest b/sci-astronomy/cdsclient/Manifest index 5eff80fecc70..33ac3483caa3 100644 --- a/sci-astronomy/cdsclient/Manifest +++ b/sci-astronomy/cdsclient/Manifest @@ -1 +1 @@ -DIST cdsclient-3.72.tar.gz 99642 SHA256 517bb13a52c528858faac63f4b3a8180998f71d9fc33e0de9d2480aadd935045 SHA512 88d4b35c05b3565e74ad1bb7e593231486580c58901f90d4a7cc5295d11578b30a4e61579aa1125a4879c940104ed3087d9f97fc8170c01342f09f2b720bd32e WHIRLPOOL ee00668a77fc589dd7d4a3f31ddebdab42d6d2e48e25df2bf42f7ceb9a32543f6af2c643ba96db5ed27f25aea2b209551a54b17720476276de9d84c0a270c2e9 +DIST cdsclient-3.81.tar.gz 122719 SHA256 d74dca1d450e2c8f187e3d7c4952ac480a8913da799f5522a42ea7d5075e339d SHA512 3fcf7a902dfddb3583ff34eedbcddd6a5641bf9c87d234159090378436ac370313ea311d3fee6e202ee84b3fe4065ef45a46a15b5d996e05afd1418e617c20ea WHIRLPOOL 350a5d3bff06fbe15105b9f60c4d8266dda15974b32f01b19ec8aca05fb1e830298dc9f885088f58d4ddf6685da84579db908a68f15fe7bb64165684a2d8cd58 diff --git a/sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild b/sci-astronomy/cdsclient/cdsclient-3.8.1.ebuild index 9b085f9a2f36..15584088baff 100644 --- a/sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild +++ b/sci-astronomy/cdsclient/cdsclient-3.8.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils versionator @@ -24,10 +24,11 @@ RDEPEND="app-shells/tcsh" S="${WORKDIR}/${MYP}" +PATCHES=( "${FILESDIR}/${PN}-makefile.patch" ) src_prepare() { - epatch "${FILESDIR}"/${PN}-makefile.patch + default # remove non standard "mantex" page - sed -i -e 's/aclient.tex//' configure || die + sed -e 's/aclient.tex//' -i configure || die } src_install() { diff --git a/sci-astronomy/cdsclient/files/cdsclient-makefile.patch b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch index 3f5e5fe58e9a..6d135a622056 100644 --- a/sci-astronomy/cdsclient/files/cdsclient-makefile.patch +++ b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2013-07-08 09:45:42.667070273 -0700 -+++ Makefile.in 2013-07-08 09:46:43.928417641 -0700 -@@ -29,17 +29,17 @@ +--- cdsclient-3.81/Makefile.in.orig 2016-02-26 17:33:14.217750589 +0000 ++++ cdsclient-3.81/Makefile.in 2016-02-26 17:38:22.463875411 +0000 +@@ -31,17 +31,17 @@ ################################################################# #PREFIX = /usr/local #PREFIX = $(HOME) @@ -21,7 +21,13 @@ ########### # NOTE: The definition below is required only on SOLARIS # Comment the following line if required -@@ -60,7 +60,7 @@ +@@ -57,12 +57,13 @@ + COPY = cp -p + RM = rm + AWK = @AWK@ ++MKDIR = mkdir -p + + # C options -------------------------------- DEBUG = C_OPT = -O SYS = @@ -30,7 +36,7 @@ # FILES -------------------------------- VERFILE = $(PREFIX)/versions -@@ -98,7 +98,7 @@ +@@ -102,7 +103,7 @@ # RULES -------------------------------- .SUFFIXES: .o .c .c.o: @@ -39,20 +45,18 @@ # DEPENDENCIES -------------------------------- -@@ -117,41 +117,41 @@ +@@ -121,41 +122,39 @@ # rm -f $$f; ln finducac2 $$f; done aclient: aclient.o $(OBJ) - $(CC) $@.o $(OBJ) $(LIBSYS) -o $@ - $(STRIP) $@ + $(CC) $(LDFLAGS) $@.o $(OBJ) $(LIBSYS) -o $@ -+ wwwget: wwwget.c - $(CC) wwwget.c $(LIBSYS) -o $@ - $(STRIP) $@ + $(CC) $(CFLAGS) $(LDFLAGS) wwwget.c $(LIBSYS) -o $@ -+ doc: sk.tex man.tex aclient.tex latex man.tex @@ -66,37 +70,37 @@ install_man: $(MAN) if [ -d $(MANDIR) ]; then echo $(MANDIR) exists; \ - else mkdir $(MANDIR); fi -+ else mkdir -p $(MANDIR); fi ++ else $(MKDIR) $(MANDIR); fi for f in $(MAN); do \ e=`echo $$f | cut -d. -f2`; \ if [ -d $(MANDIR)/man$$e ] ; then echo $(MANDIR)/man$$e exists ; \ - else mkdir $(MANDIR)/man$$e ; fi ; \ -+ else mkdir -p $(MANDIR)/man$$e ; fi ; \ ++ else $(MKDIR) $(MANDIR)/man$$e ; fi ; \ $(COPY) $$f $(MANDIR)/man$$e ; \ done install_h: $(INC) - test -d $(INCDIR) || mkdir $(INCDIR) -+ test -d $(INCDIR) || mkdir -p $(INCDIR) ++ test -d $(INCDIR) || $(MKDIR) $(INCDIR) $(COPY) $(INC) $(INCDIR) install_bin: $(BIN) - test -d $(BINDIR) || mkdir $(BINDIR) -+ test -d $(BINDIR) || mkdir -p $(BINDIR) ++ test -d $(BINDIR) || $(MKDIR) $(BINDIR) $(COPY) $(BIN) $(BINDIR) install_shs: Makefile - test -d $(SHSDIR) || mkdir $(SHSDIR) -+ test -d $(SHSDIR) || mkdir -p $(SHSDIR) ++ test -d $(SHSDIR) || $(MKDIR) $(SHSDIR) ractools=""; test -r $(RACatCDS) && ractools=$(RACatCDS)/*; \ test -z "$$ractools" || ls -l $$ractools; \ cdsutil="$(SHSatCDS)"; test -z "$(atCDS)" && cdsutil=""; \ -@@ -189,7 +189,7 @@ +@@ -195,7 +194,7 @@ $(MAKE) clean -test -d /tmp/$(DISTRIB) && rm -rf /tmp/$(DISTRIB) autoconf - mkdir /tmp/$(DISTRIB) -+ mkdir -p /tmp/$(DISTRIB) - cp -p $(SHS) Makefile.in configure /tmp/$(DISTRIB) - test -z "$(atCDS)" || cp -p $(SHSatCDS) /tmp/$(DISTRIB) - ++ $(MKDIR) /tmp/$(DISTRIB) + cp -p COPYRIGHT /ftp/pub/sw/COPYING /tmp/$(DISTRIB) + for f in $(SHS) Makefile.in configure; do cp -p $$f /tmp/$(DISTRIB); \ + add_license $$f > /tmp/$(DISTRIB)/$$f; done diff --git a/sci-astronomy/funtools/Manifest b/sci-astronomy/funtools/Manifest index 3e5326a94fdf..ea1b1e439ac6 100644 --- a/sci-astronomy/funtools/Manifest +++ b/sci-astronomy/funtools/Manifest @@ -1 +1 @@ -DIST funtools-1.4.4.tar.gz 3475367 SHA256 f47a00e774b557931a7ff00ddd0852e32ae5d2a2f0d3a227f8ba81d3db1e863b SHA512 3a58ad008bc33836109327add15eabaf95e9dc3f9e70a678fe9a8176dae87ccf0faf439e775b6efcb50e536afb022b9e4c226cbb98e56997960380e06012b5c2 WHIRLPOOL 5b89cb7280a4e1087c13103a813e9220432419215d8bc7e6463f5f08f2a5ba3731e7693f16d79ff4ec705665809cc33e81dbd36cd07a00d786aac35bbb975f71 +DIST funtools-1.4.6.tar.gz 3104626 SHA256 902d55682fb57a387311eef1ad2953ddc081ecea3a32ab6153ad50e7b4822c49 SHA512 0ff70649c60337faa247e38e4dc40252b0092db39fe22b2869a764d01b2d7f1c584980ab891bf6e97c66edda3a0ad4b70bc588f2c9df392d87797795b8b22413 WHIRLPOOL 26f5ca1ea34c10503e9023df05a1f1a1f8ae34e5b261a9d0a87923a2de0935e8b5ce4baf24906604cda29e59ace54f180182d86d5a0a065c6c84b84bef629aae diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch b/sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch deleted file mode 100644 index 6a089159d4d3..000000000000 --- a/sci-astronomy/funtools/files/funtools-1.4.4-ds9-fixes.patch +++ /dev/null @@ -1,292 +0,0 @@ -Origin: http://hea-www.harvard.edu/saord/download/ds9/source/ds9.7.0.tar.gz -Description: Fixes that were applied to the package included in the saods9 - source. Only the patches that affect the Debian distribution are included here. - These patches are not specific for DS9, however. - . - From the changelog: - * Fixed -J funcone, which was not properly outputting all rows. - * Fixed bug in funim.c which broke vcol functionality. - . ---- a/filter/filter.c -+++ b/filter/filter.c -@@ -326,24 +326,31 @@ Filter FilterOpen(header, string, mode) - } - - /* determine which type of process execution we do */ -- filter->ptype = DEFAULT_FILTER_PTYPE; -- *tbuf = '\0'; -- if( (s=(char *)getenv("FILTER_PTYPE")) ){ -- strcpy(tbuf, s); -- } -- if( !*tbuf && (s=xstrdup(filter->mode)) ){ -- keyword(s, "ptype", tbuf, SZ_LINE); -- if( s ) xfree(s); -- } -- if( *tbuf ){ -- if( *tbuf == 'p' ) -- filter->ptype = PTYPE_PROCESS; -- else if( *tbuf == 'c' ) -- filter->ptype = PTYPE_CONTAINED; -+ switch(filter->method){ -+ case METHOD_C: -+ filter->ptype = DEFAULT_FILTER_PTYPE; -+ *tbuf = '\0'; -+ if( (s=(char *)getenv("FILTER_PTYPE")) ){ -+ strcpy(tbuf, s); -+ } -+ if( !*tbuf && (s=xstrdup(filter->mode)) ){ -+ keyword(s, "ptype", tbuf, SZ_LINE); -+ if( s ) xfree(s); -+ } -+ if( *tbuf ){ -+ if( *tbuf == 'p' ) -+ filter->ptype = PTYPE_PROCESS; -+ else if( *tbuf == 'c' ) -+ filter->ptype = PTYPE_CONTAINED; - #ifdef USE_DL -- else if( *tbuf == 'd' ) -- filter->ptype = PTYPE_DYNAMIC; -+ else if( *tbuf == 'd' ) -+ filter->ptype = PTYPE_DYNAMIC; - #endif -+ } -+ break; -+ default: -+ filter->ptype = PTYPE_PROCESS; -+ break; - } - - /* determine region paint mode */ -@@ -470,7 +477,10 @@ Filter FilterOpen(header, string, mode) - if( !FilterProgCompile(filter) ) - goto error; - -- if( filter->debug < 2 ){ -+ if( filter->debug >= 2 ) goto done; -+ -+ switch(filter->method){ -+ case METHOD_C: - switch(filter->ptype){ - case PTYPE_PROCESS: - case PTYPE_CONTAINED: -@@ -478,7 +488,7 @@ Filter FilterOpen(header, string, mode) - case PIPE_WIN32: - #if HAVE_CYGWIN - if( !WinProcessOpen(filter->prog, -- &(filter->ihandle), &(filter->ohandle), &(filter->process)) ) -+ &(filter->ihandle), &(filter->ohandle), &(filter->process)) ) - goto error; - #else - gerror(stderr, "internal error: no WinProcess without Windows"); -@@ -487,20 +497,23 @@ Filter FilterOpen(header, string, mode) - break; - default: - if( !ProcessOpen(filter->prog, -- &(filter->ichan), &(filter->ochan), &(filter->pid)) ) -+ &(filter->ichan), &(filter->ochan), &(filter->pid)) ) - goto error; - break; - } - break; - #ifdef USE_DL - case PTYPE_DYNAMIC: -- if( !(filter->dl=DLOpen(filter->prog)) ) -- goto error; -- break; -+ if( !(filter->dl=DLOpen(filter->prog)) ) -+ goto error; -+ break; - #endif - default: -- goto error; -+ goto error; - } -+ break; -+ default: -+ goto error; - } - - /* return the good news */ ---- a/filter/filt.l -+++ b/filter/filt.l -@@ -871,6 +871,26 @@ compass { BEGIN COMM; } - * - */ - -+ -+#ifdef YY_USE_PROTOS -+static void floatprefix(void) -+#else -+static void floatprefix() -+#endif -+{ -+ if( filt->method == METHOD_C ) -+ _FiltLexCat("(double)"); -+} -+ -+#ifdef YY_USE_PROTOS -+static void floatsuffix(void) -+#else -+static void floatsuffix() -+#endif -+{ -+ return; -+} -+ - #ifdef YY_USE_PROTOS - static void - bin2num(char *d, char *s, int maxlen) -@@ -1414,7 +1434,14 @@ static void _FiltLexRegionStart(docols) - FilterSymbolDefaults(filt, 0); - /* initialize wcs for default image case */ - _FiltLexWcsCols(filt->fhd, filt->xbin, filt->ybin); -- _FiltLexCat(",(double)x,(double)y"); -+ _FiltLexCat(","); -+ floatprefix(); -+ _FiltLexCat("x"); -+ floatsuffix(); -+ _FiltLexCat(","); -+ floatprefix(); -+ _FiltLexCat("y"); -+ floatsuffix(); - break; - case 1: - if( !initbindefs ){ -@@ -1427,16 +1454,24 @@ static void _FiltLexRegionStart(docols) - if( !filt->xbin || !filt->ybin ){ - _filterror("two binning columns are required for regions"); - } -- _FiltLexCat(",(double)"); -+ _FiltLexCat(","); -+ floatprefix(); - _FiltLexCat(filt->xbin); -- _FiltLexCat(",(double)"); -+ floatsuffix(); -+ _FiltLexCat(","); -+ floatprefix(); - _FiltLexCat(filt->ybin); -+ floatsuffix(); - break; - case 2: -- _FiltLexCat(",(double)"); -+ _FiltLexCat(","); -+ floatprefix(); - _FiltLexCat(colnames[0]); -- _FiltLexCat(",(double)"); -+ floatsuffix(); -+ _FiltLexCat(","); -+ floatprefix(); - _FiltLexCat(colnames[1]); -+ floatsuffix(); - break; - } - if( s ) xfree(s); ---- a/filter/filtprog_c.c -+++ b/filter/filtprog_c.c -@@ -198,7 +198,8 @@ static int FilterProgOpen_C(filter) - ccstr = "gcc"; - } - /* make sure we have a compiler */ -- if( !(filter->cc = Find(ccstr, "x", NULL, FilterPath())) && -+ if( !(filter->cc = Access(ccstr, "x")) && -+ !(filter->cc = Find(ccstr, "x", NULL, FilterPath())) && - !(filter->cc = Find("gcc", "x", NULL, FilterPath())) && - !(filter->cc = Find("cc", "x", NULL, FilterPath())) && - !(filter->cc = Find("cc", "x", NULL, ".")) && -@@ -212,6 +213,9 @@ static int FilterProgOpen_C(filter) - #if HAVE_CYGWIN - if( (s=strrchr(filter->cc, '/')) ){ - s++; -+ } -+ else if( (s=strrchr(filter->cc, '\\')) ){ -+ s++; - } else { - s = filter->cc; - } ---- a/funcone.c -+++ b/funcone.c -@@ -1036,6 +1036,9 @@ main(argc, argv) - strncpy(decstr, argv[optind+ioff++], SZ_LINE-1); - strncpy(radstr, argv[optind+ioff++], SZ_LINE-1); - -+ /* dolimfilt does not work with doall */ -+ if( doall ) dolimfilt = 0; -+ - /* process list arguments */ - if( dolist ){ - if( !(list=OpenList(lname, rastr, decstr, radstr)) ){ -@@ -1085,6 +1088,8 @@ main(argc, argv) - if( !(adbuf=xcalloc(nrow+1, sizeof(char))) ){ - gerror(stderr, "can't allocate all (-J|-X) buffer of size %d\n", nrow); - } -+ /* must read one event at a time, or else we can't tell the event num */ -+ maxrow = 1; - } - - /* activate columns specified by user, if necessary */ -@@ -1371,7 +1376,7 @@ done: - while( (ebuf = (Ev)FunTableRowGet(fun, NULL, maxrow, NULL, &got)) ){ - /* if we have a filter, then we don't know the row number til after - we read the event, i.e. now */ -- if( doall & ALL_FILT ) FunInfoGet(fun, FUN_ROW, &irow, 0); -+ FunInfoGet(fun, FUN_ROW, &irow, 0); - /* process all rows */ - for(i=0; i<got; i++){ - /* skip rows that already were written out */ ---- a/funtab.c -+++ b/funtab.c -@@ -1386,7 +1386,7 @@ int FunTableRowPut(fun, rows, nrow, idx, plist) - off_t - FunTableRowSeek(Fun fun, int nrow, char *plist) - #else --off_t FunTableRowPut(fun, nrow, plist) -+off_t FunTableRowSeek(fun, nrow, plist) - Fun fun; - int nrow; - char *plist; ---- a/funim.c -+++ b/funim.c -@@ -111,9 +111,9 @@ static void *_FunTableBin(fun, buf, plist) - /* optional value column for binning */ - if( fun->vbin >= 0 ){ - dovcol = 1; -- voffset = fun->header->table->col[fun->bin[2]].offset; -- vsize = fun->header->table->col[fun->bin[2]].size; -- vtype = fun->header->table->col[fun->bin[2]].type; -+ voffset = fun->header->table->col[fun->vbin].offset; -+ vsize = fun->header->table->col[fun->vbin].size; -+ vtype = fun->header->table->col[fun->vbin].type; - } - else{ - dovcol = 0; ---- a/calc.l -+++ b/calc.l -@@ -284,7 +284,7 @@ static char *_CalcCB(name, client_data) - { - CalcCols cur; - char tbuf[SZ_LINE]; -- char tbuf2[SZ_LINE]; -+ char tbuf2[SZ_LINE*2]; - char tbuf3[SZ_LINE]; - int i, got, ip; - ---- a/util/gio.c -+++ b/util/gio.c -@@ -2209,7 +2209,7 @@ void gerror(va_alist) va_dcl - vsnprintf(_gerrors, SZ_LINE-1, tbuf, args); - /* if the error flag is positive, we output immediately */ - if( (fd != NULL) && _gerror ){ -- fprintf(fd, _gerrors); -+ fputs(_gerrors, fd); - fflush(fd); - } - /* if the error flag is set high, we exit */ -@@ -2281,7 +2281,7 @@ void gwarning(va_alist) va_dcl - vsnprintf(_gwarnings, SZ_LINE-1, tbuf, args); - /* if the warning flag is positive, we output immediately */ - if( (fd != NULL) && _gwarning ){ -- fprintf(fd, _gwarnings); -+ fputs(_gwarnings, fd); - fflush(fd); - } - } diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch deleted file mode 100644 index 700408057ba9..000000000000 --- a/sci-astronomy/funtools/files/funtools-1.4.4-fix-autoheader.patch +++ /dev/null @@ -1,121 +0,0 @@ -Author: Ole Streicher <debian@liska.ath.cx> -Description: Fix the AC_DEFINE lines so that autoheader (and therefore - dh_autoreconf) works ---- a/configure.ac -+++ b/configure.ac -@@ -193,7 +193,7 @@ AC_MSG_RESULT($fun_ok) - - SC_PATH_TCLCONFIG - if test x"${no_tcl}" = x ; then -- AC_DEFINE(HAVE_TCL) -+ AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.]) - fi - - AC_PROG_AWK -@@ -218,7 +218,7 @@ POST="|\& cat" - case $host_os in - *cygwin*|*Cygwin* ) - CFLAGS="$CFLAGS -enable-auto-import" -- AC_DEFINE(HAVE_CYGWIN) -+ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.]) - AC_MSG_RESULT(flagging Cygwin) - PRE="sh -c {" - POST="}" -@@ -226,7 +226,7 @@ case $host_os in - *mingw32*|*Mingw32*) - CFLAGS="$CFLAGS -mconsole" - EXTRA_LIBS="$EXTRA_LIBS -lwsock32" -- AC_DEFINE(HAVE_MINGW32) -+ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.]) - AC_MSG_RESULT(flagging MinGW) - ;; - *osf*|*Osf*) ---- a/filter/configure.ac -+++ b/filter/configure.ac -@@ -150,7 +150,7 @@ PRE="" - POST="|\& cat" - case $host_os in - *cygwin*|*Cygwin* ) -- AC_DEFINE(HAVE_CYGWIN) -+ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.]) - AC_MSG_RESULT(flagging Cygwin) - PRE="sh -c {" - POST="}" -@@ -158,7 +158,7 @@ case $host_os in - *mingw32*|*Mingw32*) - CFLAGS="$CFLAGS -mconsole" - EXTRA_LIBS="$EXTRA_LIBS -lwsock32" -- AC_DEFINE(HAVE_MINGW32) -+ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.]) - AC_MSG_RESULT(flagging MinGW) - ;; - *osf*|*Osf*) ---- a/fitsy/configure.ac -+++ b/fitsy/configure.ac -@@ -121,7 +121,7 @@ PRE="" - POST="|\& cat" - case $host_os in - *cygwin*|*Cygwin* ) -- AC_DEFINE(HAVE_CYGWIN) -+ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.]) - AC_MSG_RESULT(flagging Cygwin) - PRE="sh -c {" - POST="}" -@@ -129,7 +129,7 @@ case $host_os in - *mingw32*|*Mingw32*) - CFLAGS="$CFLAGS -mconsole" - EXTRA_LIBS="$EXTRA_LIBS -lwsock32" -- AC_DEFINE(HAVE_MINGW32) -+ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.]) - AC_MSG_RESULT(flagging MinGW) - ;; - *darwin*|*Darwin*) ---- a/util/configure.ac -+++ b/util/configure.ac -@@ -133,7 +133,7 @@ fi - - SC_PATH_TCLCONFIG - if test x"${no_tcl}" = x ; then -- AC_DEFINE(HAVE_TCL) -+ AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.]) - fi - - AC_MSG_CHECKING(for external zlib) -@@ -146,7 +146,7 @@ PRE="" - POST="|\& cat" - case $host_os in - *cygwin*|*Cygwin* ) -- AC_DEFINE(HAVE_CYGWIN) -+ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.]) - AC_MSG_RESULT(flagging Cygwin) - PRE="sh -c {" - POST="}" -@@ -154,7 +154,7 @@ case $host_os in - *mingw32*|*Mingw32*) - CFLAGS="$CFLAGS -mconsole" - EXTRA_LIBS="$EXTRA_LIBS -lwsock32" -- AC_DEFINE(HAVE_MINGW32) -+ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.]) - AC_MSG_RESULT(flagging MinGW) - ;; - *osf*|*Osf*) ---- a/wcs/configure.ac -+++ b/wcs/configure.ac -@@ -125,7 +125,7 @@ PRE="" - POST="|\& cat" - case $host_os in - *cygwin*|*Cygwin* ) -- AC_DEFINE(HAVE_CYGWIN) -+ AC_DEFINE([HAVE_CYGWIN], [], [Define if the cygwin compiler is used.]) - AC_MSG_RESULT(flagging Cygwin) - PRE="sh -c {" - POST="}" -@@ -133,7 +133,7 @@ case $host_os in - *mingw32*|*Mingw32*) - CFLAGS="$CFLAGS -mconsole" - EXTRA_LIBS="$EXTRA_LIBS -lwsock32" -- AC_DEFINE(HAVE_MINGW32) -+ AC_DEFINE([HAVE_MINGW32], [], [Define if the mingw32 compiler is used.]) - AC_MSG_RESULT(flagging MinGW) - ;; - *osf*|*Osf*) diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-crashes.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-crashes.patch deleted file mode 100644 index 75d69089ef13..000000000000 --- a/sci-astronomy/funtools/files/funtools-1.4.4-fix-crashes.patch +++ /dev/null @@ -1,99 +0,0 @@ -Author: Ole Streicher <debian@liska.ath.cx> -Description: Check cmd line arguments for illegal input that caused crashes - found with the "Mayhem" tool. -Bug: http://bugs.debian.org/715928 -Bug: http://bugs.debian.org/715929 ---- a/funjoin.c -+++ b/funjoin.c -@@ -737,7 +737,7 @@ main(argc, argv) - case 'a': - if( argv[i][2] ){ - j = atoi(&argv[i][2])-1; -- if( (j >= 0) && (j < MAXIFILE) ){ -+ if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){ - files[j].actstr = argv[++i]; - } - else{ -@@ -751,7 +751,7 @@ main(argc, argv) - case 'b': - if( argv[i][2] ){ - j = atoi(&argv[i][2])-1; -- if( (j >= 0) && (j < MAXIFILE) ){ -+ if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){ - files[j].bstr = argv[++i]; - } - else{ -@@ -765,7 +765,7 @@ main(argc, argv) - case 'j': - if( argv[i][2] ){ - j = atoi(&argv[i][2])-1; -- if( (j >= 0) && (j < MAXIFILE) ){ -+ if( (j >= 0) && (j < MAXIFILE) && (i < argc-1)){ - files[j].jname = argv[++i]; - } - else{ -@@ -773,25 +773,35 @@ main(argc, argv) - } - } - else{ -- defcol = argv[++i]; -+ if (i < argc-1) { -+ defcol = argv[++i]; -+ } - } - break; - case 'm': -- minmatch = atoi(argv[++i])+1; -+ if (i < argc-1) { -+ minmatch = atoi(argv[++i])+1; -+ } - if( minmatch < 1 ) minmatch = 1; - break; - case 'M': -- maxmatch = atoi(argv[++i])+1; -+ if (i < argc-1) { -+ maxmatch = atoi(argv[++i])+1; -+ } - if( maxmatch < 1 ) maxmatch = 1; - break; - case 's': - jfiles = JFILES_COL; - break; - case 'S': -- jfiles = argv[++i]; -+ if (i < argc-1) { -+ jfiles = argv[++i]; -+ } - break; - case 't': -- tol = atof(argv[++i]); -+ if (i < argc-1) { -+ tol = atof(argv[++i]); -+ } - if( tol <= 0 ){ - gerror(stderr, "tolerance value must be positive\n"); - } ---- a/funimage.c -+++ b/funimage.c -@@ -338,12 +338,16 @@ main(argc, argv) - t = strchr(s, ','); - strncat(newname, s, t-s); - strncat(newname, ",y:", SZ_LINE-strlen(newname)); -- s = ++t; -- t = strchr(s, ','); -- strncat(newname, s, t-s); -+ if (t != NULL) { -+ s = ++t; -+ t = strchr(s, ','); -+ strncat(newname, s, t-s); -+ } - strncat(newname, "),", SZ_LINE-strlen(newname)); -- s = ++t; -- strncat(newname, s, SZ_LINE-strlen(newname)); -+ if (t != NULL) { -+ s = ++t; -+ strncat(newname, s, SZ_LINE-strlen(newname)); -+ } - iname = newname; - } - diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-hardening.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-hardening.patch deleted file mode 100644 index 2f24268d74f2..000000000000 --- a/sci-astronomy/funtools/files/funtools-1.4.4-fix-hardening.patch +++ /dev/null @@ -1,68 +0,0 @@ -Author: Ole Streicher <debian@liska.ath.cx> -Description: Fix the format string for fprintf ---- a/gnu/sort.c -+++ b/gnu/sort.c -@@ -2775,7 +2775,7 @@ - xfwrite (buf, 1, cc, ofp); - if (ferror (fp)) - { -- fprintf (stderr, files[i]); -+ fprintf (stderr, "%s", files[i]); - cleanup (); - exit (2); - } ---- a/Makefile.in -+++ b/Makefile.in -@@ -137,7 +137,7 @@ - - CC = @CC@ - --CC_SWITCHES = -I. ${CFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS} -+CC_SWITCHES = -I. ${CFLAGS} ${CPPFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS} - - DEPEND_SWITCHES = -I. ${CFLAGS} ${INCLUDES} ${AC_FLAGS} - ---- a/filter/Makefile.in -+++ b/filter/Makefile.in -@@ -114,7 +114,7 @@ - - CC = @CC@ - --CC_SWITCHES = -I. ${CFLAGS} -DFILT_VERSION="\"$(VERSION)\"" @USE_DL@ \ -+CC_SWITCHES = -I. ${CFLAGS} ${CPPFLAGS} -DFILT_VERSION="\"$(VERSION)\"" @USE_DL@ \ - ${INCLUDES} ${AC_FLAGS} - - DEPEND_SWITCHES = -I. ${CFLAGS} -I. ${INCLUDES} ${AC_FLAGS} ---- a/gnu/Makefile.in -+++ b/gnu/Makefile.in -@@ -87,7 +87,7 @@ - - CC = @CC@ - --CC_SWITCHES = ${CFLAGS} ${INCLUDES} ${AC_FLAGS} -+CC_SWITCHES = ${CFLAGS} ${CPPFLAGS} ${INCLUDES} ${AC_FLAGS} - - DEPEND_SWITCHES = ${CFLAGS} ${INCLUDES} ${AC_FLAGS} - ---- a/util/Makefile.in -+++ b/util/Makefile.in -@@ -105,7 +105,7 @@ - - CC = @CC@ - --CC_SWITCHES = -I. ${CFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS} -+CC_SWITCHES = -I. ${CFLAGS} ${CPPFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS} - - DEPEND_SWITCHES = -I. ${CFLAGS} ${INCLUDES} ${AC_FLAGS} - ---- a/mklib -+++ b/mklib -@@ -169,7 +169,7 @@ - rm -f ${LIBNAME}.so - - # make lib -- ${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS} -+ ${LINK} ${LDFLAGS} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS} - # make usual symlinks - ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} - ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch b/sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch deleted file mode 100644 index 4068ace7f810..000000000000 --- a/sci-astronomy/funtools/files/funtools-1.4.4-fix-includes.patch +++ /dev/null @@ -1,602 +0,0 @@ -Author: Ole Streicher <debian@liska.ath.cx> -Description: The include files are going to be installed in - /usr/include/funtools. So, they should refer to each other by using "" - instead of <> which also searches in the current directory. ---- a/filter/column.h -+++ b/filter/column.h -@@ -12,14 +12,14 @@ - #define __column_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #ifdef HAVE_STRING_H - #include <string.h> - #endif - --#include <prsetup.h> -+#include "prsetup.h" - _PRbeg - - void ColumnLoad _PRx((char *ibuf, int size, int n, int convert, void *obuf)); ---- a/filter/dl.h -+++ b/filter/dl.h -@@ -2,14 +2,14 @@ - #define __dl_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #ifdef HAVE_DLFCN_H - #include <dlfcn.h> - #endif - --#include <prsetup.h> -+#include "prsetup.h" - - _PRbeg - ---- a/filter/filter.h -+++ b/filter/filter.h -@@ -12,7 +12,7 @@ - #define __filter_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - /* avoid use of system -- its not secure */ -@@ -34,28 +34,28 @@ - #include <string.h> - #endif - #include <sys/types.h> --#include <prsetup.h> --#include <gio.h> --#include <file.h> --#include <find.h> --#include <macro.h> --#include <word.h> --#include <xalloc.h> --#include <strtod.h> -+#include "prsetup.h" -+#include "gio.h" -+#include "file.h" -+#include "find.h" -+#include "macro.h" -+#include "word.h" -+#include "xalloc.h" -+#include "strtod.h" - #define USE_XFILEIO 1 --#include <fitsy.h> -+#include "fitsy.h" - #undef USE_XFILEIO --#include <idx.h> --#include <wcs.h> --#include <column.h> --#include <tl.h> --#include <dl.h> --#include <mkrtemp.h> --#include <zprocess.h> --#include <winprocess.h> --#include <parse.h> -+#include "idx.h" -+#include "wcs.h" -+#include "column.h" -+#include "tl.h" -+#include "dl.h" -+#include "mkrtemp.h" -+#include "zprocess.h" -+#include "winprocess.h" -+#include "parse.h" - #ifdef USE_LAUNCH --#include <xlaunch.h> -+#include "xlaunch.h" - #endif - - #ifndef OBJPATH ---- a/filter/idx.h -+++ b/filter/idx.h -@@ -11,9 +11,9 @@ - #define __idx_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif --#include <prsetup.h> -+#include "prsetup.h" - #include <stdio.h> - #include <ctype.h> - #ifdef HAVE_UNISTD_H -@@ -22,10 +22,10 @@ - #ifdef HAVE_STRING_H - #include <string.h> - #endif --#include <fitsy.h> --#include <gio.h> --#include <xalloc.h> --#include <strtod.h> -+#include "fitsy.h" -+#include "gio.h" -+#include "xalloc.h" -+#include "strtod.h" - - /* binary search edge */ - #define IDX_EDGE_LEFT 1 ---- a/filter/tl.h -+++ b/filter/tl.h -@@ -11,7 +11,7 @@ - #ifndef __tl_h - #define __tl_h - --#include <prsetup.h> -+#include "prsetup.h" - - _PRbeg - ---- a/fitsy/fitsy.h -+++ b/fitsy/fitsy.h -@@ -5,13 +5,13 @@ - #define FITSY_H - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #if USE_XFILEIO --#include <xfileio.h> -+#include "xfileio.h" - #else --#include <xfile.h> -+#include "xfile.h" - #endif - - #ifdef __STDC__ -@@ -30,7 +30,7 @@ - - #include <ctype.h> - --#include <longlong.h> -+#include "longlong.h" - - #ifndef NULL - #define NULL 0 ---- a/funtools.h -+++ b/funtools.h -@@ -27,11 +27,11 @@ - #define FUN_VERSION "1.4.4" - - #ifndef FUNTOOLS_PRIVATE --#include <prsetup.h> -+#include "prsetup.h" - #define USE_XFILEIO 1 --#include <fitsy.h> -+#include "fitsy.h" - #undef USE_XFILEIO --#include <wcs.h> -+#include "wcs.h" - typedef void *Fun; - #endif - ---- a/funtoolsP.h -+++ b/funtoolsP.h -@@ -12,7 +12,7 @@ - #define __funtoolsP_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #include <stdio.h> -@@ -32,20 +32,20 @@ - #include <getopt.h> - #endif - #include <sys/types.h> --#include <prsetup.h> -+#include "prsetup.h" - #define USE_XFILEIO 1 --#include <fitsy.h> -+#include "fitsy.h" - #undef USE_XFILEIO --#include <wcs.h> --#include <filter.h> --#include <file.h> --#include <swap.h> --#include <word.h> --#include <parse.h> --#include <xalloc.h> --#include <mkrtemp.h> --#include <NaN.h> --#include <xlaunch.h> -+#include "wcs.h" -+#include "filter.h" -+#include "file.h" -+#include "swap.h" -+#include "word.h" -+#include "parse.h" -+#include "xalloc.h" -+#include "mkrtemp.h" -+#include "NaN.h" -+#include "xlaunch.h" - - #ifndef MAXINT - #define MAXINT 2147483647 -@@ -338,6 +338,6 @@ int FunView _PRx((Fun fun, char *view, char *vmode, char *fname, int fmax)); - - _PRend - --#include <funtools.h> -+#include "funtools.h" - - #endif /* __funtoolsP.h */ ---- a/ofuntools.h -+++ b/ofuntools.h -@@ -27,11 +27,11 @@ - #define FUN_VERSION "1.4.4" - - #ifndef FUNTOOLS_PRIVATE --#include <prsetup.h> -+#include "prsetup.h" - #define USE_XFILEIO 1 --#include <fitsy.h> -+#include "fitsy.h" - #undef USE_XFILEIO --#include <wcs.h> -+#include "wcs.h" - typedef void *Fun; - #endif - ---- a/util/NaN.h.in -+++ b/util/NaN.h.in -@@ -20,7 +20,7 @@ - #ifndef __nan_h - #define __nan_h - --#include <prsetup.h> -+#include "prsetup.h" - - #define BIGENDIAN @BIGENDIAN@ - ---- a/util/file.h -+++ b/util/file.h -@@ -12,7 +12,7 @@ - #define __file_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #include <stdio.h> -@@ -28,9 +28,9 @@ - #endif - #include <sys/types.h> - #include <sys/stat.h> --#include <prsetup.h> --#include <macro.h> --#include <xalloc.h> -+#include "prsetup.h" -+#include "macro.h" -+#include "xalloc.h" - - _PRbeg - int FileExists _PRx((char *filename)); ---- a/util/find.h -+++ b/util/find.h -@@ -12,7 +12,7 @@ - #define __find_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #include <stdio.h> -@@ -25,8 +25,8 @@ - #endif - #include <sys/types.h> - #include <sys/stat.h> --#include <xalloc.h> --#include <prsetup.h> -+#include "xalloc.h" -+#include "prsetup.h" - - _PRbeg - ---- a/util/gio.h -+++ b/util/gio.h -@@ -11,10 +11,10 @@ - #ifndef _gio_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - --#include <xport.h> -+#include "xport.h" - - #include <stdio.h> - #ifdef HAVE_STRING_H -@@ -46,8 +46,8 @@ - #include <sys/stat.h> - #include <sys/time.h> - --#include <prsetup.h> --#include <xalloc.h> -+#include "prsetup.h" -+#include "xalloc.h" - - /* use ftello/fseeko (assuming its available) if we are using 64-bit offsets */ - #if _FILE_OFFSET_BITS == 64 ---- a/util/macro.h -+++ b/util/macro.h -@@ -12,7 +12,7 @@ - #define __macro_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #include <stdio.h> -@@ -26,7 +26,7 @@ - #ifdef HAVE_STDLIB_H - #include <stdlib.h> - #endif --#include <prsetup.h> -+#include "prsetup.h" - - typedef char *(*MacroCall)( - #ifdef ANSI_FUNC ---- a/util/mainlib.h -+++ b/util/mainlib.h -@@ -12,7 +12,7 @@ - #define __mainlib_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - #ifdef HAVE_STRING_H - #include <string.h> -@@ -29,11 +29,11 @@ - #include <stdio.h> - #include <errno.h> - #include <sys/types.h> --#include <prsetup.h> --#include <xalloc.h> --#include <word.h> --#include <find.h> --#include <gio.h> -+#include "prsetup.h" -+#include "xalloc.h" -+#include "word.h" -+#include "find.h" -+#include "gio.h" - - /* types of mainlibs we recognize */ - #define MAINLIB_ERROR 0 ---- a/util/mkrtemp.h -+++ b/util/mkrtemp.h -@@ -12,7 +12,7 @@ - #define __mkrtemp_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #include <sys/types.h> -@@ -31,9 +31,9 @@ - #ifdef HAVE_STDLIB_H - #include <stdlib.h> - #endif --#include <prsetup.h> --#include <word.h> --#include <xalloc.h> -+#include "prsetup.h" -+#include "word.h" -+#include "xalloc.h" - - #ifdef __APPLE__ - #define lrand48 random ---- a/util/parse.h -+++ b/util/parse.h -@@ -12,7 +12,7 @@ - #define __parse_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #include <stdio.h> -@@ -33,12 +33,12 @@ - #endif - #include <ctype.h> - --#include <prsetup.h> --#include <strtod.h> --#include <xalloc.h> --#include <word.h> --#include <gio.h> --#include <longlong.h> -+#include "prsetup.h" -+#include "strtod.h" -+#include "xalloc.h" -+#include "word.h" -+#include "gio.h" -+#include "longlong.h" - - #define PARSE_DEBUG 1 - #if PARSE_DEBUG ---- a/util/strtod.h -+++ b/util/strtod.h -@@ -11,7 +11,7 @@ - #ifndef __strtod_h - #define __strtod_h - --#include <prsetup.h> -+#include "prsetup.h" - - extern int SAOdtype; - ---- a/util/swap.h -+++ b/util/swap.h -@@ -11,7 +11,7 @@ - #ifndef __swap_h - #define __swap_h - --#include <prsetup.h> -+#include "prsetup.h" - - /* data types */ - #define TY_CHAR 1 ---- a/util/tclmainlib.h -+++ b/util/tclmainlib.h -@@ -1,4 +1,4 @@ --#include <mainlib.h> -+#include "mainlib.h" - - #if HAVE_TCL - ---- a/util/winprocess.h -+++ b/util/winprocess.h -@@ -13,7 +13,7 @@ - #define __winprocess_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - #include <stdio.h> - #ifdef HAVE_UNISTD_H -@@ -25,7 +25,7 @@ - #ifdef HAVE_STDLIB_H - #include <stdlib.h> - #endif --#include <prsetup.h> -+#include "prsetup.h" - - #if defined(HAVE_CYGWIN) || defined(WIN32) - ---- a/util/word.h -+++ b/util/word.h -@@ -12,7 +12,7 @@ - #define __word_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - #ifdef HAVE_STRING_H - #include <string.h> -@@ -23,8 +23,8 @@ - #if HAVE_STDLIB_H - #include <stdlib.h> - #endif --#include <prsetup.h> --#include <xalloc.h> -+#include "prsetup.h" -+#include "xalloc.h" - - /* defines the types of callback procedure we use */ - typedef char *(*MacroCB)( ---- a/util/xalloc.h -+++ b/util/xalloc.h -@@ -12,7 +12,7 @@ - #define __xalloc_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #include <sys/types.h> -@@ -33,7 +33,7 @@ - #include <setjmp.h> - #endif - --#include <prsetup.h> -+#include "prsetup.h" - - _PRbeg - ---- a/util/xfileio.h -+++ b/util/xfileio.h -@@ -7,7 +7,7 @@ - #ifndef XFILEIO_H - #define XFILEIO_H - --#include <gio.h> -+#include "gio.h" - - /* define the basic IO routines */ - typedef GIO File; ---- a/util/xlaunch.h -+++ b/util/xlaunch.h -@@ -12,7 +12,7 @@ - #define __xlaunch_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #include <stdio.h> -@@ -33,10 +33,10 @@ - #if HAVE_POSIX_SPAWN - #include <spawn.h> - #endif --#include <xport.h> --#include <word.h> --#include <xalloc.h> --#include <prsetup.h> -+#include "xport.h" -+#include "word.h" -+#include "xalloc.h" -+#include "prsetup.h" - - #define LAUNCH_ARGS 1024 - ---- a/util/xport.h -+++ b/util/xport.h -@@ -11,7 +11,7 @@ - #define __xport_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - - #if HAVE_MINGW32 ---- a/util/zprocess.h -+++ b/util/zprocess.h -@@ -14,7 +14,7 @@ - #define __zprocess_h - - #if HAVE_CONFIG_H --#include <conf.h> -+#include "conf.h" - #endif - #include <stdio.h> - #ifdef HAVE_UNISTD_H -@@ -28,8 +28,8 @@ - #endif - #include <sys/time.h> - #include <signal.h> --#include <xlaunch.h> --#include <find.h> -+#include "xlaunch.h" -+#include "find.h" - - _PRbeg - diff --git a/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch b/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch deleted file mode 100644 index d1045b643176..000000000000 --- a/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch +++ /dev/null @@ -1,341 +0,0 @@ -diff -Nur funtools-1.4.4.orig/filter/Makefile.in funtools-1.4.4/filter/Makefile.in ---- funtools-1.4.4.orig/filter/Makefile.in 2014-03-04 08:35:59.665478514 -0800 -+++ funtools-1.4.4/filter/Makefile.in 2014-03-04 08:36:38.196760766 -0800 -@@ -29,6 +29,9 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+includedir = @includedir@ -+libdir = @libdir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -38,13 +41,13 @@ - INSTALL_ROOT = - - # Directory in which to install the .a, .so, and .o files: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the programs: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the include files: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/filter - - # util files are in the util directory at same level - UTIL_INC = -I../util -@@ -55,7 +58,7 @@ - #FITSY_LIBS = -L../fitsy - - # wcs files are in the wcs subdirectory --WCS_INC = -I../wcs -+#WCS_INC = -I../wcs - #WCS_LIBS = -L../wcs -lwcs - - # extra includes for compiling -@@ -161,7 +164,7 @@ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -- mkdir $$i; \ -+ mkdir -p $$i; \ - chmod 755 $$i; \ - else true; \ - fi; \ -@@ -228,6 +231,10 @@ - - swap_c.h: swap.c inc.sed - $(RM) swap_c.h -+ ./inc.sed SWAP_C < swap.c > swap_c.h -+ -+swap_c.h: swap.c inc.sed -+ $(RM) swap_c.h - ./inc.sed SWAP_C < swap.c > swap_c.h - - events_c.h: evfilter.c inc.sed -diff -Nur funtools-1.4.4.orig/fitsy/Makefile.in funtools-1.4.4/fitsy/Makefile.in ---- funtools-1.4.4.orig/fitsy/Makefile.in 2014-03-04 08:35:59.638478312 -0800 -+++ funtools-1.4.4/fitsy/Makefile.in 2014-03-04 08:36:38.197760773 -0800 -@@ -28,6 +28,11 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+includedir = @includedir@ -+mandir = @mandir@ -+datadir = @datadir@ -+libdir = @libdir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -37,13 +42,13 @@ - INSTALL_ROOT = - - # Directory in which to install the .a, .so, and .o files: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the programs: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the include files: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/fitsy - - # There are just too many different versions of "install" around; - # better to use the install-sh script that comes with the distribution, -@@ -187,7 +192,7 @@ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -- mkdir $$i; \ -+ mkdir -p $$i; \ - chmod 755 $$i; \ - else true; \ - fi; \ -diff -Nur funtools-1.4.4.orig/gnu/Makefile.in funtools-1.4.4/gnu/Makefile.in ---- funtools-1.4.4.orig/gnu/Makefile.in 2014-03-04 08:35:59.642478341 -0800 -+++ funtools-1.4.4/gnu/Makefile.in 2014-03-04 08:36:38.197760773 -0800 -@@ -21,6 +21,11 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+includedir = @includedir@ -+mandir = @mandir@ -+datadir = @datadir@ -+libdir = @libdir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -53,13 +58,13 @@ - EXTRA_OBJS = @EXTRA_OBJS@ - - # Directory in which to install the .a, .so, and .o files: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the programs: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the include files: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) - - # There are just too many different versions of "install" around; - # better to use the install-sh script that comes with the distribution, -diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in ---- funtools-1.4.4.orig/Makefile.in 2014-03-04 08:35:59.665478514 -0800 -+++ funtools-1.4.4/Makefile.in 2014-03-04 08:37:40.214224788 -0800 -@@ -28,28 +28,33 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+includedir = @includedir@ -+mandir = @mandir@ -+datadir = @datadir@ -+libdir = @libdir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation - # to be different than those used for actually reference files at - # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix - # when installing files. --INSTALL_ROOT = -+INSTALL_ROOT = $(DESTDIR) - - # Directory in which to install the .a or .so binary for the FUNTOOLS library: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the program wish: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the funtools.h include file: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools - - # Top-level directory for manual entries: --MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) - - # Top-level directory for share entries: --MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/funtools -+MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/funtools - - # util files are in the util subdirectory - UTIL_INC = -I./util -@@ -60,8 +65,8 @@ - # FITSY_LIBS = -L./fitsy -lfitsy - - # wcs files are in the wcs subdirectory --WCS_INC = -I./wcs --# WCS_LIBS = -L./wcs -lwcs -+#WCS_INC = -I../wcs -+#WCS_LIBS = -L./wcs -lwcs - - # filter files are in the filter subdirectory - FILTER_INC = -I./filter -@@ -160,7 +165,7 @@ - - # this is used in the link line - # LLIB = $(LIB) --LLIB = @LLIB@ -+LLIB = -L. -lfuntools - - # libraries containing main as subroutines - MAINLIB = lib$(PACKAGE)MainLib.a -@@ -188,7 +193,7 @@ - - # Subdirectories to run make in for the primary targets. - --SUBLIBS = util fitsy wcs filter -+SUBLIBS = util fitsy filter - - SUBDIRS = $(SUBLIBS) gnu funtest faq - -@@ -225,10 +230,10 @@ - echo $(PROGS) | ./mkfunmainlib > funmainlib.c; - - shlib: sublib $(LIBOBJS) -- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ -+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ - (cd $(PACKAGE)tmp && ar x ../$(LIB)); \ - CC='$(CC)' CXX=$(CXX) \ -- ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \ -+ ./mklib $(PACKAGE)tmp/*.o $(LIBS) -o $(PACKAGE) ; \ - rm -rf $(PACKAGE)tmp;) - - mainlib: $(MAINLIBOBJS) funmainlib.o lex.calc.o -@@ -237,7 +242,7 @@ - $(RANLIB) lib$(PACKAGE)MainLib.a) - - shmainlib: mainlib -- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ -+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ - (cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \ - CC='$(CC)' CXX='$(CXX)' \ - ./mklib -o $(PACKAGE)MainLib -L. -lfuntools $(PACKAGE)tmp/*.o;\ -@@ -248,7 +253,7 @@ - $(RANLIB) libtclfun.a) - - shtclfun: tclfun -- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ -+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ - (cd $(PACKAGE)tmp && ar x ../$(LIB) && ar x ../libtclfun.a); \ - CC='$(CC)' CXX='$(CXX)' \ - ./mklib -o tclfun $(PACKAGE)tmp/*.o; \ -@@ -386,7 +391,7 @@ - @for dir in $(SUBDIRS); do \ - echo " "; \ - echo Installing in $$dir ...; \ -- (cd $$dir; $(MAKE) $@) ; \ -+ (cd $$dir; $(MAKE) INSTALL_ROOT=$(INSTALL_ROOT) INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR) $@) ; \ - done - - install:: install-man -@@ -422,7 +427,7 @@ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -- mkdir $$i; \ -+ mkdir -p $$i; \ - chmod 755 $$i; \ - else true; \ - fi; \ -@@ -462,7 +467,7 @@ - install-man: - @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \ - echo "Making directory $(MAN_INSTALL_DIR)"; \ -- mkdir $(MAN_INSTALL_DIR); \ -+ mkdir -p $(MAN_INSTALL_DIR); \ - chmod 755 $(MAN_INSTALL_DIR); \ - else true; \ - fi; -@@ -473,7 +478,7 @@ - M="$(MAN_INSTALL_DIR)/man$$E"; \ - if [ ! -d $$M ] ; then \ - echo "Making directory $$M"; \ -- mkdir $$M; \ -+ mkdir -p $$M; \ - chmod 755 $$M; \ - else true; \ - fi; \ -diff -Nur funtools-1.4.4.orig/util/Makefile.in funtools-1.4.4/util/Makefile.in ---- funtools-1.4.4.orig/util/Makefile.in 2014-03-04 08:35:59.653478425 -0800 -+++ funtools-1.4.4/util/Makefile.in 2014-03-04 08:36:38.197760773 -0800 -@@ -29,6 +29,11 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+includedir = @includedir@ -+mandir = @mandir@ -+datadir = @datadir@ -+libdir = @libdir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -38,13 +43,13 @@ - INSTALL_ROOT = - - # Directory in which to install the .a, .so, and .o files: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the programs: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the include files: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/util - - # extra includes for compiling - INCLUDES = -@@ -200,12 +205,24 @@ - tlaunch2: tlaunch2.o - $(CC) $(LDFLAGS) tlaunch2.o -o tlaunch2 - -+tlaunch.o: tlaunch.c -+ -+tlaunch: tlaunch.o launch.o $(LIB) -+ $(CC) $(LDFLAGS) tlaunch.o launch.o -o tlaunch $(LIB) $(LIBS) \ -+ $(EXTRA_LIBS) -+ -+tlaunch2.o: tlaunch2.c -+ -+tlaunch2: tlaunch2.o -+ $(CC) $(LDFLAGS) tlaunch2.o -o tlaunch2 -+ -+ - install-binaries: $(LIB) $(PROGS) - @for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -- mkdir $$i; \ -+ mkdir -p $$i; \ - chmod 755 $$i; \ - else true; \ - fi; \ -@@ -272,4 +289,11 @@ - purift $(CC) $(LDFLAGS) tlaunch.o xlaunch.o -o tlaunch \ - $(LIB) $(LIBS) $(EXTRA_LIBS) - -+pure: tlaunch.pure -+ -+tlaunch.pure: tlaunch.o launch.o $(LIB) -+ purift $(CC) $(LDFLAGS) tlaunch.o launch.o -o tlaunch \ -+ $(LIB) $(LIBS) $(EXTRA_LIBS) -+ -+ - # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/sci-astronomy/funtools/funtools-1.4.4-r4.ebuild b/sci-astronomy/funtools/funtools-1.4.4-r4.ebuild deleted file mode 100644 index dff3ed4d0d85..000000000000 --- a/sci-astronomy/funtools/funtools-1.4.4-r4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils toolchain-funcs multilib autotools - -DESCRIPTION="FITS library and utlities for astronomical images" -HOMEPAGE="http://www.cfa.harvard.edu/~john/funtools/" -SRC_URI="http://cfa-www.harvard.edu/~john/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" - -RDEPEND=" - sys-libs/zlib - sci-astronomy/wcstools - sci-visualization/gnuplot" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-ds9-fixes.patch \ - "${FILESDIR}"/${P}-fix-autoheader.patch \ - "${FILESDIR}"/${P}-fix-includes.patch \ - "${FILESDIR}"/${P}-fix-hardening.patch \ - "${FILESDIR}"/${P}-fix-crashes.patch \ - "${FILESDIR}"/${P}-makefiles.patch - sed -i -e "s:/usr:${EPREFIX}/usr:g" filter/Makefile.in || die - sed -i \ - -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \ - mklib || die "sed for ldflags failed" - eautoreconf -} - -src_configure() { - econf \ - --enable-shared \ - --enable-dl \ - --enable-mainlib \ - --with-wcslib="$($(tc-getPKG_CONFIG) --libs wcstools)" \ - --with-zlib="$($(tc-getPKG_CONFIG) --libs zlib)" \ - --with-tcl=-ltcl -} - -src_compile() { - emake WCS_INC="$($(tc-getPKG_CONFIG) --cflags wcstools)" - emake shtclfun -} - -src_install () { - default - dosym libtclfun.so.1 /usr/$(get_libdir)/libtclfun.so - # install missing includes - insinto /usr/include/funtools/fitsy - doins fitsy/*.h - use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a - use doc && cd doc && dodoc *.pdf && dohtml *html *c -} diff --git a/sci-astronomy/funtools/funtools-1.4.6.ebuild b/sci-astronomy/funtools/funtools-1.4.6.ebuild new file mode 100644 index 000000000000..355501c4104a --- /dev/null +++ b/sci-astronomy/funtools/funtools-1.4.6.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit toolchain-funcs autotools + +DESCRIPTION="FITS library and utlities for astronomical images" +HOMEPAGE="https://github.com/ericmandel/funtools" +SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/1" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc" + +RDEPEND=" + sys-libs/zlib:0= + sci-astronomy/wcstools:0= + sci-visualization/gnuplot" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + default + # respect libdir, dont build wcs, respect toolchain + sed -e "/INSTALL/s|/lib|/$(get_libdir)|g" \ + -e 's|${OBJS}|$(OBJS)|g' \ + -e '/^SUBLIBS/s|wcs||g' \ + -e 's/mkdir/mkdir -p/g' \ + -e '/mklib/s|-o $(PACKAGE)|-o $(PACKAGE) $(LIBS)|g' \ + -e "s| ar| $(tc-getAR)|g" \ + -e "s|ar cruv|$(tc-getAR) cruv|g" \ + -e "s|WCS_INC.*=.*|WCS_INC = $($(tc-getPKG_CONFIG) --cflags wcstools)|g" \ + -i Makefile.in */Makefile.in || die + # fix race condition (when ccache is on) + sed -e 's|$(LIB):|$(LIB): FORCE|g' \ + -e '$aFORCE:' \ + -i */Makefile.in || die + eautoreconf +} + +src_configure() { + econf \ + --exec-prefix="${EPREFIX}/usr" \ + --enable-shared \ + --enable-dl \ + --with-wcslib="$($(tc-getPKG_CONFIG) --libs wcstools)" \ + --with-zlib="$($(tc-getPKG_CONFIG) --libs zlib)" \ + --with-tcl="${EPREFIX}/usr/$(get_libdir)" +} + +src_compile() { + emake + emake shtclfun +} + +src_install () { + default + # install missing includes + insinto /usr/include/funtools/fitsy + doins fitsy/*.h + # fix bug #536630 + mv "${ED}"/usr/share/man/man3/funopen.3 \ + "${ED}"/usr/share/man/man7/funopen.7 \ + || die + use doc && cd doc && dodoc *.pdf *html *c +} diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest index d294b0baf4b0..735318aeeec3 100644 --- a/sci-geosciences/mapserver/Manifest +++ b/sci-geosciences/mapserver/Manifest @@ -1 +1 @@ -DIST mapserver-6.0.1.tar.gz 2430064 SHA256 dd6821917aa7030381442f5e092e4f46f44b9deb9425ec92729e5819e9b61d65 SHA512 0fd9da9d6452fbfbaf0c815e6d15309e185119a4ab33cab2f1c6839bfb8c3a75ce6e7e7779b0eb2aa6e80d1a623ca6e0e58a02049b0db0bfa3f7b0f29117d5dc WHIRLPOOL e4846d40b93c22f7b5dcce1c242b4d88db253be9185194b45c4acddf9066d10c2ec2fbe667941dfe15702838690517a0e57719b1937169e55517e43ed1c225b8 +DIST mapserver-7.0.0.tar.gz 2495028 SHA256 b306b8111e0718a577ce595640c2d3224f913745af732a1b75f6f5cb3dddce45 SHA512 1e4d15f6c42cdf0b00533e2aa26c1b65f84bdbb3a91538d6addde3aa0e8874deed4969146cf7045858bcab2880e4d7429965660c5985d175bd19ce018ae90652 WHIRLPOOL f18f0679b70da795d0585df2dbcc07fda0f8533c9ef7972280301446e5d521d9f24f0ff482d8e5497954e3b67436f2f9f2576516f6f088dc388046314817a46b diff --git a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch b/sci-geosciences/mapserver/files/5.4.2-ldflags.patch deleted file mode 100644 index d202b8d4692f..000000000000 --- a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 56cb209..46a8a4c 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -252,7 +252,7 @@ SUP_LIBS = $(GD_LIB) $(AGG_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIBS) \ - # STATIC_LIBS is full filename with path of libs that will be statically linked - STATIC_LIBS= $(GD_STATIC) - --EXE_LDFLAGS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) -+EXE_LIBS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) - - RM= /bin/rm -f - -@@ -316,59 +316,59 @@ $(LIBMAP_SHARED): $(LIBMAP_STATIC) - && ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED) - - shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h -- $(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf -+ $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS) - - shp2img: $(LIBMAP_STATIC) shp2img.o mapserver.h -- $(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img -+ $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS) - - sym2img: $(LIBMAP_STATIC) sym2img.o mapserver.h -- $(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img -+ $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS) - - legend: $(LIBMAP_STATIC) legend.o mapserver.h -- $(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend -+ $(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS) - - scalebar: $(LIBMAP_STATIC) scalebar.o mapserver.h -- $(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar -+ $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS) - - mapserv: mapserv.h maptile.h $(LIBMAP_STATIC) mapserv.o cgiutil.o maptile.o mapserver.h -- $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv -+ $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS) - - shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h -- $(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex -+ $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS) - - shptree: $(LIBMAP_STATIC) shptree.o mapserver.h -- $(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree -+ $(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS) - - shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h -- $(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis -+ $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS) - - shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h -- $(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst -+ $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS) - - sortshp: sortshp.o -- $(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp -+ $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS) - - tile4ms: tile4ms.o -- $(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms -+ $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS) - - msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h -- $(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt -+ $(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS) - - testexpr: testexpr.o mapparser.o maplexer.o -- $(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr -+ $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS) - - testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h -- $(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy -+ $(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS) - - test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c -- $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto -+ $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS) - - mapscriptvars: Makefile - touch mapscriptvars - pwd > mapscriptvars - echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars - echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(TIFF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars -- echo $(EXE_LDFLAGS) >> mapscriptvars -+ echo $(LDFLAGS) >> mapscriptvars - echo $(STATIC_LIBS) >> mapscriptvars - grep '#define MS_VERSION ' mapserver.h >> mapscriptvars - diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch deleted file mode 100644 index 8016961b515b..000000000000 --- a/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -urN mapserver-6.0.0-rc1.old/mapscript/php/bool.h mapserver-6.0.0-rc1/mapscript/php/bool.h ---- mapserver-6.0.0-rc1.old/mapscript/php/bool.h 1970-01-01 01:00:00.000000000 +0100 -+++ mapserver-6.0.0-rc1/mapscript/php/bool.h 2011-05-02 22:00:00.000000000 +0200 -@@ -0,0 +1,8 @@ -+#ifndef BOOL_H -+#define BOOL_H -+ -+#define bool_t int -+#define TRUE 1 -+#define FALSE 0 -+ -+#endif /* BOOL_H */ -diff -urN mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h ---- mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h 2011-05-02 12:10:03.000000000 +0200 -+++ mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h 2011-05-02 22:00:11.000000000 +0200 -@@ -32,6 +32,7 @@ - #ifndef PHP_MAPSCRIPT_H - #define PHP_MAPSCRIPT_H - -+#include "bool.h" - #include "php.h" - #include "zend_interfaces.h" - #include "php_mapscript_util.h" diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch deleted file mode 100644 index 336fb2eff4f7..000000000000 --- a/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -urN mapserver-6.0.0-rc1.old/Makefile.in mapserver-6.0.0-rc1/Makefile.in ---- mapserver-6.0.0-rc1.old/Makefile.in 2011-05-02 12:10:03.000000000 +0200 -+++ mapserver-6.0.0-rc1/Makefile.in 2011-05-02 16:29:31.000000000 +0200 -@@ -264,7 +264,7 @@ - # STATIC_LIBS is full filename with path of libs that will be statically linked - STATIC_LIBS= $(GD_STATIC) - --EXE_LDFLAGS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) -+EXE_LIBS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) - - RM= /bin/rm -f - -@@ -351,59 +351,59 @@ - && ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED) - - shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h -- $(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf -+ $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS) - - shp2img: $(LIBMAP_STATIC) shp2img.o mapserver.h -- $(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img -+ $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS) - - sym2img: $(LIBMAP_STATIC) sym2img.o mapserver.h -- $(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img -+ $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS) - - legend: $(LIBMAP_STATIC) legend.o mapserver.h -- $(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend -+ $(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS) - - scalebar: $(LIBMAP_STATIC) scalebar.o mapserver.h -- $(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar -+ $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS) - - mapserv: mapserv.h maptile.h $(LIBMAP_STATIC) mapserv.o cgiutil.o maptile.o mapserver.h -- $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv -+ $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS) - - shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h -- $(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex -+ $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS) - - shptree: $(LIBMAP_STATIC) shptree.o mapserver.h -- $(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree -+ $(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS) - - shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h -- $(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis -+ $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS) - - shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h -- $(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst -+ $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS) - - sortshp: $(LIBMAP_STATIC) sortshp.o mapserver.h -- $(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp -+ $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS) - - tile4ms: $(LIBMAP_STATIC) tile4ms.o mapserver.h -- $(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms -+ $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS) - - msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h -- $(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt -+ $(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS) - - testexpr: $(LIBMAP_STATIC) testexpr.o mapparser.o maplexer.o mapserver.h -- $(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr -+ $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS) - - testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h -- $(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy -+ $(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS) - - test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c mapserver.h -- $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto -+ $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS) - - mapscriptvars: Makefile - touch mapscriptvars - pwd > mapscriptvars - echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars - echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars -- echo $(EXE_LDFLAGS) >> mapscriptvars -+ echo $(EXE_LIBS) >> mapscriptvars - echo $(STATIC_LIBS) >> mapscriptvars - grep '#define MS_VERSION ' mapserver.h >> mapscriptvars - diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch deleted file mode 100644 index 706bae4ce7b1..000000000000 --- a/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- mapserver-6.0.0-rc1.old/mapscript/php/Makefile.in 2011-05-02 12:10:03.000000000 +0200 -+++ mapserver-6.0.0-rc1/mapscript/php/Makefile.in 2011-05-02 23:43:15.000000000 +0200 -@@ -86,10 +86,10 @@ - - - php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a -- $(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS) -+ $(LD) -o $@ $(LDFLAGS) $(PHPMS_OBJS) $(MS_LIBS) - - php_proj.so: $(PHPPROJ_OBJS) -- $(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS) -+ $(LD) -o $@ $(LDFLAGS) $(PHPPROJ_OBJS) $(MS_LIBS) - - %.o: %.c php_mapscript_util.h php_mapscript.h - $(CC) $(CFLAGS112) -c -o $@ $< diff --git a/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch b/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch deleted file mode 100644 index e81fd90195f9..000000000000 --- a/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -aurN mapserver-6.0.1.orig/mapscript/php/image.c mapserver-6.0.1/mapscript/php/image.c ---- mapserver-6.0.1.orig/mapscript/php/image.c 2011-04-05 11:15:06.000000000 -0400 -+++ mapserver-6.0.1/mapscript/php/image.c 2015-02-04 14:29:03.164357015 -0500 -@@ -303,10 +303,18 @@ - /* no filename - read stdout */ - - /* if there is no output buffer active, set the header */ -- if (OG(ob_nesting_level)<=0) -- { -- php_header(TSRMLS_C); -- } -+ //handle changes in PHP 5.4.x -+ #if PHP_VERSION_ID < 50399 -+ if (OG(ob_nesting_level)<=0) -+ { -+ php_header(TSRMLS_C); -+ } -+ #else -+ if (php_output_get_level(TSRMLS_C)<=0) -+ { -+ php_header(TSRMLS_C); -+ } -+ #endif - - - if (MS_RENDERER_PLUGIN(php_image->image->format)) -diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript.c mapserver-6.0.1/mapscript/php/php_mapscript.c ---- mapserver-6.0.1.orig/mapscript/php/php_mapscript.c 2011-04-05 23:05:02.000000000 -0400 -+++ mapserver-6.0.1/mapscript/php/php_mapscript.c 2015-02-04 14:27:52.296567202 -0500 -@@ -899,7 +899,7 @@ - - } - --function_entry mapscript_functions[] = { -+zend_function_entry mapscript_functions[] = { - PHP_FE(ms_GetVersion, NULL) - PHP_FE(ms_GetVersionInt, NULL) - PHP_FE(ms_newLineObj, NULL) -diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c mapserver-6.0.1/mapscript/php/php_mapscript_util.c ---- mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c 2011-04-04 13:50:20.000000000 -0400 -+++ mapserver-6.0.1/mapscript/php/php_mapscript_util.c 2015-02-04 14:27:27.477341249 -0500 -@@ -42,7 +42,12 @@ - zobj->ce = ce; - ALLOC_HASHTABLE(zobj->properties); - zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0); -- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *)); -+ //handle changes in PHP 5.4.x -+ #if PHP_VERSION_ID < 50399 -+ zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *)); -+ #else -+ object_properties_init(zobj, ce); -+ #endif - retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC); - retval.handlers = &mapscript_std_object_handlers; - return retval; -@@ -59,7 +64,12 @@ - zobj->ce = ce; - ALLOC_HASHTABLE(zobj->properties); - zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0); -- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *)); -+ //handle changes in PHP 5.4.x -+ #if PHP_VERSION_ID < 50399 -+ zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *)); -+ #else -+ object_properties_init(zobj, ce); -+ #endif - retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC); - retval.handlers = object_handlers; - return retval; diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-OGREscapeSQLParam.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-OGREscapeSQLParam.patch new file mode 100644 index 000000000000..6ea6d9296f54 --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-OGREscapeSQLParam.patch @@ -0,0 +1,22 @@ +diff --git a/mapogr.cpp b/mapogr.cpp +index 1708d1c..217239b 100755 +--- a/mapogr.cpp ++++ b/mapogr.cpp +@@ -1311,6 +1311,8 @@ static int msOGRFileClose(layerObj *layer, msOGRFileInfo *psInfo ) + return MS_SUCCESS; + } + ++#endif ++ + /************************************************************************/ + /* msOGREscapeSQLParam */ + /************************************************************************/ +@@ -1337,6 +1339,8 @@ static char *msOGREscapeSQLParam(layerObj *layer, const char *pszString) + #endif /* USE_OGR */ + } + ++#ifdef USE_OGR ++ + /********************************************************************** + * msOGRTranslateMsExpressionToOGRSQL() + * diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch new file mode 100644 index 000000000000..738345717854 --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch @@ -0,0 +1,511 @@ +diff --git a/mapcontour.c b/mapcontour.c +index ae52fc6..74cf7d1 100644 +--- a/mapcontour.c ++++ b/mapcontour.c +@@ -345,11 +345,11 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect) + ury = floor(ury / virtual_grid_step_y) * virtual_grid_step_y - (virtual_grid_step_x*5); + lly = ceil(lly / virtual_grid_step_y) * virtual_grid_step_y + (virtual_grid_step_x*5); + +- src_xoff = MAX(0,(int) floor(llx+0.5)); +- src_yoff = MAX(0,(int) floor(ury+0.5)); +- src_xsize = MIN(MAX(0,(int) (urx - llx + 0.5)), ++ src_xoff = MS_MAX(0,(int) floor(llx+0.5)); ++ src_yoff = MS_MAX(0,(int) floor(ury+0.5)); ++ src_xsize = MS_MIN(MS_MAX(0,(int) (urx - llx + 0.5)), + GDALGetRasterXSize(clinfo->hOrigDS) - src_xoff); +- src_ysize = MIN(MAX(0,(int) (lly - ury + 0.5)), ++ src_ysize = MS_MIN(MS_MAX(0,(int) (lly - ury + 0.5)), + GDALGetRasterYSize(clinfo->hOrigDS) - src_yoff); + + /* Update the geographic extent (buffer added) */ +@@ -386,8 +386,8 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect) + } else { + src_xoff = 0; + src_yoff = 0; +- dst_xsize = src_xsize = MIN(map->width,src_xsize); +- dst_ysize = src_ysize = MIN(map->height,src_ysize); ++ dst_xsize = src_xsize = MS_MIN(map->width,src_xsize); ++ dst_ysize = src_ysize = MS_MIN(map->height,src_ysize); + copyRect.minx = copyRect.miny = 0; + copyRect.maxx = map->width; + copyRect.maxy = map->height; +@@ -436,7 +436,7 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect) + adfGeoTransform[4] = 0; + adfGeoTransform[5] = -dst_cellsize_y; + +- clinfo->cellsize = MAX(dst_cellsize_x, dst_cellsize_y); ++ clinfo->cellsize = MS_MAX(dst_cellsize_x, dst_cellsize_y); + { + char buf[64]; + sprintf(buf, "%lf", clinfo->cellsize); +diff --git a/mapdrawgdal.c b/mapdrawgdal.c +index e843318..f90f2ac 100644 +--- a/mapdrawgdal.c ++++ b/mapdrawgdal.c +@@ -217,21 +217,21 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image, + urx = GEO_TRANS(adfInvGeoTransform+0,copyRect.maxx,copyRect.maxy); + ury = GEO_TRANS(adfInvGeoTransform+3,copyRect.maxx,copyRect.maxy); + +- src_xoff = MAX(0,(int) floor(llx+0.5)); +- src_yoff = MAX(0,(int) floor(ury+0.5)); +- src_xsize = MIN(MAX(0,(int) (urx - llx + 0.5)), ++ src_xoff = MS_MAX(0,(int) floor(llx+0.5)); ++ src_yoff = MS_MAX(0,(int) floor(ury+0.5)); ++ src_xsize = MS_MIN(MS_MAX(0,(int) (urx - llx + 0.5)), + GDALGetRasterXSize(hDS) - src_xoff); +- src_ysize = MIN(MAX(0,(int) (lly - ury + 0.5)), ++ src_ysize = MS_MIN(MS_MAX(0,(int) (lly - ury + 0.5)), + GDALGetRasterYSize(hDS) - src_yoff); + + /* We want very small windows to use at least one source pixel (#4172) */ + if( src_xsize == 0 && (urx - llx) > 0.0 ) { + src_xsize = 1; +- src_xoff = MIN(src_xoff,GDALGetRasterXSize(hDS)-1); ++ src_xoff = MS_MIN(src_xoff,GDALGetRasterXSize(hDS)-1); + } + if( src_ysize == 0 && (lly - ury) > 0.0 ) { + src_ysize = 1; +- src_yoff = MIN(src_yoff,GDALGetRasterYSize(hDS)-1); ++ src_yoff = MS_MIN(src_yoff,GDALGetRasterYSize(hDS)-1); + } + + if( src_xsize == 0 || src_ysize == 0 ) { +@@ -251,11 +251,11 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image, + + dst_lrx = (int) ((copyRect.maxx - mapRect.minx) / map->cellsize + 0.5); + dst_lry = (int) ((mapRect.maxy - copyRect.miny) / map->cellsize + 0.5); +- dst_lrx = MAX(0,MIN(image->width,dst_lrx)); +- dst_lry = MAX(0,MIN(image->height,dst_lry)); ++ dst_lrx = MS_MAX(0,MS_MIN(image->width,dst_lrx)); ++ dst_lry = MS_MAX(0,MS_MIN(image->height,dst_lry)); + +- dst_xsize = MAX(0,MIN(image->width,dst_lrx - dst_xoff)); +- dst_ysize = MAX(0,MIN(image->height,dst_lry - dst_yoff)); ++ dst_xsize = MS_MAX(0,MS_MIN(image->width,dst_lrx - dst_xoff)); ++ dst_ysize = MS_MAX(0,MS_MIN(image->height,dst_lry - dst_yoff)); + + if( dst_xsize == 0 || dst_ysize == 0 ) { + if( layer->debug ) +@@ -290,8 +290,8 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image, + else { + dst_xoff = src_xoff = 0; + dst_yoff = src_yoff = 0; +- dst_xsize = src_xsize = MIN(image->width,src_xsize); +- dst_ysize = src_ysize = MIN(image->height,src_ysize); ++ dst_xsize = src_xsize = MS_MIN(image->width,src_xsize); ++ dst_ysize = src_ysize = MS_MIN(image->height,src_ysize); + } + + /* +@@ -533,7 +533,7 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image, + return -1; + } + +- color_count = MIN(256,GDALGetColorEntryCount(hColorMap)); ++ color_count = MS_MIN(256,GDALGetColorEntryCount(hColorMap)); + for(i=0; i < color_count; i++) { + colorObj pixel; + int colormap_index; +@@ -598,7 +598,7 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image, + cmap_set = TRUE; + #endif + +- color_count = MIN(256,GDALGetColorEntryCount(hColorMap)); ++ color_count = MS_MIN(256,GDALGetColorEntryCount(hColorMap)); + + for(i=0; i < color_count; i++) { + GDALColorEntry sEntry; +@@ -889,8 +889,8 @@ static int ParseDefaultLUT( const char *lut_def, GByte *lut ) + lut_read++; + } + +- this_in = MAX(0,MIN(255,this_in)); +- this_out = MAX(0,MIN(255,this_out)); ++ this_in = MS_MAX(0,MS_MIN(255,this_in)); ++ this_out = MS_MAX(0,MS_MIN(255,this_out)); + + /* apply linear values from last in:out to this in:out */ + for( lut_i = last_in; lut_i <= this_in; lut_i++ ) { +@@ -1275,8 +1275,8 @@ LoadGDALImages( GDALDatasetH hDS, int band_numbers[4], int band_count, + bMinMaxSet = TRUE; + } + +- dfScaleMin = MIN(dfScaleMin,pafRawData[i]); +- dfScaleMax = MAX(dfScaleMax,pafRawData[i]); ++ dfScaleMin = MS_MIN(dfScaleMin,pafRawData[i]); ++ dfScaleMax = MS_MAX(dfScaleMax,pafRawData[i]); + } + + if( dfScaleMin == dfScaleMax ) +@@ -1768,8 +1768,8 @@ msDrawRasterLayerGDAL_16BitClassification( + fDataMin = fDataMax = pafRawData[i]; + bGotFirstValue = TRUE; + } else { +- fDataMin = MIN(fDataMin,pafRawData[i]); +- fDataMax = MAX(fDataMax,pafRawData[i]); ++ fDataMin = MS_MIN(fDataMin,pafRawData[i]); ++ fDataMax = MS_MAX(fDataMax,pafRawData[i]); + } + } + +@@ -2018,7 +2018,7 @@ int *msGetGDALBandList( layerObj *layer, void *hDS, + /* -------------------------------------------------------------------- */ + if( CSLFetchNameValue( layer->processing, "BANDS" ) == NULL ) { + if( max_bands > 0 ) +- *band_count = MIN(file_bands,max_bands); ++ *band_count = MS_MIN(file_bands,max_bands); + else + *band_count = file_bands; + +diff --git a/maprasterquery.c b/maprasterquery.c +index 80accfa..06f0ece 100644 +--- a/maprasterquery.c ++++ b/maprasterquery.c +@@ -330,11 +330,11 @@ static void msRasterQueryAddPixel( layerObj *layer, pointObj *location, + /* -------------------------------------------------------------------- */ + else { + if( rlinfo->band_count >= 3 ) { +- red = (int) MAX(0,MIN(255,values[0])); +- green = (int) MAX(0,MIN(255,values[1])); +- blue = (int) MAX(0,MIN(255,values[2])); ++ red = (int) MS_MAX(0,MS_MIN(255,values[0])); ++ green = (int) MS_MAX(0,MS_MIN(255,values[1])); ++ blue = (int) MS_MAX(0,MS_MIN(255,values[2])); + } else { +- red = green = blue = (int) MAX(0,MIN(255,values[0])); ++ red = green = blue = (int) MS_MAX(0,MS_MIN(255,values[0])); + } + } + +@@ -454,35 +454,35 @@ msRasterQueryByRectLow(mapObj *map, layerObj *layer, GDALDatasetH hDS, + /* top right */ + dfX = GEO_TRANS(adfInvGeoTransform , searchrect.maxx, searchrect.maxy); + dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.maxx, searchrect.maxy); +- dfXMin = MIN(dfXMin,dfX); +- dfXMax = MAX(dfXMax,dfX); +- dfYMin = MIN(dfYMin,dfY); +- dfYMax = MAX(dfYMax,dfY); ++ dfXMin = MS_MIN(dfXMin,dfX); ++ dfXMax = MS_MAX(dfXMax,dfX); ++ dfYMin = MS_MIN(dfYMin,dfY); ++ dfYMax = MS_MAX(dfYMax,dfY); + + /* bottom left */ + dfX = GEO_TRANS(adfInvGeoTransform , searchrect.minx, searchrect.miny); + dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.minx, searchrect.miny); +- dfXMin = MIN(dfXMin,dfX); +- dfXMax = MAX(dfXMax,dfX); +- dfYMin = MIN(dfYMin,dfY); +- dfYMax = MAX(dfYMax,dfY); ++ dfXMin = MS_MIN(dfXMin,dfX); ++ dfXMax = MS_MAX(dfXMax,dfX); ++ dfYMin = MS_MIN(dfYMin,dfY); ++ dfYMax = MS_MAX(dfYMax,dfY); + + /* bottom right */ + dfX = GEO_TRANS(adfInvGeoTransform , searchrect.maxx, searchrect.miny); + dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.maxx, searchrect.miny); +- dfXMin = MIN(dfXMin,dfX); +- dfXMax = MAX(dfXMax,dfX); +- dfYMin = MIN(dfYMin,dfY); +- dfYMax = MAX(dfYMax,dfY); ++ dfXMin = MS_MIN(dfXMin,dfX); ++ dfXMax = MS_MAX(dfXMax,dfX); ++ dfYMin = MS_MIN(dfYMin,dfY); ++ dfYMax = MS_MAX(dfYMax,dfY); + + /* -------------------------------------------------------------------- */ + /* Trim the rectangle to the area of the file itself, but out */ + /* to the edges of the touched edge pixels. */ + /* -------------------------------------------------------------------- */ +- dfXMin = MAX(0.0,MIN(nRXSize,floor(dfXMin))); +- dfYMin = MAX(0.0,MIN(nRYSize,floor(dfYMin))); +- dfXMax = MAX(0.0,MIN(nRXSize,ceil(dfXMax))); +- dfYMax = MAX(0.0,MIN(nRYSize,ceil(dfYMax))); ++ dfXMin = MS_MAX(0.0,MS_MIN(nRXSize,floor(dfXMin))); ++ dfYMin = MS_MAX(0.0,MS_MIN(nRYSize,floor(dfYMin))); ++ dfXMax = MS_MAX(0.0,MS_MIN(nRXSize,ceil(dfXMax))); ++ dfYMax = MS_MAX(0.0,MS_MIN(nRYSize,ceil(dfYMax))); + + /* -------------------------------------------------------------------- */ + /* Convert to integer offset/size values. */ +diff --git a/mapresample.c b/mapresample.c +index 26b253e..532b6a8 100644 +--- a/mapresample.c ++++ b/mapresample.c +@@ -34,8 +34,8 @@ + + + #ifndef MAX +-# define MIN(a,b) ((a<b) ? a : b) +-# define MAX(a,b) ((a>b) ? a : b) ++# define MS_MIN(a,b) ((a<b) ? a : b) ++# define MS_MAX(a,b) ((a>b) ? a : b) + #endif + + #define SKIP_MASK(x,y) (mask_rb && !*(mask_rb->data.rgba.a+(y)*mask_rb->data.rgba.row_step+(x)*mask_rb->data.rgba.pixel_step)) +@@ -319,7 +319,7 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb, + int nSrcYSize = psSrcImage->height; + int nFailedPoints = 0, nSetPoints = 0; + double *padfPixelSum; +- int bandCount = MAX(4,psSrcImage->format->bands); ++ int bandCount = MS_MAX(4,psSrcImage->format->bands); + + padfPixelSum = (double *) msSmallMalloc(sizeof(double) * bandCount); + +@@ -369,10 +369,10 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb, + continue; + + /* Trim in stuff one pixel off the edge */ +- nSrcX = MAX(nSrcX,0); +- nSrcY = MAX(nSrcY,0); +- nSrcX2 = MIN(nSrcX2,nSrcXSize-1); +- nSrcY2 = MIN(nSrcY2,nSrcYSize-1); ++ nSrcX = MS_MAX(nSrcX,0); ++ nSrcY = MS_MAX(nSrcY,0); ++ nSrcX2 = MS_MIN(nSrcX2,nSrcXSize-1); ++ nSrcY2 = MS_MIN(nSrcY2,nSrcYSize-1); + + memset( padfPixelSum, 0, sizeof(double) * bandCount); + +@@ -407,10 +407,10 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb, + int dst_rb_off = nDstX * dst_rb->data.rgba.pixel_step + nDstY * dst_rb->data.rgba.row_step; + unsigned char red, green, blue, alpha; + +- red = (unsigned char) MAX(0,MIN(255,padfPixelSum[0])); +- green = (unsigned char) MAX(0,MIN(255,padfPixelSum[1])); +- blue = (unsigned char) MAX(0,MIN(255,padfPixelSum[2])); +- alpha = (unsigned char)MAX(0,MIN(255,255.5*dfWeightSum)); ++ red = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[0])); ++ green = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[1])); ++ blue = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[2])); ++ alpha = (unsigned char)MS_MAX(0,MS_MIN(255,255.5*dfWeightSum)); + + msAlphaBlendPM( red, green, blue, alpha, + dst_rb->data.rgba.r + dst_rb_off, +@@ -436,7 +436,7 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb, + = (float) padfPixelSum[band]; + } else if( psSrcImage->format->imagemode == MS_IMAGEMODE_BYTE ) { + psDstImage->img.raw_byte[dst_off] +- = (unsigned char)MAX(0,MIN(255,padfPixelSum[band])); ++ = (unsigned char)MS_MAX(0,MS_MIN(255,padfPixelSum[band])); + } + + dst_off += psDstImage->width*psDstImage->height; +@@ -489,14 +489,14 @@ msAverageSample( imageObj *psSrcImage, rasterBufferObj *src_rb, + for( iY = nYMin; iY < nYMax; iY++ ) { + double dfYCellMin, dfYCellMax; + +- dfYCellMin = MAX(iY,dfYMin); +- dfYCellMax = MIN(iY+1,dfYMax); ++ dfYCellMin = MS_MAX(iY,dfYMin); ++ dfYCellMax = MS_MIN(iY+1,dfYMax); + + for( iX = nXMin; iX < nXMax; iX++ ) { + double dfXCellMin, dfXCellMax, dfWeight; + +- dfXCellMin = MAX(iX,dfXMin); +- dfXCellMax = MIN(iX+1,dfXMax); ++ dfXCellMin = MS_MAX(iX,dfXMin); ++ dfXCellMax = MS_MIN(iX+1,dfXMax); + + dfWeight = (dfXCellMax-dfXCellMin) * (dfYCellMax-dfYCellMin); + +@@ -537,7 +537,7 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb, + int nFailedPoints = 0, nSetPoints = 0; + double *padfPixelSum; + +- int bandCount = MAX(4,psSrcImage->format->bands); ++ int bandCount = MS_MAX(4,psSrcImage->format->bands); + + padfPixelSum = (double *) msSmallMalloc(sizeof(double) * bandCount); + +@@ -573,19 +573,19 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb, + continue; + } + +- dfXMin = MIN(MIN(x1[nDstX],x1[nDstX+1]), +- MIN(x2[nDstX],x2[nDstX+1])); +- dfYMin = MIN(MIN(y1[nDstX],y1[nDstX+1]), +- MIN(y2[nDstX],y2[nDstX+1])); +- dfXMax = MAX(MAX(x1[nDstX],x1[nDstX+1]), +- MAX(x2[nDstX],x2[nDstX+1])); +- dfYMax = MAX(MAX(y1[nDstX],y1[nDstX+1]), +- MAX(y2[nDstX],y2[nDstX+1])); ++ dfXMin = MS_MIN(MS_MIN(x1[nDstX],x1[nDstX+1]), ++ MS_MIN(x2[nDstX],x2[nDstX+1])); ++ dfYMin = MS_MIN(MS_MIN(y1[nDstX],y1[nDstX+1]), ++ MS_MIN(y2[nDstX],y2[nDstX+1])); ++ dfXMax = MS_MAX(MS_MAX(x1[nDstX],x1[nDstX+1]), ++ MS_MAX(x2[nDstX],x2[nDstX+1])); ++ dfYMax = MS_MAX(MS_MAX(y1[nDstX],y1[nDstX+1]), ++ MS_MAX(y2[nDstX],y2[nDstX+1])); + +- dfXMin = MIN(MAX(dfXMin,0),psSrcImage->width+1); +- dfYMin = MIN(MAX(dfYMin,0),psSrcImage->height+1); +- dfXMax = MIN(MAX(-1,dfXMax),psSrcImage->width); +- dfYMax = MIN(MAX(-1,dfYMax),psSrcImage->height); ++ dfXMin = MS_MIN(MS_MAX(dfXMin,0),psSrcImage->width+1); ++ dfYMin = MS_MIN(MS_MAX(dfYMin,0),psSrcImage->height+1); ++ dfXMax = MS_MIN(MS_MAX(-1,dfXMax),psSrcImage->width); ++ dfYMax = MS_MIN(MS_MAX(-1,dfYMax),psSrcImage->height); + + memset( padfPixelSum, 0, sizeof(double)*bandCount ); + +@@ -605,13 +605,13 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb, + unsigned char red, green, blue, alpha; + + red = (unsigned char) +- MAX(0,MIN(255,padfPixelSum[0]+0.5)); ++ MS_MAX(0,MS_MIN(255,padfPixelSum[0]+0.5)); + green = (unsigned char) +- MAX(0,MIN(255,padfPixelSum[1]+0.5)); ++ MS_MAX(0,MS_MIN(255,padfPixelSum[1]+0.5)); + blue = (unsigned char) +- MAX(0,MIN(255,padfPixelSum[2]+0.5)); ++ MS_MAX(0,MS_MIN(255,padfPixelSum[2]+0.5)); + alpha = (unsigned char) +- MAX(0,MIN(255,255*dfAlpha01+0.5)); ++ MS_MAX(0,MS_MIN(255,255*dfAlpha01+0.5)); + + RB_MIX_PIXEL(dst_rb,nDstX,nDstY, + red, green, blue, alpha ); +@@ -1121,10 +1121,10 @@ static int msTransformMapToSource( int nDstXSize, int nDstYSize, + psSrcExtent->miny = psSrcExtent->maxy = y_out; + bOutInit = 1; + } else { +- psSrcExtent->minx = MIN(psSrcExtent->minx, x_out); +- psSrcExtent->maxx = MAX(psSrcExtent->maxx, x_out); +- psSrcExtent->miny = MIN(psSrcExtent->miny, y_out); +- psSrcExtent->maxy = MAX(psSrcExtent->maxy, y_out); ++ psSrcExtent->minx = MS_MIN(psSrcExtent->minx, x_out); ++ psSrcExtent->maxx = MS_MAX(psSrcExtent->maxx, x_out); ++ psSrcExtent->miny = MS_MIN(psSrcExtent->miny, y_out); ++ psSrcExtent->maxy = MS_MAX(psSrcExtent->maxy, y_out); + } + } + +@@ -1141,10 +1141,10 @@ static int msTransformMapToSource( int nDstXSize, int nDstYSize, + int nGrowAmountY = (int) + (psSrcExtent->maxy - psSrcExtent->miny)/EDGE_STEPS + 1; + +- psSrcExtent->minx = MAX(psSrcExtent->minx - nGrowAmountX,0); +- psSrcExtent->miny = MAX(psSrcExtent->miny - nGrowAmountY,0); +- psSrcExtent->maxx = MIN(psSrcExtent->maxx + nGrowAmountX,nSrcXSize); +- psSrcExtent->maxy = MIN(psSrcExtent->maxy + nGrowAmountY,nSrcYSize); ++ psSrcExtent->minx = MS_MAX(psSrcExtent->minx - nGrowAmountX,0); ++ psSrcExtent->miny = MS_MAX(psSrcExtent->miny - nGrowAmountY,0); ++ psSrcExtent->maxx = MS_MIN(psSrcExtent->maxx + nGrowAmountX,nSrcXSize); ++ psSrcExtent->maxy = MS_MIN(psSrcExtent->maxy + nGrowAmountY,nSrcYSize); + } + + return MS_TRUE; +@@ -1342,10 +1342,10 @@ int msResampleGDALToMap( mapObj *map, layerObj *layer, imageObj *image, + sSrcExtent.maxy = ceil (sSrcExtent.maxy+1.0); + } + +- sSrcExtent.minx = MAX(0,sSrcExtent.minx); +- sSrcExtent.maxx = MIN(sSrcExtent.maxx, nSrcXSize ); +- sSrcExtent.miny = MAX(sSrcExtent.miny, 0 ); +- sSrcExtent.maxy = MIN(sSrcExtent.maxy, nSrcYSize ); ++ sSrcExtent.minx = MS_MAX(0,sSrcExtent.minx); ++ sSrcExtent.maxx = MS_MIN(sSrcExtent.maxx, nSrcXSize ); ++ sSrcExtent.miny = MS_MAX(sSrcExtent.miny, 0 ); ++ sSrcExtent.maxy = MS_MIN(sSrcExtent.maxy, nSrcYSize ); + + if( sSrcExtent.maxx <= sSrcExtent.minx + || sSrcExtent.maxy <= sSrcExtent.miny ) { +@@ -1383,9 +1383,9 @@ int msResampleGDALToMap( mapObj *map, layerObj *layer, imageObj *image, + else + sDummyMap.cellsize = dfNominalCellSize; + +- nLoadImgXSize = MAX(1, (int) (sSrcExtent.maxx - sSrcExtent.minx) ++ nLoadImgXSize = MS_MAX(1, (int) (sSrcExtent.maxx - sSrcExtent.minx) + * (dfNominalCellSize / sDummyMap.cellsize)); +- nLoadImgYSize = MAX(1, (int) (sSrcExtent.maxy - sSrcExtent.miny) ++ nLoadImgYSize = MS_MAX(1, (int) (sSrcExtent.maxy - sSrcExtent.miny) + * (dfNominalCellSize / sDummyMap.cellsize)); + + /* +diff --git a/mapstring.c b/mapstring.c +index ea5b67f..82ee82a 100644 +--- a/mapstring.c ++++ b/mapstring.c +@@ -135,7 +135,7 @@ char *strrstr(char *string, char *find) + * Appends src to string dst of size siz (unlike strncat, siz is the + * full size of dst, not space left). At most siz-1 characters + * will be copied. Always NUL terminates (unless siz <= strlen(dst)). +- * Returns strlen(src) + MIN(siz, strlen(initial dst)). ++ * Returns strlen(src) + MS_MIN(siz, strlen(initial dst)). + * If retval >= siz, truncation occurred. + */ + size_t strlcat(char *dst, const char *src, size_t siz) +diff --git a/mapwcs20.c b/mapwcs20.c +index 347e9b7..266a07d 100644 +--- a/mapwcs20.c ++++ b/mapwcs20.c +@@ -4189,8 +4189,8 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p + + (orig_bbox.maxx+1) * cm.geotransform[1] + + (orig_bbox.maxy+1) * cm.geotransform[2]; + +- subsets.minx = MIN(x_1, x_2); +- subsets.maxx = MAX(x_1, x_2); ++ subsets.minx = MS_MIN(x_1, x_2); ++ subsets.maxx = MS_MAX(x_1, x_2); + } + if(subsets.miny != -DBL_MAX || subsets.maxy != DBL_MAX) { + y_1 = cm.geotransform[3] +@@ -4201,8 +4201,8 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p + + orig_bbox.minx * cm.geotransform[4] + + orig_bbox.miny * cm.geotransform[5]; + +- subsets.miny = MIN(y_1, y_2); +- subsets.maxy = MAX(y_1, y_2); ++ subsets.miny = MS_MIN(y_1, y_2); ++ subsets.maxy = MS_MAX(y_1, y_2); + } + } else { /* if crs is not the 'imageCRS' */ + projectionObj subsetProj; +@@ -4241,10 +4241,10 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p + } + + /* write combined bounding box */ +- bbox.minx = MAX(subsets.minx, map->extent.minx); +- bbox.miny = MAX(subsets.miny, map->extent.miny); +- bbox.maxx = MIN(subsets.maxx, map->extent.maxx); +- bbox.maxy = MIN(subsets.maxy, map->extent.maxy); ++ bbox.minx = MS_MAX(subsets.minx, map->extent.minx); ++ bbox.miny = MS_MAX(subsets.miny, map->extent.miny); ++ bbox.maxx = MS_MIN(subsets.maxx, map->extent.maxx); ++ bbox.maxy = MS_MIN(subsets.maxy, map->extent.maxy); + + /* check if we are overspecified */ + if ((params->width != 0 && params->resolutionX != MS_WCS20_UNBOUNDED) +@@ -4620,10 +4620,10 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p + tmpCm.xresolution = map->gt.geotransform[1]; + tmpCm.yresolution = map->gt.geotransform[5]; + +- tmpCm.extent.minx = MIN(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution); +- tmpCm.extent.miny = MIN(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution); +- tmpCm.extent.maxx = MAX(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution); +- tmpCm.extent.maxy = MAX(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution); ++ tmpCm.extent.minx = MS_MIN(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution); ++ tmpCm.extent.miny = MS_MIN(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution); ++ tmpCm.extent.maxx = MS_MAX(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution); ++ tmpCm.extent.maxy = MS_MAX(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution); + + swapAxes = msWCSSwapAxes20(srs_uri); + msFree(srs_uri); +diff --git a/mapwmslayer.c b/mapwmslayer.c +index 42a44f1..3e4747d 100644 +--- a/mapwmslayer.c ++++ b/mapwmslayer.c +@@ -698,7 +698,7 @@ msBuildWMSLayerURL(mapObj *map, layerObj *lp, int nRequestType, + else { + double cellsize_x = (bbox.maxx-bbox.minx) / bbox_width; + double cellsize_y = (bbox.maxy-bbox.miny) / bbox_height; +- double cellsize = MIN(cellsize_x,cellsize_y); ++ double cellsize = MS_MIN(cellsize_x,cellsize_y); + + msRectIntersect( &bbox, &layer_rect ); + diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch new file mode 100644 index 000000000000..088e37b14c86 --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch @@ -0,0 +1,56 @@ +From ab2a6129435ca37d02730a6faf85593afa0daf9b Mon Sep 17 00:00:00 2001 +From: Thomas Bonfort <thomas.bonfort@gmail.com> +Date: Mon, 16 Nov 2015 16:56:02 +0100 +Subject: [PATCH] Fix build issues with OGR disabled + +--- + mapimageio.c | 2 +- + mapogcfilter.c | 1 + + mapogr.cpp | 2 ++ + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/mapimageio.c b/mapimageio.c +index 771188b..95feda2 100644 +--- a/mapimageio.c ++++ b/mapimageio.c +@@ -210,7 +210,7 @@ int saveAsJPEG(mapObj *map, rasterBufferObj *rb, streamInfo *info, + /* If the user doesn't provide a value for JPEGMEM, we want to be sure */ + /* that at least the image size will be used before creating the temporary file */ + cinfo.mem->max_memory_to_use = +- MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height); ++ MS_MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height); + } + } + +diff --git a/mapogcfilter.c b/mapogcfilter.c +index 50e2e7b..05f017a 100644 +--- a/mapogcfilter.c ++++ b/mapogcfilter.c +@@ -40,6 +40,7 @@ + #include "mapowscommon.h" + #include "maptime.h" + #include "mapows.h" ++#include <ctype.h> + + static int FLTHasUniqueTopLevelDuringFilter(FilterEncodingNode *psFilterNode); + +diff --git a/mapogr.cpp b/mapogr.cpp +index 07acdba..80f032b 100644 +--- a/mapogr.cpp ++++ b/mapogr.cpp +@@ -1318,6 +1318,7 @@ static int msOGRFileClose(layerObj *layer, msOGRFileInfo *psInfo ) + + return MS_SUCCESS; + } ++#endif /* USE_OGR */ + + /************************************************************************/ + /* msOGREscapeSQLParam */ +@@ -1345,6 +1346,7 @@ static char *msOGREscapeSQLParam(layerObj *layer, const char *pszString) + #endif /* USE_OGR */ + } + ++#ifdef USE_OGR + /********************************************************************** + * msOGRTranslateMsExpressionToOGRSQL() + * diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch new file mode 100644 index 000000000000..1fa7710de0bc --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch @@ -0,0 +1,35 @@ +From 0101157d4edd5d837d17356c66c7d25af7e020ac Mon Sep 17 00:00:00 2001 +From: Sander Jansen <s.jansen@gmail.com> +Date: Wed, 19 Aug 2015 16:51:13 -0500 +Subject: [PATCH] Fix compilation with gif_lib 5.1 + +--- + mapimageio.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/mapimageio.c b/mapimageio.c +index e6bdcb5..5eed924 100644 +--- a/mapimageio.c ++++ b/mapimageio.c +@@ -1058,6 +1058,13 @@ int readGIF(char *path, rasterBufferObj *rb) + + } while (recordType != TERMINATE_RECORD_TYPE); + ++ ++#if defined GIFLIB_MAJOR && GIFLIB_MINOR && ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || (GIFLIB_MAJOR > 5)) ++ if (DGifCloseFile(image, &errcode) == GIF_ERROR) { ++ msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(errcode)); ++ return MS_FAILURE; ++ } ++#else + if (DGifCloseFile(image) == GIF_ERROR) { + #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5 + msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error)); +@@ -1066,6 +1073,7 @@ int readGIF(char *path, rasterBufferObj *rb) + #endif + return MS_FAILURE; + } ++#endif + + return MS_SUCCESS; + } diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch new file mode 100644 index 000000000000..5625746e2dcb --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch @@ -0,0 +1,20 @@ +diff --git a/mapwcs20.c b/mapwcs20.c +index ac2fb89..9560a25 100755 +--- a/mapwcs20.c ++++ b/mapwcs20.c +@@ -700,6 +700,7 @@ static int msWCSParseScaleExtentString20(char *string, char *outAxis, + return MS_SUCCESS; + } + ++#if defined(USE_LIBXML2) + /* + Utility function to get the first child of a node with a given node name + */ +@@ -739,6 +740,7 @@ xmlNodePtr msLibXml2GetFirstChildNs(xmlNodePtr parent, const char *name, xmlNsPt + } + return NULL; + } ++#endif /* defined(USE_LIBXML2) */ + + /************************************************************************/ + /* msWCSParseRequest20_XMLGetCapabilities() */ diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch new file mode 100644 index 000000000000..f438bec9f125 --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch @@ -0,0 +1,34 @@ +diff --git a/mapwfs11.c b/mapwfs11.c +index 20ab164..4dc15fc 100755 +--- a/mapwfs11.c ++++ b/mapwfs11.c +@@ -29,12 +29,12 @@ + + #include "mapserver.h" + #include "mapows.h" ++#include "mapowscommon.h" + + + + #if defined(USE_WFS_SVR) && defined(USE_LIBXML2) + #include "maplibxml2.h" +-#include "mapowscommon.h" + #include "mapogcfilter.h" + + /************************************************************************/ +diff --git a/mapwfs20.c b/mapwfs20.c +index 710d444..cf69ee3 100755 +--- a/mapwfs20.c ++++ b/mapwfs20.c +@@ -29,10 +29,10 @@ + + #include "mapserver.h" + #include "mapows.h" ++#include "mapowscommon.h" + + #if defined(USE_WFS_SVR) && defined(USE_LIBXML2) + #include "maplibxml2.h" +-#include "mapowscommon.h" + #include "mapogcfilter.h" + + #define MS_OWS_11_NAMESPACE_PREFIX MS_OWSCOMMON_OWS_NAMESPACE_PREFIX diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch new file mode 100644 index 000000000000..17016c66e67c --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch @@ -0,0 +1,13 @@ +diff --git a/apache/mod_mapserver.c b/apache/mod_mapserver.c +index 7949ddf..c8dbde6 100644 +--- a/apache/mod_mapserver.c ++++ b/apache/mod_mapserver.c +@@ -40,7 +40,7 @@ static int + msIO_apacheError (void *cbData, void *data, int byteCount) + { + /* error reporting is done through the log file... */ +- ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, (char*) data); ++ ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "%s", (char*) data); + return strlen ((char*) data); + } + diff --git a/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1 b/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1 deleted file mode 100644 index 845cad6e3bd1..000000000000 --- a/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1 +++ /dev/null @@ -1,44 +0,0 @@ ---- mapscript/tcl/Makefile.in.orig 2001-10-26 00:56:39.000000000 +0200 -+++ mapscript/tcl/Makefile.in 2008-02-04 11:04:22.000000000 +0100 -@@ -25,7 +25,7 @@ - TCL_LIBS = @TCL_LIBS@ - LIBS = @TCL_LIBS@ - TCL_DBGX = @TCL_DBGX@ --LIB_RUNTIME_DIR = @TCL_EXEC_PREFIX@/lib:@TCL_EXEC_PREFIX@/lib/$(PACKAGEDIR):@TCL_PREFIX@/lib:@MAPSERVERHOME@ -+LIB_RUNTIME_DIR = @TCL_EXEC_PREFIX@/@libdir@:@TCL_EXEC_PREFIX@/@libdir@/$(PACKAGEDIR):@TCL_PREFIX@/@libdir@:@MAPSERVERHOME@ - - MAPSERVERHOME = @MAPSERVERHOME@ - MAPSERVERDEFS = @MAPSERVERDEFS@ -@@ -69,14 +69,14 @@ - $(DLTARGET)$(TCL_SHLIB_SUFFIX): mapscript_wrap.o - - install: $(DLTARGET)$(TCL_SHLIB_SUFFIX) -- -mkdir $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) -- cp $(DLTARGET)$(TCL_SHLIB_SUFFIX) $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) -+ -mkdir $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) -+ cp $(DLTARGET)$(TCL_SHLIB_SUFFIX) $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) - chmod +x \ -- $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)/$(DLTARGET)$(TCL_SHLIB_SUFFIX) -- cp pkgIndex.tcl $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) -- cp mapscriptsupp.tcl $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) -- cp mapscriptsupp.html $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) -- cp mapscript_wrap.html $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) -+ $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)/$(DLTARGET)$(TCL_SHLIB_SUFFIX) -+ cp pkgIndex.tcl $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) -+ cp mapscriptsupp.tcl $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) -+ cp mapscriptsupp.html $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) -+ cp mapscript_wrap.html $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) - - - useprebuilt: ---- mapscript/mapscript.i 2005-11-22 22:44:48.000000000 +0100 -+++ mapscript/mapscript.i 2006-04-12 23:47:23.000000000 +0200 -@@ -206,7 +206,7 @@ - - /* Tcl */ - #ifdef SWIGTCL8 --%include "tclmodule.i" -+/* %include "tclmodule.i" */ - #endif /* SWIGTCL8 */ - - /* diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild deleted file mode 100644 index 6766c1d2e838..000000000000 --- a/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P="${PN}-${PV/_/-}" - -PHP_EXT_OPTIONAL_USE="php" -PHP_EXT_NAME="php_mapscript" -PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/" -PHP_EXT_SKIP_PHPIZE="no" -USE_PHP="php5-4 php5-5" - -PYTHON_DEPEND="python? 2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" -PYTHON_MODNAME="mapscript.py" - -#USE_RUBY="ruby18 ruby19" -#RUBY_OPTIONAL="yes" - -WEBAPP_MANUAL_SLOT=yes - -inherit eutils autotools depend.apache webapp distutils perl-module php-ext-source-r2 multilib # ruby-ng - -DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications" -HOMEPAGE="http://mapserver.org/" -SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl - -REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )" - -RDEPEND=" - !${CATEGORY}/${PN}:${PV} - dev-libs/expat - dev-libs/fcgi - >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] - media-libs/giflib - net-misc/curl - virtual/jpeg - virtual/libiconv - x11-libs/agg - bidi? ( dev-libs/fribidi ) - cairo? ( x11-libs/cairo ) - gdal? ( >=sci-libs/gdal-1.8.0 ) - geos? ( sci-libs/geos ) - mysql? ( virtual/mysql ) - opengl? ( - media-libs/ftgl - media-libs/mesa - ) - perl? ( dev-lang/perl:= ) - postgis? ( dev-db/postgis ) - proj? ( sci-libs/proj net-misc/curl ) - tiff? ( - media-libs/tiff - sci-libs/libgeotiff - ) - xml? ( dev-libs/libxml2:2 ) - xslt? ( dev-libs/libxslt[crypt] ) -" -for i in perl python; do - SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )" -done -DEPEND="${RDEPEND} ${SWIG_DEPEND}" -unset SWIG_DEPEND -unset i - -need_apache2 - -S=${WORKDIR}/${MY_P} - -_enter_build_dir() { - [[ -z ${1} ]] && die "Missing path argument" - local workdir=${1} - shift - [[ -z ${1} ]] && die "missing command argument" - - echo ">>> Running \"${@}\" in work directory \"${workdir}\"" - pushd "${workdir}" > /dev/null || die "Failed to enter directory" - ${@} || die - popd > /dev/null -} - -each_ruby_configure() { ${RUBY} extconf.rb || die ; } - -ext-source-r2_src_install() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - insinto "${EXT_DIR}" - newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension" - done - php-ext-source-r2_createinifiles -} - -pkg_setup() { - webapp_pkg_setup - use perl && perl_set_version - use python && python_pkg_setup - #use ruby && ruby-ng_pkg_setup -} - -src_unpack() { - # unpack A and then copy the php thingies into workdir/php-slot - php-ext-source-r2_src_unpack - # HACK: and then remove it and replace by symlink - for slot in $(php_get_slots); do - rm -rf "${WORKDIR}/${slot}" || die - ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die - done -} - -src_prepare() { - epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \ - "${FILESDIR}/6.0.0_rc1-bool.patch" \ - "${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \ - "${FILESDIR}/6.1.0-php-5.4.patch" - - eautoreconf -} - -src_configure() { - local myopts - - if use gdal && use proj ; then - myopts+=" - --with-wfs - --with-wcs - --with-wfsclient - --with-wmsclient - " - use xml && myopts+=" --with-sos" - fi - - # some scripts require configure time options so place it here - if use php ; then - use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/" - use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/" - fi - - # sde is ESRI package that you have to buy first - # oraclespatial needs oracle server for testing/usage - # note that some options accept just path, they are not on/off switches! - econf \ - --without-oraclespatial \ - --without-sde \ - --with-libiconv \ - --with-jpeg \ - --with-gd \ - --with-gif="${EPREFIX}/usr/" \ - --with-wms \ - --with-kml \ - --with-curl-config \ - --with-agg-svg-symbols \ - --with-httpd="${APACHE_BIN}" \ - --with-fastcgi \ - $(use_with opengl ogl) \ - $(use_with opengl ftgl) \ - $(use_with proj) \ - $(use_with threads) \ - $(use_with geos) \ - $(use_with gdal) \ - $(use_with gdal ogr) \ - $(use_with postgis) \ - $(use_with mysql) \ - $(use_with xml xml2-config) \ - $(use_with xslt) \ - $(use_with xslt xml-mapfile) \ - $(use_with bidi fribidi-config) \ - $(use_with cairo) \ - ${myopts} - - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./" - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure" -} - -src_compile() { - default - use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_compile" - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep" - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile" - #use php && php-ext-source-r2_src_compile # already compiled by the emake all - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile" -} - -src_install() { - local step="Installing" - local extra_dir="fonts tests tests/vera symbols" - local i - - dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \ - sortshp tile4ms msencrypt mapserver-config - - dodoc INSTALL README HISTORY.TXT - - for i in ${extra_dir}; do - docinto /usr/share/doc/${PF}/${i} - dodoc -r ${i}/* || die - done - - use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_install" - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install" - use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod" - use php && ext-source-r2_src_install - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install" - - webapp_src_preinst - exeinto "${MY_CGIBINDIR}" - doexe "${S}/mapserv" - webapp_src_install -} - -pkg_preinst() { - use perl && perl_set_version -} - -pkg_postinst() { - webapp_pkg_postinst - use python && distutils_pkg_postinst -} - -pkg_prerm() { - webapp_pkg_prerm -} - -pkg_postrm() { - use python && distutils_pkg_postrm -} diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild deleted file mode 100644 index 5e981d3c3ea5..000000000000 --- a/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P="${PN}-${PV/_/-}" - -PHP_EXT_OPTIONAL_USE="php" -PHP_EXT_NAME="php_mapscript" -PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/" -PHP_EXT_SKIP_PHPIZE="no" -USE_PHP="php5-4 php5-5" - -PYTHON_COMPAT=( python2_7 ) - -#USE_RUBY="ruby18 ruby19" -#RUBY_OPTIONAL="yes" - -WEBAPP_MANUAL_SLOT=yes - -inherit eutils autotools depend.apache webapp distutils-r1 perl-module php-ext-source-r2 multilib # ruby-ng - -DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications" -HOMEPAGE="http://mapserver.org/" -SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl - -REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )" - -RDEPEND=" - !${CATEGORY}/${PN}:${PV} - dev-libs/expat - dev-libs/fcgi - >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] - media-libs/giflib - net-misc/curl - virtual/jpeg:= - virtual/libiconv - x11-libs/agg - bidi? ( dev-libs/fribidi ) - cairo? ( x11-libs/cairo ) - gdal? ( >=sci-libs/gdal-1.8.0 ) - geos? ( sci-libs/geos ) - mysql? ( virtual/mysql ) - opengl? ( - media-libs/ftgl - media-libs/mesa - ) - perl? ( dev-lang/perl:= ) - postgis? ( dev-db/postgis ) - proj? ( sci-libs/proj net-misc/curl ) - tiff? ( - media-libs/tiff:= - sci-libs/libgeotiff - ) - xml? ( dev-libs/libxml2:2 ) - xslt? ( dev-libs/libxslt[crypt] ) -" -for i in perl python; do - SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )" -done -DEPEND="${RDEPEND} ${SWIG_DEPEND}" -unset SWIG_DEPEND -unset i - -need_apache2 - -S=${WORKDIR}/${MY_P} - -_enter_build_dir() { - [[ -z ${1} ]] && die "Missing path argument" - local workdir=${1} - shift - [[ -z ${1} ]] && die "missing command argument" - - echo ">>> Running \"${@}\" in work directory \"${workdir}\"" - pushd "${workdir}" > /dev/null || die "Failed to enter directory" - ${@} || die - popd > /dev/null -} - -each_ruby_configure() { ${RUBY} extconf.rb || die ; } - -ext-source-r2_src_install() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - insinto "${EXT_DIR}" - newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension" - done - php-ext-source-r2_createinifiles -} - -pkg_setup() { - webapp_pkg_setup - use perl && perl_set_version - #use ruby && ruby-ng_pkg_setup -} - -src_unpack() { - # unpack A and then copy the php thingies into workdir/php-slot - php-ext-source-r2_src_unpack - # HACK: and then remove it and replace by symlink - for slot in $(php_get_slots); do - rm -rf "${WORKDIR}/${slot}" || die - ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die - done -} - -src_prepare() { - epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \ - "${FILESDIR}/6.0.0_rc1-bool.patch" \ - "${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \ - "${FILESDIR}/6.1.0-php-5.4.patch" - - eautoreconf -} - -src_configure() { - local myopts - - if use gdal && use proj ; then - myopts+=" - --with-wfs - --with-wcs - --with-wfsclient - --with-wmsclient - " - use xml && myopts+=" --with-sos" - fi - - # some scripts require configure time options so place it here - if use php ; then - use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/" - use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/" - fi - - # sde is ESRI package that you have to buy first - # oraclespatial needs oracle server for testing/usage - # note that some options accept just path, they are not on/off switches! - econf \ - --without-oraclespatial \ - --without-sde \ - --with-libiconv \ - --with-jpeg \ - --with-gd \ - --with-gif="${EPREFIX}/usr/" \ - --with-wms \ - --with-kml \ - --with-curl-config \ - --with-agg-svg-symbols \ - --with-httpd="${APACHE_BIN}" \ - --with-fastcgi \ - $(use_with opengl ogl) \ - $(use_with opengl ftgl) \ - $(use_with proj) \ - $(use_with threads) \ - $(use_with geos) \ - $(use_with gdal) \ - $(use_with gdal ogr) \ - $(use_with postgis) \ - $(use_with mysql) \ - $(use_with xml xml2-config) \ - $(use_with xslt) \ - $(use_with xslt xml-mapfile) \ - $(use_with bidi fribidi-config) \ - $(use_with cairo) \ - ${myopts} - - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./" - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure" -} - -src_compile() { - default - use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_compile" - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep" - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile" - #use php && php-ext-source-r2_src_compile # already compiled by the emake all - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile" -} - -src_install() { - local step="Installing" - local extra_dir="fonts tests tests/vera symbols" - local i - - dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \ - sortshp tile4ms msencrypt mapserver-config - - dodoc INSTALL README HISTORY.TXT - - for i in ${extra_dir}; do - docinto /usr/share/doc/${PF}/${i} - dodoc -r ${i}/* || die - done - - use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_install" - use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install" - use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod" - use php && ext-source-r2_src_install - #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install" - - webapp_src_preinst - exeinto "${MY_CGIBINDIR}" - doexe "${S}/mapserv" - webapp_src_install -} - -pkg_preinst() { - use perl && perl_set_version -} - -pkg_prerm() { - webapp_pkg_prerm -} diff --git a/sci-geosciences/mapserver/mapserver-7.0.0.ebuild b/sci-geosciences/mapserver/mapserver-7.0.0.ebuild new file mode 100644 index 000000000000..da2eb5d950e3 --- /dev/null +++ b/sci-geosciences/mapserver/mapserver-7.0.0.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MY_P="${PN}-${PV/_/-}" + +PHP_EXT_OPTIONAL_USE="php" +PHP_EXT_NAME="php_mapscript" +PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/" +PHP_EXT_SKIP_PHPIZE="no" +USE_PHP="php5-4 php5-5" + +PYTHON_COMPAT=( python2_7 ) + +#USE_RUBY="ruby18 ruby19" +#RUBY_OPTIONAL="yes" + +WEBAPP_MANUAL_SLOT=yes + +inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng + +DESCRIPTION="Development environment for building spatially enabled webapps" +HOMEPAGE="http://mapserver.org/" +SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl + +REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) ) + xslt? ( xml )" + +RDEPEND=" + dev-libs/expat + dev-libs/fcgi + >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] + media-libs/giflib + net-misc/curl + virtual/jpeg:= + virtual/libiconv + x11-libs/agg + bidi? ( dev-libs/fribidi + media-libs/harfbuzz ) + cairo? ( x11-libs/cairo ) + gdal? ( >=sci-libs/gdal-1.8.0 ) + geos? ( sci-libs/geos ) + mysql? ( virtual/mysql ) + opengl? ( + media-libs/ftgl + media-libs/mesa + ) + perl? ( dev-lang/perl:= ) + postgis? ( dev-db/postgis ) + proj? ( sci-libs/proj net-misc/curl ) + tiff? ( + media-libs/tiff:= + sci-libs/libgeotiff + ) + xml? ( dev-libs/libxml2:2 ) + xslt? ( dev-libs/libxslt[crypt] ) +" +DEPEND="${RDEPEND} + perl? ( >=dev-lang/swig-2.0 ) + python? ( >=dev-lang/swig-2.0 )" + +need_apache2 + +PATCHES=( + "${FILESDIR}/${P}-giflib51.patch" # see https://github.com/mapserver/mapserver/pull/5144 + "${FILESDIR}/${P}-disabled-ogr.patch" # see https://github.com/mapserver/mapserver/commit/ab2a6129435ca37d02730a6faf85593afa0daf9b + "${FILESDIR}/${P}-correct-min-max-calls.patch" # see https://github.com/mapserver/mapserver/pull/5251 + "${FILESDIR}/${P}-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248 + "${FILESDIR}/${P}-mapwcs-disabled-libxml2.patch" + "${FILESDIR}/${P}-no-applicable-code.patch" +) + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + webapp_pkg_setup + use perl && perl_set_version + #use ruby && ruby-ng_pkg_setup +} + +src_unpack() { + # unpack A and then copy the php thingies into workdir/php-slot + php-ext-source-r2_src_unpack + # HACK: and then remove it and replace by symlink + for slot in $(php_get_slots); do + rm -rf "${WORKDIR}/${slot}" || die + ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die + done +} + +src_prepare() { + local glibdir="${EPREFIX}/usr/include/glib-2.0" + local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" + + sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \ + -i "${S}/CMakeLists.txt" || die + sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \ + -i "${S}/CMakeLists.txt" || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + "-DCMAKE_SKIP_RPATH=ON" + "-DWITH_ORACLESPATIAL=OFF" + "-DWITH_SDE=OFF" + "-DWITH_APACHE_MODULE=ON" + "-DWITH_ICONV=ON" + "-DWITH_GD=ON" + "-DWITH_GIF=ON" + "-DWITH_CURL=ON" + "-DWITH_FCGI=ON" + "-DWITH_PROJ=$(usex proj ON OFF)" + "-DWITH_WMS=$(usex proj ON OFF)" + "-DWITH_KML=$(usex xml ON OFF)" + "-DWITH_GEOS=$(usex geos ON OFF)" + "-DWITH_GDAL=$(usex gdal ON OFF)" + "-DWITH_OGR=$(usex gdal ON OFF)" + "-DWITH_POSTGIS=$(usex postgis ON OFF)" + "-DWITH_MYSQL=$(usex mysql ON OFF)" + "-DWITH_LIBXML2=$(usex xml ON OFF)" + "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)" + "-DWITH_FRIBIDI=$(usex bidi ON OFF)" + "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" + "-DWITH_CAIRO=$(usex cairo ON OFF)" + "-DWITH_PHP=$(usex php ON OFF)" + "-DWITH_PYTHON=$(usex python ON OFF)" + "-DWITH_PERL=$(usex perl ON OFF)" + ) + + if use gdal && use proj ; then + mycmakeargs+=( "-DWITH_WFS=ON" + "-DWITH_WCS=ON" + "-DWITH_CLIENT_WMS=ON" + "-DWITH_CLIENT_WFS=ON" + "-DWITH_SOS=$(usex xml ON OFF)" + ) + else + mycmakeargs+=( "-DWITH_WFS=OFF" + "-DWITH_WCS=OFF" + "-DWITH_CLIENT_WMS=OFF" + "-DWITH_CLIENT_WFS=OFF" + "-DWITH_SOS=OFF" + ) + fi + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + + webapp_src_preinst + exeinto "${MY_CGIBINDIR}" + doexe "${S}_build/mapserv" + webapp_src_install +} + +pkg_postinst() { + webapp_pkg_postinst +} + +pkg_prerm() { + webapp_pkg_prerm +} diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest index 547558d475c8..a27b2cbb1836 100644 --- a/sci-libs/libgeotiff/Manifest +++ b/sci-libs/libgeotiff/Manifest @@ -1 +1,2 @@ DIST libgeotiff-1.4.0.tar.gz 1517881 SHA256 d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329 SHA512 1336e9b5345d69c47807f350d2f757c753543fecc477a6fc036743e78fbfca7b7f99db1b0fdf03e80418fbd4c66db100d04ac7c3338913f9a2b922b9c9f91f1b WHIRLPOOL e6ce9c65db229dd95fd8d6296a926bc2efeac8700775f4a29cbcf3b4d218dc2a566141f14e453628253bf596cd4da7c3771a857e6fb90076f46bf32a357fa0fc +DIST libgeotiff-1.4.1.tar.gz 1674928 SHA256 acfc76ee19b3d41bb9c7e8b780ca55d413893a96c09f3b27bdb9b2573b41fd23 SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628 WHIRLPOOL 047c9be32bfd8735ccb01fa9027674b1c16a67229d68974da5cfdf381c2d824f24c7139f2806bc6b1630ba2d9373191da99f8a0faad4e35cea658d34f14ac9d2 diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild index b2dfb6b10505..427d2b188a1f 100644 --- a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild +++ b/sci-libs/libgeotiff/libgeotiff-1.4.0.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 @@ inherit autotools eutils MY_P=${P/_rc/RC} -DESCRIPTION="Library for reading TIFF files with embedded tags for geographic (cartographic) information" +DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information" HOMEPAGE="http://geotiff.osgeo.org/" SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz" diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild new file mode 100644 index 000000000000..fb3e04a947c7 --- /dev/null +++ b/sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools eutils + +MY_P=${P/_rc/RC} + +DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information" +HOMEPAGE="http://geotiff.osgeo.org/" +SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug doc static-libs" + +RDEPEND=" + virtual/jpeg:= + >=media-libs/tiff-3.9.1:0 + sci-libs/proj + sys-libs/zlib" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +S=${WORKDIR}/${MY_P/RC*/} + +DOCS=( README ChangeLog ) + +src_prepare() { + epatch_user + sed -i \ + -e "s:-O3::g" \ + configure.ac || die + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + --enable-debug=$(use debug && echo yes || echo no) \ + --with-jpeg="${EPREFIX}"/usr/ \ + --with-zip="${EPREFIX}"/usr/ + +} +src_compile() { + default + + if use doc; then + mkdir -p docs/api + cp "${FILESDIR}"/Doxyfile Doxyfile + doxygen -u Doxyfile || die "updating doxygen config failed" + doxygen Doxyfile || die "docs generation failed" + fi +} + +src_install() { + default + + use doc && dohtml docs/api/* + prune_libtool_files +} + +pkg_postinst() { + echo + ewarn "You should rebuild any packages built against ${PN} by running:" + ewarn "# revdep-rebuild" + ewarn "or using preserved-rebuild features of portage-2.2:" + ewarn "# emerge @preserved-rebuild" + echo +} diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest index d0d3b2c86ccd..8e5a3159f0bd 100644 --- a/sci-libs/proj/Manifest +++ b/sci-libs/proj/Manifest @@ -1,3 +1,5 @@ DIST proj-4.8.0-org_proj4_PJ.h 2960 SHA256 ed16ebaf2806fbd74392939085db17adfdaa71d45e908cda29fbc7dc3e0a613e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c WHIRLPOOL bdff66be09ca619fff5e12a90702db2c85b62b72016dc6805184363a0e5eadd6955225fd8d87a2b5148a0d8035dc88aff6a4cbd33f93869a23be42b4586f40b2 DIST proj-4.8.0.tar.gz 785279 SHA256 2db2dbf0fece8d9880679154e0d6d1ce7c694dd8e08b4d091028093d87a9d1b5 SHA512 6076289f8bdf1ca3b76ea879d8c221a668fcb4a6deec7cf6a293c489dfe0b21c36da0c6ed2c7a0b8042436106e851018aa429b4731f4ff018fea2fdb8887ec76 WHIRLPOOL c4d2ae53441868d489c789b5ecdab63829855604ff00479d08727def41b1891e72bd590fd18b0f51ae9fc3f3f121496fecdd2a860b9376df8181d781ffe57599 +DIST proj-4.9.2-org_proj4_PJ.h 2960 SHA256 ed16ebaf2806fbd74392939085db17adfdaa71d45e908cda29fbc7dc3e0a613e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c WHIRLPOOL bdff66be09ca619fff5e12a90702db2c85b62b72016dc6805184363a0e5eadd6955225fd8d87a2b5148a0d8035dc88aff6a4cbd33f93869a23be42b4586f40b2 +DIST proj-4.9.2.tar.gz 874816 SHA256 60bf9ad1ed1c18158e652dfff97865ba6fb2b67f1511bc8dceae4b3c7e657796 SHA512 34a506742bb27cbc7f5ee91ee7f8c7a27d0f5644a1dcfd11b1e59120040804b1621ddfa4212bff45a1c3fb85511e48ece21612e86033139bafbb50c165e77cda WHIRLPOOL 51b9f4db2bdf46574d1b571e85c5d8ab462732ad27eb7664a586709afb27f516a4f3b15806bcce480548832d451a7ae297992eed5a2acf74a505be800a386a85 DIST proj-datumgrid-1.5.zip 2250131 SHA256 723c4017d95d7a8abdf3bda4e18d3c15d79b00f9326d453da5fdf13f96c287db SHA512 9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3 WHIRLPOOL fa0a58628906e108e811062a2f9761009d85b6083506587ddc95aae083dc5a2855174823037bbd63a5702b869c038483ed9a9f64f5a245bedcfd88eda7a026a8 diff --git a/sci-libs/proj/proj-4.9.2.ebuild b/sci-libs/proj/proj-4.9.2.ebuild new file mode 100644 index 000000000000..56dfbca8630e --- /dev/null +++ b/sci-libs/proj/proj-4.9.2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils java-pkg-opt-2 flag-o-matic + +DESCRIPTION="Proj.4 cartographic projection software" +HOMEPAGE="http://trac.osgeo.org/proj/" +SRC_URI=" + http://download.osgeo.org/proj/${P}.tar.gz + http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip + http://trac.osgeo.org/proj/export/2647/trunk/proj/src/org_proj4_PJ.h -> ${P}-org_proj4_PJ.h +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="java static-libs" + +RDEPEND="" +DEPEND=" + app-arch/unzip + java? ( >=virtual/jdk-1.5 )" + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}"/nad || die + mv README README.NAD || die + cp "${DISTDIR}/${P}-org_proj4_PJ.h" "${S}/src/org_proj4_PJ.h" || die + unpack ${PN}-datumgrid-1.5.zip +} + +src_configure() { + if use java; then + export JAVACFLAGS="$(java-pkg_javac-args)" + append-cflags "$(java-pkg_get-jni-cflags)" + fi + econf \ + $(use_enable static-libs static) \ + $(use_with java jni) +} + +src_install() { + default + cd nad || die + dodoc README.{NAD,NADUS} + insinto /usr/share/proj + insopts -m 755 + doins test27 test83 + insopts -m 644 + doins pj_out27.dist pj_out83.dist + prune_libtool_files +} diff --git a/sci-mathematics/fricas/fricas-1.2.7-r2.ebuild b/sci-mathematics/fricas/fricas-1.2.7-r3.ebuild index 3e1eadb4a4a0..60ef380b9d8c 100644 --- a/sci-mathematics/fricas/fricas-1.2.7-r2.ebuild +++ b/sci-mathematics/fricas/fricas-1.2.7-r3.ebuild @@ -13,6 +13,8 @@ KEYWORDS="~amd64 ~x86" # Supported lisps, number 0 is the default LISPS=( sbcl cmucl gcl ecls clisp clozurecl ) +# Version restrictions, . means no restrictions +REST=( "<=dev-lisp/sbcl-1.3.0" . . . . . ) # command name: . means just ${LISP} COMS=( . lisp . ecl . ccl ) @@ -25,10 +27,18 @@ RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE ) n=${#LISPS[*]} for ((n--; n > 0; n--)); do LISP=${LISPS[$n]} - DEP="dev-lisp/${LISP}" + if [ "${REST[$n]}" = "." ]; then + DEP="dev-lisp/${LISP}" + else + DEP="${REST[$n]}" + fi RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? (" done -DEP="dev-lisp/${LISPS[0]}" +if [ "${REST[0]}" = "." ]; then + DEP="dev-lisp/${LISPS[0]}" +else + DEP="${REST[0]}" +fi RDEPEND="${RDEPEND} ${DEP}:=" n=${#LISPS[*]} for ((n--; n > 0; n--)); do diff --git a/sys-apps/mlocate/mlocate-0.26-r1.ebuild b/sys-apps/mlocate/mlocate-0.26-r1.ebuild index 41bf8dfcceb1..a08956719e31 100644 --- a/sys-apps/mlocate/mlocate-0.26-r1.ebuild +++ b/sys-apps/mlocate/mlocate-0.26-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,7 +11,7 @@ SRC_URI="https://fedorahosted.org/releases/m/l/mlocate/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="nls selinux" RDEPEND="!sys-apps/slocate diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest index bfba29677716..ab5c354446ca 100644 --- a/sys-block/partitionmanager/Manifest +++ b/sys-block/partitionmanager/Manifest @@ -2,3 +2,4 @@ DIST partitionmanager-1.1.1.tar.xz 1738132 SHA256 4cf3fa71bd20b06755d36bb9aa7692 DIST partitionmanager-1.2.1.tar.xz 1794200 SHA256 eb5b8b00ab6f0a2c5ef494b1c70441100ff70bf691006c4aa95f39d00b43e4e0 SHA512 9d33847e307df65081966d4aea2b2efeb7e1befe911268c71e678d196bf0fb9160b9812c7df2021dca2a3a4a5e9efffcf435d242b3496e6e7c7b1d89fea15441 WHIRLPOOL 945676c27a5aa80b6551d75c8324ed3d85328fbfea6f2447e0345e0d1a5ba9d45165ce36332c444b3aea5076f80060b47f4568699fc5bb59e18222af0d7a56c7 DIST partitionmanager-2.0.0.tar.xz 1488312 SHA256 26f880c0955797778612223d3cd68345bc47ec4903b4c541dd04e7998d3083c6 SHA512 20537c55004c353a903977a37077752a99a50c6b439699eb4b209c64e704c47de98645f77ab6efdebd70139c8af2226c8e431eb47cd1730a2060b643eb272705 WHIRLPOOL 4ee5b13015730f09aa050369fa5b65c9afa4d41e99711bfb7e6a4a1b9d3643a7d46834b5af5bd32dbd414843407514dc6df690a90fbbf52bc024053e15e8cd0d DIST partitionmanager-2.0.1.tar.xz 1488868 SHA256 c953ef3875c6c08ad3aeefa6cb4b31659dd681514079fb20432f360d133333e3 SHA512 8a04352d0c2c9856d9a2ae460e6f97ed6407029f9e5d01ca6bbea9b241e3ea652d4a2196c7d5a0c775f45a87b8ede85a8f66c96357e7e50e9f119b417dd539de WHIRLPOOL 67a9ba8ca3b9d16977a25c59f04f4391654cd1b83a532daa301a0f9c2bfdd6880c68117cde7967dac6447581b31c2d3011bfee9d3e67f7dfd074611b1b5db1aa +DIST partitionmanager-2.0.3.tar.xz 1489116 SHA256 1b0c142c76c0c3af5887bdbf688754b4e6a1ea2ebbadeda6f3a932f50f8c47e8 SHA512 4a3ee0680651b85e09a9013ac024b8b09b622ac04c6e9143fd18279a359461f0540cd96476bda09fc75df15958649e208d09bc3ff329601708906fff9c02d513 WHIRLPOOL 243e8e547cc003e8847b5fd0f784a9fc57e4bd9e94c00d6a96da51efee8db1ac5ef44b1e226a40e9bbc2d6e94f1d1b8dc29443cd6845477fce7df9627e66d8c2 diff --git a/sys-block/partitionmanager/partitionmanager-2.0.3.ebuild b/sys-block/partitionmanager/partitionmanager-2.0.3.ebuild new file mode 100644 index 000000000000..54cbc1e9acee --- /dev/null +++ b/sys-block/partitionmanager/partitionmanager-2.0.3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="KDE utility for management of partitions and file systems" +HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager" +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + +LICENSE="GPL-3" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + sys-apps/util-linux + sys-libs/kpmcore +" +RDEPEND="${DEPEND} + $(add_plasma_dep kde-cli-tools kdesu 5.5.2) + !sys-block/partitionmanager:0 +" diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml index 98de26538449..33079b1d9ccb 100644 --- a/sys-fs/lvm2/metadata.xml +++ b/sys-fs/lvm2/metadata.xml @@ -10,6 +10,11 @@ <name>Alasdair Kergon</name> <description>Upstream Maintainer (please CC on bugs)</description> </maintainer> + <maintainer type="person"> + <email>cardoe@gentoo.org</email> + <name>Doug Goldstein</name> + <description>Backup to Robin. Please CC on bugs.</description> + </maintainer> <use> <flag name="clvm">Allow users to build clustered lvm2</flag> <flag name="cman">Cman support for clustered lvm</flag> diff --git a/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild index 211c6f0e66ca..3003ed99e686 100644 --- a/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild +++ b/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild @@ -38,12 +38,12 @@ then inherit git-2 bash-completion-r1 eutils S="${WORKDIR}/${PN}" SRC_URI="${COMMON_URI}" - KEYWORDS="" + KEYWORDS="hppa ppc64" else inherit bash-completion-r1 eutils SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz ${COMMON_URI}" - KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86" + KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86" fi DESCRIPTION="Gentoo automatic kernel building scripts" diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index efa220aecdda..d05b4b5558b6 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -21,6 +21,9 @@ DIST genpatches-3.12-50.extras.tar.xz 18236 SHA256 ace6077b7076364db90f1d3ad3079 DIST genpatches-3.12-51.base.tar.xz 1564420 SHA256 6b9ce4b6d8ea8c12539db8af48e44f443c43ced27f370409f04f17b34c32694a SHA512 c22bc2e4399f501135a211c47ba47ba39a03d6738099637763c282d6f1ad55dfa3d9b4e9a284bcc45fcd1228b45ce1c0fb25cfe1ff929c71397fc29883228c76 WHIRLPOOL f7b3f277fd06f70df94684f408a6cc3f09b38f95b71bcc0d1e07ae9b1bc0ad32599ab96c574b41afb88408e8bb2a426ed9958a29656dbd2f864860da1889e94e DIST genpatches-3.12-51.experimental.tar.xz 46528 SHA256 03142b654f7e6188161db86ae706ad119ed60ca91cbe902c4daeb4aa5e1c03bc SHA512 7ee759d0700509d6a4aac1036f4e91aed618d5352004cc025731f2a300a05939931dace7dd02ed502c9a43a38177b06e1d318c7f0467f71fed0578e6fe216ae3 WHIRLPOOL eaafba8acf5ab253aeea151de39894440b0e980afc6dfcf0ded52f34c806c0acf2aecf224b967d17f5117f1a4f6e530b0acc6c67e837294bfe925bca6b5b2574 DIST genpatches-3.12-51.extras.tar.xz 18228 SHA256 ccad2245cf0878017cebfe04de06676989d223a5ad94e8410bc8eb036f59fbd8 SHA512 1d45f03b6f0b49d2b98ca5776e7388e4ef44ef8b3807e0f2d8cb76d22d93105e4d42d9662dfbc757632be9a71790ec566b2d0a6064d969e00e5601674e14dff5 WHIRLPOOL 56c0c9c82cd25115837aeedd5be4ec913d19db96c0148e44661468789d68944ebe8ea03fed73c2d033a2166fa98e97b0bf01bb9bee46ec23f7488dc9cc30210a +DIST genpatches-3.12-52.base.tar.xz 1596124 SHA256 72d74ba469ae1a7c73831728989f3f9a6b54ac089771bfb0f8305d553513a523 SHA512 e964a28e291dc13f3eb9a273d7634e791d2ef61279638f4e2e920701afb8904aea2a7ebdf555d045853f06a2f1d933f74ff5e9f07d9a9d324ca266e0a9af637c WHIRLPOOL f5a20f880e84306715e0be90dd0e94dd273d6e8ecf9d5c2c4c404e2ee327a8138a0b953b260c9d80380251f4bf1573755bbe22508b40a7e39d58098d0d681d1c +DIST genpatches-3.12-52.experimental.tar.xz 46536 SHA256 bee56c9470d6753eec6eb3e6c22394152c076dc3d6e6c70f09c419dbbb55d2a5 SHA512 e45d24f7058aa0a8a8b794d971ac7601cb280c2e9d4de83aa3de990d02c5349fd1692a55cb2d95415f14d60c203edf0e34887a88909ddef1e308fa8453a975cb WHIRLPOOL 02377e8beb3f63fd79aa14550e142073e2eb81a29bedf4b79f5192c506137e7ffaea7568ac7bb7f8130c45d23cfa319c0ea22fe5d8a648a721da95bce82bbd97 +DIST genpatches-3.12-52.extras.tar.xz 18240 SHA256 544b4ef8be29db0f6877adde03444a4b007c24dd48b0cec05b08632705530c17 SHA512 49f208756bfef5f717ed5a82c4a8f4e5e0274885dbe0864ceca72b7e7012a7df277a2d5f0f2e978e3deb16e7b590e9fbaddcdca388e8a248ee3a42ad7301409f WHIRLPOOL 0e7495dc5bf16a2b36558625bea4b3840c3dded0537ea6f105f652e12a4fa0c60d11ccd9b88953b8321cf923d2f27085241edfecc2ff512f52bd97c20954d366 DIST genpatches-3.14-65.base.tar.xz 1118344 SHA256 fdbaf042acdacca6c02b602638980ec661cbce979600391e94cca031d45ef6f2 SHA512 28bb3f51b5d0b45bc18d54fc04eb975a7c61bf5c28539cc6a6466bc22611ec3b91ecf5b9f79053082e3907e0980c2d97a1e22eb25e75157e4dc54ccf1d9a16bc WHIRLPOOL f776e32318fe8e4c468cacc907aa32554b74dac0f5a1ce785acb80a40b52643977c283b469d6d5ba895ead477f246e409a99d6e686cd3686b4b6ecaff4a97ef0 DIST genpatches-3.14-65.experimental.tar.xz 60300 SHA256 f0e047dc68af01750fc2b2cfb76694cecb391e4de657810b2de2a9092bbb0eeb SHA512 c2125a73aba4fe51c1efc6a73a86088964bff398c2409e256148d0f13e8106b56e6c8137e0943332be2524b3230f522e0b76b265d20ef075d852a5a3ca21edf0 WHIRLPOOL 5042375ab3541e65f609deb48a03d186b53d583b4512c27ece06130c0ac4fcebeb8256bf9cb38276720e8fc6610dc8663819ec5acd3bdcc57232a1d2082f25b5 DIST genpatches-3.14-65.extras.tar.xz 18256 SHA256 9220e49d4a95d876373ec40fae2e026bcd76efb5e33106bf2350026120b28244 SHA512 2699115a2a176a34570b1045f1ca6f5f23e46eb974c9c4953607919f7e5668e1b317b197cd39aa375347460110e9c67231b0315eddb9ed4d8fb631b453f802bf WHIRLPOOL ecb98ae1bca845efbd5dc32bfba31268bef55c73ad35092796c8c4d3661a72341e1a179833ef76d701ede477b9d436a2c45c16ca9b2bc23bec413e0186848285 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.55.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.55.ebuild new file mode 100644 index 000000000000..aef08fda1aba --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.55.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="52" +K_DEBLOB_AVAILABLE="0" +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest index 5a76756c16f0..05acec7c0684 100644 --- a/sys-kernel/rt-sources/Manifest +++ b/sys-kernel/rt-sources/Manifest @@ -1,20 +1,20 @@ DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831 -DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8 DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e +DIST deblob-4.4 137370 SHA256 7cf11c8594db0d2a10a1b02390c9ff8916f1d2a1fe9d59058ca45485500c5274 SHA512 ea5f2f2cdbc97bdc90c2131f846761dc1630a53986db10d8e9d07d1ddee12a9d878c57790edd3ecc75ed9792d479b7b726c39d688a3926e850608c81b1b78a3a WHIRLPOOL bedd494be2032ce4b8911f25df906055d019af31ea6548b885482f870cd5313e09e7fb544fc8db268b3498cc18c199ae5701023839c972b48dbd8128239eeb75 DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c -DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0 +DIST deblob-check-4.4 694225 SHA256 e142bafdd5a05280d5280fbf109aadab3af9ce71152ab2d27ad41e96766e0c3e SHA512 6554ae567566da4d30e94a37622f88343b8e96ab39a9204fee34de4ddb5dac8c4906b25843b63c2388d03a4441821c25d395b3c39fc875c498a69e677a4f0cb5 WHIRLPOOL 414f60a64a2c14f01eedebc84f5adfabf0562bcf76545a57e757cb6ac914ffc49c90c329eedd1aafb1ee752bfc082fd4f6af173774f4f853ddd637525fbeeb9b DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6 -DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 -DIST patch-3.14.46-rt46.patch.xz 166044 SHA256 769c320b221aa8507b8714c146894015b4a36d2f2c64c28d361d0d1fcc516bb2 SHA512 da1ab0e12f2b8a277ce48c351a59b628094472e73297867a8d20fadf60ed70340cfaa5c19eb8b2c83b9514decae78ed4a6ae3b7de10766ccbaf09aad1c140b27 WHIRLPOOL 2ab1cf65b3d4296b341a8ddda5f4e7c458ceb26ce9b12e86a1e99ce8d639880e5178f89cff5c37e3abbc5894e34c1725a15b2fb6b7c297357f9d8a35ea12e3e5 -DIST patch-3.14.46.xz 920632 SHA256 06bda2457a41d28c7b782739e85bd9074b29cb2bf28fd9d18a0b797c958175ad SHA512 d5a5af3d81313932adb90d74e4d3999e73c86a11dc42d2928304bb51b87dd237ef33005de2fecb6971e11aac7fe55d4ef3dd35b82fbc1e530d772c0d1363d987 WHIRLPOOL 24c5f9397acc734af43a7ee35cfb3c2346f57fdb0c3fac09b6353050b9fc555216fdbee93f7ac345081979a9365f6e8f1aac658da4fa9d175d379d9a6ebca005 -DIST patch-3.18.17-rt14.patch.xz 156584 SHA256 1e93fa3e05a23d9b4b8c89074898c7f45844611d94cc85c6ef88ac4394816a18 SHA512 9f1c1bed08cd4fd9b47386a3ab0df2c960e034cf3b55736d9ff2bcdf30c6630bf4a2abac2a41ab872b94b411f07a2d6336d3e4960db082a6befc1d1bcef078cd WHIRLPOOL eb9a785a09925ba651ab99de597c9413499f6ef763def71a04c512984d9bd95d1f5cdebcf157fb269cd84c156a87092be8973b6828d3a662a4b56d9a91b90b60 -DIST patch-3.18.17.xz 510700 SHA256 190b769580a766add68c3e3a8878a725b36fe6877991f3af0cb4a1d6b5eeccf8 SHA512 03a78cc7b72150570fd0f24ad44f491dc57913e0675f31b7322af8ccbf41deea05a0b04c7058f9c85352cb03a976b3817d3544d8c690cc67e26ec08672c09afa WHIRLPOOL 74a3d589e16a52252520e3a8be72190505197fcee921349d79343585ca3dfe27cf5cb81407cc5bf08a98753dbc99c9c7e751098f842dbfd919da4d94adf03d8c -DIST patch-4.0.5-rt4.patch.xz 166564 SHA256 9503166ca9cfc71b3d05d3c86a650a42f730f28d62eb04e77443d67a70f5d2df SHA512 e4655337a4ca6fa3ecd21c590446367e4755e0089352a9a7db87c7f20e360ce4dc84c5e34f4c99b25e8489cafbbf9019cff084caaa2fcfae91a90b7eb37ef60c WHIRLPOOL 4a1df242fe31387419cbb80a214f1996c4d4e3658787a1dcf5c44b16eebc8e16acd5b8c061e749d129970032b0a3333f8198a4357f5812670172f8680a4e64d7 -DIST patch-4.0.5.xz 154204 SHA256 60b691210a9e412710e29eac6468d64b6c4d1efc53a6e22878dd51044001adf0 SHA512 377371371752eb706053282ee296f82b3af0c3cf84c346091b1e347c8d00fcf6787c5b51c76955af3f61e9c20c30035b110368ee3ba2587871f0dbc92826de32 WHIRLPOOL af2a7e0c805beeff1a235d8a6958d1251524e02c2c5b0302d0e45e77695f95183ab43f6cfd55f973e6d22ae3da8bd6829e6f180945480d1ed8a3ab5f6c3e6777 -DIST patch-4.1.5-rt5.patch.xz 167012 SHA256 0cfa47bedd98fb7c542d422c79c52390be622d3e524fed54c976049d0050fec8 SHA512 60a6870c3cf018bdc38fc6939411540dcc0d99620829581026cc005fa408747f144335621e306338a7bb57b60742b492c444bfd62003c25db6bc0d7952f2e750 WHIRLPOOL 249cf01c54da0f513b8e68de5ba8f3880924e9713dbb0fea2eb22a2b6053499a51a179a126f53e2b8f594a6ad4c994fee3811bf9c3c4888e68e5ad35f4c81695 -DIST patch-4.1.5.xz 170056 SHA256 b495cf8a7b978986dd2b757b687751c62f635d15cc2228edb80934bc0d449dcc SHA512 1325cdb35ea1f277d513932af37804f788b96ae63b94cedeb3c9b916ee8963bbd6aca5d0e13279e36a81f1de06005c5f3666ecfc845609932686f261fa4250c5 WHIRLPOOL 291ddfcde395c3d201a8172f7281ac560167a8bce78d3196b47e4c7be759545282cc1104fc7b2edc95d90250a834cc23103199275bc8c6974bd4229dd530d1a3 +DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc +DIST patch-3.14.58-rt59.patch.xz 166868 SHA256 6bf87af9a0d6aa9dd8b4e5550b890a29e58253a9d377c86516179047af2f29e5 SHA512 a979bc63fbc3a83c4a127088e1e8b116403b0fa33148c3acda145b68f6c30dfc53d2de8035fd970bc2b43866351b96a819fbebc18318016d8578fad39af69092 WHIRLPOOL 1286faf68f505d5ac0b0758587abb0f50c39d4c3812681912b44161bca967a3038d790c537131554198f32ef5cca147b7955db87cd94aeadc783a8a357e54e6e +DIST patch-3.14.58.xz 1039716 SHA256 e65bbccf03522a609b88c8186eef4cdb41c35bd6f9416b767b67c11718e26d6b SHA512 d7b946dbe01c8b0167c75cbc1e328c43244218b653c7a3c29024c5a59a82645f1d652d25c957ecc692d1fa9b2e03c8c082905bac1df13e5238cbad261b342f3c WHIRLPOOL 8418ca4ab6a8270d1c33b0c2ad6dd24f4904fab1d3168b05ee143b56828f808ea266d8b8db5bc69b5263a0b7a038ee1b5244cf034834ff1b2d5135558ea94c87 +DIST patch-3.18.25-rt23.patch.xz 159784 SHA256 f8d608e2237b5da7354d5fafc88644a9736c1ae0a303fc64f360bcb69c78c93d SHA512 247d8758eaf143b666eddfd5fe4a0849770760efca08fbf3abde4988593f1cce53e5613f12ef5f01ac2b60b1dd6dc059417a4a76e716c7e337ae1a1afeed026e WHIRLPOOL bb864b5af872811149ef52c7503f6730af06268bc17274a3705553bf3f94af4e5042fd61fb5d904f534c8477e715d162ce890e1c787d3960e1e350f2322d5204 +DIST patch-3.18.25.xz 716948 SHA256 78df9b97449715fa4e39158fc27fadbdbb50eab04ac29d1374a95bebaf7adfbf SHA512 c706e0e12086dcc7783eb0a92cc96e375c1b22d013de1015d1940d1eff2d2a9c9540184d4d4796fb8cf1e69edb8ba7afc25af5646dda865795c63c3ebacdd268 WHIRLPOOL 4a33bdc15f2a6d1430c2c2f30a52bdf25ba92eb713b97953803169067c11821700f8186a32720339adcc83b12f34e56426615010f3d2d2d01b27c532e408d052 +DIST patch-4.1.15-rt17.patch.xz 175928 SHA256 5113ad6af15bf2db1031038acdec96f924a3d34f37541360cf1aa04208346b9d SHA512 37ca7f60d7451ee8cc07ba4b698a42e48cc4d3fddedbfddfe4e414d81d754840fd3cc6a2f87e7f1bcb934aa6699651904feec50e8ad7e801eb721736d5ea0e16 WHIRLPOOL fe782954350eade19d3c9bbd8be8ed07766ed304d001f1c49a0037901f42a84ebc9aac1f3d87f8b14d35044568ea1db269c75a908dab6f3622af0293d6280341 +DIST patch-4.1.15.xz 433040 SHA256 0ffca8557f1aa191da2f2260ad279c9cc858e6308a8af8a76f7ca3d3c0540344 SHA512 646daf16c01fb8c3013c7c9919c18c3635eb6bd37560623cb56cc7a6d0b22fb13290cee8865dfbcc435cd8544cc3ecb6f3aae538d10c9e0b1098806f233155a3 WHIRLPOOL de84d094927463fd425f7bac7d665aee593e41c44354a240db80653a60bc486dbb9dada6a3a84cc29995d03d1f480905878ea21a1299ca71b2a8e6ca58303351 +DIST patch-4.4.1-rt6.patch.xz 160260 SHA256 5f5395d6ce50fff2594de30cfa82c65c21c030365fff3d78707313fcb02c3bdd SHA512 c6efdd48e7e0dd10c7b7892cc2524e23f8fcd0c60b31f07ab42ed06227f22cd554bbeea1a11133d74cab5c7c17a61c935ea4a9aa9cfc1c57b7f517eb6f10a85b WHIRLPOOL aba025deab1b0a73f9c734dc1de702e7a5a1d7962da9129ea7363944e2525fead5d40f23dca44aeadf70aed70b15c31efff28e0a7245c539bd3f897fe09135bb +DIST patch-4.4.1.xz 23612 SHA256 c0218043e61da3921cd14579ae4a8774a6fdad91667a9fdb851d0a35f62edb48 SHA512 b117b6f88dd713a33691306e483d5c42bcf61091d91f7248e1537ac7f7b96380f5f7df81f399cecda13d9388ad7aa52ed2e6d46f7b27706d2f197b8e64c330b3 WHIRLPOOL 988a5cd6fc39577eda1baae93fda94deab93fa6d5245aa90f3c6ae032151b1a9e23458ee822d558643f23e0aabf1bd5962d36a72180a04bcecba74287ace776a diff --git a/sys-kernel/rt-sources/metadata.xml b/sys-kernel/rt-sources/metadata.xml index 34aed5d6451e..bd509e6e1616 100644 --- a/sys-kernel/rt-sources/metadata.xml +++ b/sys-kernel/rt-sources/metadata.xml @@ -2,22 +2,26 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>psomas@gentoo.org</email> - <name>Stratos Psomadakis</name> + <email>karl.j.linden@gmail.com</email> + <name>Karl Linden</name> </maintainer> <maintainer type="person"> <email>eric-f.garioud@wanadoo.fr</email> <name>Eric F. GARIOUD</name> </maintainer> <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="person"> + <email>psomas@gentoo.org</email> + <name>Stratos Psomadakis</name> </maintainer> <longdescription> Real-time patchset for the Linux Kernel </longdescription> <use> - <flag name="deblob">Remove binary blobs from kernel sources to provide libre license compliance.</flag> + <flag name="deblob">Remove binary blobs from kernel sources to provide libre license compliance.</flag> </use> <upstream> <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id> diff --git a/sys-kernel/rt-sources/rt-sources-3.14.46_p46.ebuild b/sys-kernel/rt-sources/rt-sources-3.14.58_p59.ebuild index caf90f9ba169..caf90f9ba169 100644 --- a/sys-kernel/rt-sources/rt-sources-3.14.46_p46.ebuild +++ b/sys-kernel/rt-sources/rt-sources-3.14.58_p59.ebuild diff --git a/sys-kernel/rt-sources/rt-sources-3.18.17_p14.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.25_p23.ebuild index caf90f9ba169..caf90f9ba169 100644 --- a/sys-kernel/rt-sources/rt-sources-3.18.17_p14.ebuild +++ b/sys-kernel/rt-sources/rt-sources-3.18.25_p23.ebuild diff --git a/sys-kernel/rt-sources/rt-sources-4.0.5_p4.ebuild b/sys-kernel/rt-sources/rt-sources-4.1.15_p17.ebuild index caf90f9ba169..caf90f9ba169 100644 --- a/sys-kernel/rt-sources/rt-sources-4.0.5_p4.ebuild +++ b/sys-kernel/rt-sources/rt-sources-4.1.15_p17.ebuild diff --git a/sys-kernel/rt-sources/rt-sources-4.1.5_p5.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.1_p6.ebuild index caf90f9ba169..8352c29f5b71 100644 --- a/sys-kernel/rt-sources/rt-sources-4.1.5_p5.ebuild +++ b/sys-kernel/rt-sources/rt-sources-4.4.1_p6.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$ diff --git a/sys-kernel/tuxonice-sources/Manifest b/sys-kernel/tuxonice-sources/Manifest index 4430698b0fe1..7aeeef00d70c 100644 --- a/sys-kernel/tuxonice-sources/Manifest +++ b/sys-kernel/tuxonice-sources/Manifest @@ -1,6 +1,9 @@ DIST genpatches-3.10-100.base.tar.xz 1315848 SHA256 3173e7f08f92619f6cbe72cbe1ca057dcd47b16d0dea3eae8f47cf8c626fe484 SHA512 0d3fbe9bf88370a60f750da6daa973bf8dab6f4039f007649985d50baf4a5c30d0f3f7495d07c369c5c31e101cf5af7fa673737f72eb432a48e303c59906fbae WHIRLPOOL d80764b8f61b582c0901071ed91b8c4de420339101819b2d8ca610facd2927d283e1107394006c5c981a3ec70f4e2555e845d99b88ca6ac371d6da47c3bb8958 DIST genpatches-3.10-100.experimental.tar.xz 60176 SHA256 dac68be2307878e46a29f3d0209c6cc3ce42d25441345e92e7a3564ea90d4aaf SHA512 f645210f454312ffd9fa34665ccecb512c34628b822cb9e29e84e85bf291954a3bc609e48841a5295c13334efdf0f42d0e33284fd022319e257bdc81763ef687 WHIRLPOOL 7b063586942c02935ceb9564e7a5a012ce2bc41fd184e6e3f8b48999b030070c7cf199cc59be18c615a7b40e893b1447ab7965671a8419d9b7995ec18ac8e501 DIST genpatches-3.10-100.extras.tar.xz 17844 SHA256 fcfeae8c28d10aa043b86c5f272193e54c8757aa9f7d1068f6ac157a856fb8d4 SHA512 8e8b0f2b1b3a7dde4262ef4825c7efc718930d74aebfc5a80820acb301e1f37f29fcd72ada6269d2ec579b260d3f4d0d2caa17f68d1bf0569fc3967d436ea0ed WHIRLPOOL b67b0f8314f6f9421631398caecb3177df8b1cb5023447a892c0b809192252158a3ae9728abcaa14905eea76fe9b9f78a51e988abf9ce32903685115729875ef +DIST genpatches-3.10-103.base.tar.xz 1351328 SHA256 4007762e19d58df9babc74e7bec5ad55dc67e09ab7a8891f0d5c660ba6ad7d7d SHA512 f7e2a7c83e08ea79d9a3d12d3198aea289c714bceae20467cc69d138d326d9016fc3f2b85fc868e6aae7f36ea37239bd5616a6315909d56bfbbd5c8939ba9210 WHIRLPOOL 6d09a546dc4721681a253534995a74b30febb8f94c66c60f546e0c1da0bae60d4c68bcce27cb6212103adbe3439f948a28850b5a8b54219487fc81c710bd2f67 +DIST genpatches-3.10-103.experimental.tar.xz 60172 SHA256 a95384e826182e9be3a70e0d7884e24abb34d3112b9c607ee35de94047d99332 SHA512 0cfaac8739e3192089d54ac795be0e78f882e74187e60170eaf7b95b60f4e218b1dabb5abe4965db8b3d2e9bc6a164fc36d8b351204ce87b190d95a394be1cd3 WHIRLPOOL c3fa228389169e256b5b253489ac8c080d236c8ea10b8b48519057ffa5ca4952ed26facfd3a936d1ed872b76d1e7769b94af072f129d07a18e90763656554ce3 +DIST genpatches-3.10-103.extras.tar.xz 17828 SHA256 e174353e2bf0ded175f756e49e86042bd6028caf7a2ecb295f7721edd051cd6b SHA512 0716e1c32548dfd764629074df0bd9f008685aff85d4bdb5b18f0cffccaad9ed331ac906206e3089a467d95d8f0fbcd87e36f441ef31585eba518852a541230f WHIRLPOOL 1bef33927aa4275f77d3ba0c5f8d5b69aa0f02a45abc28cb16b25994ffbee230505932199247d99d0bc6295e199871629d367250bd0c71bb6cdca856566be832 DIST genpatches-3.10-98.base.tar.xz 1303112 SHA256 51a91a0d98ceb9c77c900aa4ad86b51113341a2823ccb90c3bd926bb3009b07b SHA512 621cdf1e7ffa02d4e9b0996681f8d60bcf26a30ac4bf8d00145806047a7ace8cbf60195840ba858d775c64107356cbc1efd4b601f6e0219bd2e9552b71d6540b WHIRLPOOL c054f0b2c7de4ba83d0bb53838b0b11564fb7950c081bc65c27f99efaba2e8495f90b62c4c477cbe7f0a47ab20832c070cfe747b526d30481a11839d5a5738d2 DIST genpatches-3.10-98.experimental.tar.xz 60160 SHA256 663505a20e625da9160d279fb42dc578490050d85e83a5b1addde985c456f205 SHA512 8efc7c68eaf21a57e85a76deffc87596eab82988868616ee5e8ee0fc041ef16352fce6c0ac456b10c015416bfbd1b2b8f48cc2d3032c194fa0a097f6a488b432 WHIRLPOOL 49bb906de3a71bc098f3efd686193dfb68b99f110e3025ff3f10fd964ee238be7c46abc4e642b41dda4f579a870b5448c87bf0bb1580dabc6a04b9928cc34b7b DIST genpatches-3.10-98.extras.tar.xz 17840 SHA256 b8207c98fa54727f8c5ad98fa9c36d64ed1b6e035749e969c2c7b9c40d63fff4 SHA512 6c9f9c980de8b160a5ee32d69889bb224c5715eca8412b51bb24f5f24565e28c8ea200d28f26332709e7aada9981867aff76731cec12997e730481f82f09b455 WHIRLPOOL 419b8657351293fa04b0c41bdfbc025e51602f149866fe05cc47c7cbe746c31a2cdd652d652df327949707550f04a0558b442c1815f5e1f596ef830efebe4fd8 @@ -16,6 +19,9 @@ DIST genpatches-3.12-48.extras.tar.xz 18244 SHA256 331081906d8187f8c0d882f4b7edf DIST genpatches-3.12-49.base.tar.xz 1545256 SHA256 f9503fdf958458692b841b95fcdbc561a7ef4ecceeab1c2e532c0740305a25d1 SHA512 4475cc1e1faee3975598115937869564274053cff1a9dfbefe41b9535846f1dae04abd784541af5925e805e9878ce1590cc2eea999c06cb3ca67b80df94f23e5 WHIRLPOOL 25758cf3bad2a875668950923edd3ab481c8fe7f4faa2512a2ad70acf3f4f360dfad0c10bd4599efa60bcb681c29cfb2db5f4b3f8bc82cc792a369517891bf02 DIST genpatches-3.12-49.experimental.tar.xz 46536 SHA256 927d367eeddb6823534004c5a4c96093fe822acd5856d262003045935617a741 SHA512 3ab1222cbd073437af8697b9407ff2dd4a1890be5acaf70d9e14ff6c6e908615a7f6c8a8b3c0def7660e925edca457c6b31fea64b2ec73200c36512df6efa3f1 WHIRLPOOL 7d600343ae9e5109e04507176b7914ce2421bf250e2a5f9812122820760060093fbf9112fa9e906f8185c99eb14fd873f198f38da4a3ed7b92c884ce0ff01358 DIST genpatches-3.12-49.extras.tar.xz 18232 SHA256 5800be892a1828498d914ca9315cc5315c2493f900390eb493f7ef45bc7d346c SHA512 b3cad4524b15e15867ed4ae56efed8e59be1d570fe9e822ac381dff7d5c7cfe35af730511a1693ee6f82a48f2e2dc9718b39c37f5530aa00fe18f23d142df4e9 WHIRLPOOL fd8b5bef919d3c155aa49d7c4587c3e3af785ccf1bbff47d0e67fe05fd3d9e4abae8626ba7d44bcded366acac04f4f0ed3244a8ccbcfd886840ebc1663fa7bbf +DIST genpatches-3.12-52.base.tar.xz 1596124 SHA256 72d74ba469ae1a7c73831728989f3f9a6b54ac089771bfb0f8305d553513a523 SHA512 e964a28e291dc13f3eb9a273d7634e791d2ef61279638f4e2e920701afb8904aea2a7ebdf555d045853f06a2f1d933f74ff5e9f07d9a9d324ca266e0a9af637c WHIRLPOOL f5a20f880e84306715e0be90dd0e94dd273d6e8ecf9d5c2c4c404e2ee327a8138a0b953b260c9d80380251f4bf1573755bbe22508b40a7e39d58098d0d681d1c +DIST genpatches-3.12-52.experimental.tar.xz 46536 SHA256 bee56c9470d6753eec6eb3e6c22394152c076dc3d6e6c70f09c419dbbb55d2a5 SHA512 e45d24f7058aa0a8a8b794d971ac7601cb280c2e9d4de83aa3de990d02c5349fd1692a55cb2d95415f14d60c203edf0e34887a88909ddef1e308fa8453a975cb WHIRLPOOL 02377e8beb3f63fd79aa14550e142073e2eb81a29bedf4b79f5192c506137e7ffaea7568ac7bb7f8130c45d23cfa319c0ea22fe5d8a648a721da95bce82bbd97 +DIST genpatches-3.12-52.extras.tar.xz 18240 SHA256 544b4ef8be29db0f6877adde03444a4b007c24dd48b0cec05b08632705530c17 SHA512 49f208756bfef5f717ed5a82c4a8f4e5e0274885dbe0864ceca72b7e7012a7df277a2d5f0f2e978e3deb16e7b590e9fbaddcdca388e8a248ee3a42ad7301409f WHIRLPOOL 0e7495dc5bf16a2b36558625bea4b3840c3dded0537ea6f105f652e12a4fa0c60d11ccd9b88953b8321cf923d2f27085241edfecc2ff512f52bd97c20954d366 DIST genpatches-3.14-63.base.tar.xz 1110736 SHA256 430af952731acb738d0569465120f5a60f46a5dfcdba943705ca10ed56bcc4d4 SHA512 7dcca031f1c1d48094ce5cdda960f2b3f38aa1c6022929df2125a5581fcda84330ddf0f99fa00b4d3174be5dcbd24abb569ecdd3add0f3cfbc288409310b9dee WHIRLPOOL 0d46ff7f6960470fcf2019a17885c98f27422e9c406d0019d9cb51ca14a0f122e4c95699e07324c4bc30d3e7e538377c8c15976cc619d578d10f893a3d5af0b3 DIST genpatches-3.14-63.experimental.tar.xz 60316 SHA256 60fcccec6ceec3080c0b76e12f204ba443a8bb92e22b9d3f3b72a86f9338ec87 SHA512 43c31320aace9aecf6064eb877fa21fa25a90355dccb63545edef91105ac69ea7316477ed4ff222b818a9f83e896466cac8dce872274c2fa9c851a144b7a2cd7 WHIRLPOOL 259a9a1d2e94f6f4de11e3712102d51496042ae92097a8714354bcabb70c794c45da63747d739d9f9cbe45e0b19aa7458f979c582b4c1c4e7d86ad979972b66d DIST genpatches-3.14-63.extras.tar.xz 18260 SHA256 d85286f9101952e49f47bd8919449abf7984ba8d5ad1e1711c5e66912a127fef SHA512 10c2e2ce6b227b30404deeb0d01ab0407becd042fb7d462e351ed56d47f973a8710fb07428f7941f972e6c5ba516ca3663c7745898022d3246b35a1cf47165fa WHIRLPOOL 18fe9f3149066dadef9d56e25a15edb8728a8bfb8e1d1d492f46183f90c17ddb84f3065dedee25cb38997f987d6548989818298163f07aa34d3088f49370fe15 @@ -25,6 +31,9 @@ DIST genpatches-3.14-64.extras.tar.xz 18252 SHA256 e6a4f086c0ffb45e5345bd18354c8 DIST genpatches-3.14-66.base.tar.xz 1126824 SHA256 8442fb8d0341756056aa948f6b6ea9c91cc69525d5016d48531ffd6b13c3a215 SHA512 0f9c715cad9ceec62cb589be155da3f1e081ebdfc6456c9081321b244f3a9c61163ba11dc23f34ac4f6ccb0c3d32d737ca0b58845f7cd9d8d69e05c68ffce4e0 WHIRLPOOL cbc24a82d40e1dfe8bf1e0ab8fc029186fd5b7b32cc808c1c6548df6e2d36c9f13f620fe287d139a31727eec8c6e8c9d1293cb90deb550a3f83f12728b655fc6 DIST genpatches-3.14-66.experimental.tar.xz 60296 SHA256 143a7337e4a941b7049aa8f2e4cd5e377a6f0a4d314cc9137f28f0ad63be7826 SHA512 87233a2e9367412900bd2e8c2c12c202d55ad29c520609c1e4e69206c6b21392995ac66424ca62973c69d92a0cb74c781695884fa58cc06d79fa3d0de666b268 WHIRLPOOL 4c5f49114bd3400f4b5dc4686c9bd589e851e41cd7dc869f0826850b33dfe8da193f1c7c8fbf1d76a4742eeefda8a5336e9f9c9fdb03284c983be4305b3fcb5b DIST genpatches-3.14-66.extras.tar.xz 18256 SHA256 ca4d2b5f371c96a85c29f5ecf6a746c8362b49a256a720428e9caa5c4ca9ea09 SHA512 bd588cb8668d70e7b25a28f2196d7ea314e49c13e864d20f20e8024380547a62a0b1042b6851d5f850d428b1c6a1eced5442dedcb79efafd199569513d4f0c68 WHIRLPOOL f86d4f65bcf86352960e1194d1af7c9f97bab0ecac772c53021993b949122c5cf9d53fe9c6d508206a3caa91ee6b26a19efb5e36cc4ec61553fd164960f79dcb +DIST genpatches-3.14-69.base.tar.xz 1169648 SHA256 531b3ca9e0eb4966d29a7c2cb9f7381e04e565f9f456868d7b757103d479f0d7 SHA512 1bf3fb78568a25de5bc7466edae2d9e7f66ec3bb15c1a54566cb8b2110cc0db71abe6631516f40f8567f9e7a66c5ac7dc2993a9ab0e468085abf1c535b617cdd WHIRLPOOL a0fa9d5cdd88cc9330e4d95ddce9ab24cef538e9c1cf7bfadd10fccad521f963f353bf0745ceb84d319f6afb74015c3cd8532a8562441fa0069e90d4adcb7d9b +DIST genpatches-3.14-69.experimental.tar.xz 60308 SHA256 a9bea317c6664a776786bf3217d13d6bfcbe84d15a19cd72401b372b0ea8f19b SHA512 52f91e69f840f9cd4621c11747bcb4fe3c311b5d90af2efc25eadef4a7b9d54d4fd16431a087ff7a3668e85054956890cf12d92930356e7801dbeef2a4172d96 WHIRLPOOL 77b792954914ce3e568a44046957dcd1508faa64b392d28ac1f4661145d326c43cdaba3bfff61f23cff397e596b1aecea37905993dccd5a2231a93972cac47ca +DIST genpatches-3.14-69.extras.tar.xz 18252 SHA256 f8ccd50dafb3995c51f059aac5ce27ea847f82604f89a2750d53e99768cf54c8 SHA512 4b59f7c2a3a71972e3de852ab3e4236c5fef01fde348a97a3bb2dba336f7937aa1739a7ece4c8b74d41e00dffc7374ce5ca095386580e5fb58d7e02c734edee3 WHIRLPOOL d8943dfdc86e0418926bdc5c1a6235958871c8e70f3c0d4bd1099454842b1bd616a13c8a320b420ff8e224afbf778f1673a1afc1c8d4b012dfd1522bd652d6d2 DIST genpatches-3.18-24.base.tar.xz 723760 SHA256 6b21c67c926c470cd09321d3650194b596434cadb1370ae05440168f9288fa65 SHA512 a46ea4adcc975f0946daf3f71b3e92514fb22d6992e501f381ba30dd471f2b1b25c6571d4029d1b860a14792f2e1be2af3bb72f3917022162cb1c04a8898a87e WHIRLPOOL 7e3859e47893a5b4fa1ba242fe63f4d0cd90ac0927ff8deed8cca84e830728e087a105f1807eb3eb80159b7b4d665af3acbcd92302789c9a7af31b73d7402c4c DIST genpatches-3.18-24.experimental.tar.xz 61612 SHA256 f92a05e405bca99e38597669cef64a87c1332b2e72fbc14f93ac4eab73827454 SHA512 04f2ced0957132f0454f0b80781afddf015998849841c300dd8c750977df7218b9c026e35a1b7daeb5ad04c7c590745d5b9058fb7830d6533b456587714d98d5 WHIRLPOOL 6418de81a7027e09e6e0e59ed67c11ef2656a1091e29f10264f5ad2426bc71669e74b053d55a927a831e7ce18a17bbc319fdb5297853444b51d9fa9fa1a3688c DIST genpatches-3.18-24.extras.tar.xz 16184 SHA256 0415f6e56f06b088ef78d7980c447a4a2ddf7d8915c391df0e826f8dac7a3823 SHA512 4a380e0ed2a23fd593dd22d6688e8339f9fe5508c5c7b83604e0d361890f6741418323a0dc4f5652d441d1facaaeb573811ee6770aad8c3cf512a22777a1ac77 WHIRLPOOL 98aacab957a5283b9eea0e204c275b15cece98fb7e80ca69447b0ac9cf96c52c1a11165366108de284a50650421b0f848bdf6b0fa749e55f1173aae5c103f18a @@ -34,6 +43,9 @@ DIST genpatches-3.18-25.extras.tar.xz 16180 SHA256 276495f7316026a91cbb74abc7032 DIST genpatches-3.18-26.base.tar.xz 753528 SHA256 0a3d2a302b64284353accbff19ff1a78128e900f0d4cbb0e70920034b68b4bba SHA512 723a29074dbd6970b43974655539902a92b5ba3447cba754f5719971848e2d2ca450d888a83d41fe35770806e842615bb5c5425aebf8a7118e5cd39470aafcac WHIRLPOOL 17e49e01f19a9710e6c3f6b6bb3b50ab96829a18dd60a57eb10058656845ba8e497ba4c3043f3824d69f79cb5c911c5fab6f4b8e28aa39acaa5083fca732dad0 DIST genpatches-3.18-26.experimental.tar.xz 61608 SHA256 e72de3a8865519ed658a2a769b42e2b4592ba5a6e5c98a699fbe4109f3567532 SHA512 75cd10ac41180cd5f4a1e70ea49b260a141b875f3f46dfa5edd668e507b27fe7244033c76d1e895dea58c8fc69c43ce21dc8e711884438c10b686d53c0b4c8a4 WHIRLPOOL 267a2c1abcda2d41ebf64a6034c60e73249dc4c0984326f516ac92eb16145f493549e690bfcf8f6c515984ab56368437e392fba3648f4bcc57db0351d5ee6863 DIST genpatches-3.18-26.extras.tar.xz 16188 SHA256 af0d5013a7cb6e0ec78bb5821bb4f83048d953cd10734b57085439fcdc44683d SHA512 effb9ef5722a956a9db49582b3c8aa85f5838a8573138ce867e0575348a291ccc6163e7bb8ce1698f9b5d799e81e151546c1bad59388f80b984e86f98ee8424a WHIRLPOOL 52adaba3ba161e7d1bcc8234edc9efd06bedca2211085990069b1ea8e1a35ab443e5ebfb49a7d56c3d572f9e7e69de1bdfc463abf455ba7e3155eabcdff3786a +DIST genpatches-3.18-28.base.tar.xz 820540 SHA256 def3cdebe118e6381465c7d61b4aeedbc55c63ffa5196f62afc40df6c1cf60d5 SHA512 dd48643fb5aa48539da83fabcc9423186e80ed7beabcb33a519eda876c5d925d910e0955f9b7d7592fbbec175a7948c11a9065a280e4f576b2618f156bbe00ec WHIRLPOOL cf7b3eb5635f0e1f7438cf87db2762471d78d2a4eb85d493ed2196c29df035ddbe6912fffe5cf126e81fbde5687aad11b1f3cae6c0d285468571ea01798fbcc0 +DIST genpatches-3.18-28.experimental.tar.xz 61612 SHA256 4ef8ff2340d16145f2177ef2f5e8ac43b37e57c9d9ac730bd0c992e99209a71e SHA512 94fd26d41de8a6a4d0ef82d9c261b3dd5b54ad58bfcf054e011f6495be788d687e589ae39e3012707cd48e836e678d237ccdd3dba6985c3f2086ae923616f2d0 WHIRLPOOL a325ec94646c9c05c33cb0338e9f3892804b1dc0277a2d80b1b1248c40f6ad6fe8de170f01639b8e79e86a9fe540ac1c8bf22c138dab85684dc76cbf7db5bbb3 +DIST genpatches-3.18-28.extras.tar.xz 16184 SHA256 7fe110961bc2fc65f0721d89af43d533a556f0ec567d84d40269549bdea089bb SHA512 5971522cdc227029414cd2b8e385dd857d7ce113c85c3bc18b575f97ac616fc1f586dbfe7a933ba4bcfff00e3c711d42b0e29289ba725c646bdee0efb4c1046f WHIRLPOOL 61d2bb69908c9458a03e25aeaabb5dc8b4129a0b8385199a51ba345a6e8af0994d60fe09e33b12e7fdf02ae83c1a31af9b7758ebf9d1c6c9e5527bee7e3e1f81 DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f DIST genpatches-4.1-17.base.tar.xz 411900 SHA256 a19b332a06c9486f38fa0397ddf16a107f524c8fda184a9ba3941d85e29d0f83 SHA512 32ce0d796844516cd27bfcb035ff791cbeb4c3b7cce5465268bf88a306dc1870145b6d5758fb7ef4d53acfb29bb4b8333b5b4ff7cef5a0711efea8ea11052121 WHIRLPOOL aae1f608d665f253fb106e25a51c884caa37f44961027e938daf323689c9c4b0c64071b4a7b4b6d3b07f51f2243a9b84e683aad4ea0fdcc04f09e0b97b65fb5b @@ -45,6 +57,9 @@ DIST genpatches-4.1-19.extras.tar.xz 16188 SHA256 d88c39902511c8bd0e4b80761bef8d DIST genpatches-4.1-21.base.tar.xz 462148 SHA256 0ec07c9617ee2e5f9d1f4f071c5b5696274f2a0275508a7e527ee94565b81ac4 SHA512 59d306ed7275c20e41f2056b92b180c364be645af2d0a570e35b83dece8aa314a558503d1d9cec5c0113585ad6a72297d1396d16aa82ac7cb22fe83648b104c4 WHIRLPOOL f8f35d173c1ca70b9fc6e7acb39ddcec1fece29d7a6ee51e586147aef4c2d2f1846c98a35d0cf5024687fa5f2e87031b47f6b4819764fa7cef0916018b5ba411 DIST genpatches-4.1-21.experimental.tar.xz 61644 SHA256 4237ac2effb4817c73a27a33f20cfa6704bbcc715a247754abf63dd980071f73 SHA512 8443ca5be9c2403d8d28a0ebeb3402f8d28b5f056564706addb9bb0e8255b8c095a2586b273186e1d6ca82b44fba73ffe5ed6590eb439603c5bed61809804a5c WHIRLPOOL a7b6c456e510569b3acfdeb675e51d902b39997d1d5923c66c6f446f634e45c219e7d7f90a66f0bad9267d1328a3a83a470cd7ee503884b201affea88340561b DIST genpatches-4.1-21.extras.tar.xz 16180 SHA256 f1e5767b655aa56d66b182001fbf5108294f8675bd022bbff5c470064b23c1d1 SHA512 8aacd4f8dd9fab6a106f4733872d37ce1784d309263eb4c55558bb80086ae944b85f47bc7d518f7a8798d620dd2b776ea9744f9c69d22b90a4298f5d930c4d7b WHIRLPOOL 12245af4d94106aabf55319a616cba3f089b7f11ead5cc9947e1a593ebace164bc29c813254e941f7ddfb0cc98ef6bd1844896d708f78efda06af4ba1e018610 +DIST genpatches-4.1-23.base.tar.xz 572288 SHA256 8a46e42e2fa5e8a530bae36f330ec5e03886784228c649276e2d530b738d4f25 SHA512 176f6db507ffc7e8ccfec3c4af28a7dad4118b5b145490c4c0efa24a4b6e056cad9923aed69acf8a90a0e42626c437d54c3eac18285dca1fe7e067eea63ee178 WHIRLPOOL df45ea7924444b58b8aadeb2ceff448b29c9dc0f98b911eaf4051bbb9d18edaa283e684c2e471722f77b57d7a786a0c617108b7aa0ad72a18677153083481a36 +DIST genpatches-4.1-23.experimental.tar.xz 61656 SHA256 99f83b19eaae65c2a7f36721533e0dc229d3c319afa18a66629d1c9ba4780ca6 SHA512 4be89a9aea2269dc0d77e92921df66c429eb7bed808663a511d08cab20fded79175c6c2f8874844c2d85c77ab726459f86d3682cbcfe4604a3fdb5929a42cbd9 WHIRLPOOL 2d29b6b08edf7a34f5629f75a3d5b62be691bbf518d0482d1d92e7b15551139ca353df120fbe8c9a9ef47fed1060d19f6606aa4450ca823a39a6e9134dc40416 +DIST genpatches-4.1-23.extras.tar.xz 16172 SHA256 60de73d8aef3fc161d5f8fc69ea8d355c7876ff4a75dd30c486a8ec334f84df2 SHA512 ed74a9ab953dbacc10b6c246578c78681d36544497a296f9cf76e4e43d447b4f9a6d4354ae9074fd081e748fec0b3769b193e0ccff3953070eeeccf0ed2820ec WHIRLPOOL 6a978a5093c0258d65c511b53f42ce28ed7d19fea2f9171b5265a1050d977de9855501869a98bf5f96615bcd7b39e3522835b4876d7c5d43f80646688e5772d5 DIST genpatches-4.2-11.base.tar.xz 274904 SHA256 0407b8f542450e6c1a0af439b04b6fdb9668efbfb6a70da08fc08917b543b9a3 SHA512 ec4f0bc1a53ad19329ccd3000968eadfc9411ef890e8a342c5bbbb810ad1a1abdda430354f85d3fa4a158d330023dff3ec9a02f8228720d5a339806eb9374ec4 WHIRLPOOL 375134e742a18d874212a084cb949daddbf2cb833f8480857a1c65897845e6c8cc88761a4f3bf8858081dc5131710ce1bbe2316134888ba970eb0b98f51d3e24 DIST genpatches-4.2-11.experimental.tar.xz 61620 SHA256 10111c0a06a30d661b90af17c5d50ce1ae533f55e419d253109a4a313c31121b SHA512 ecdb6aa5a53599d427f38915fb6f8955ee0dd9e9b3744de01e5eaa073e890124e6096cde67596dc853877cf39b227c8115605a71c40665d689febb02f6d193c0 WHIRLPOOL 4fcfc1aa68a6d95a3d3a91ed3d6b47308e17c433b95b0cc2bddfdf5e3dd394f5dd089b66145a4f853300cd18a6bce42e166fcec4ca1fd5a15b77724d99379dba DIST genpatches-4.2-11.extras.tar.xz 16188 SHA256 d88c39902511c8bd0e4b80761bef8d85471f08cdea3b7eec3c7e57e63fb4d33a SHA512 83ed872b30caf21f5cbeac892cf00b7633b2957708aa40d1e92b9c7b47c0e1eb72c8a3fd7c8711de3b1c1f9e39699c8d85df93c6db0165a8e8df6d2380fd5792 WHIRLPOOL 7a2deb7718ec4ecdf44fe4e810c973b6d3bf153a9a244bb5b7b5882212a3134f893460f0665a5c655f7ce73a3e90cfc63c8d2cc5c2a502706b5d35f1884899d3 @@ -60,12 +75,18 @@ DIST genpatches-4.3-4.extras.tar.xz 16292 SHA256 51f02ec53d62389b330e5247a30cc1b DIST genpatches-4.3-6.base.tar.xz 90396 SHA256 ca44364c8a8f4efa483926ad9c562f569c08fb713a1a3aaafa1e4adf10da6312 SHA512 1272acfc097f50af8af0906893a2054dfa86c5ea7a123ab63b0d43f9b403832bf043164b0c242ddb8ad61688d01d453442de4cf24cd5f1fb897763ace293ed1b WHIRLPOOL 310a5e84dff7e88613a563e6e791526f8e1766e81b084514153c8c69a615e6097e597f8ac967db929b79f0ddde5ff9dd843b54dded23cdf14642dccd26a3e949 DIST genpatches-4.3-6.experimental.tar.xz 61624 SHA256 344f1cefc1e7738451d3433fbcce3974e5599c3e8a416473e4340806b8b8323f SHA512 44411406af51d593b6fdc30c883b85acbc38b3561849dc893fb0d25094a2d4db47e55eade394645724fa9529e79410219568b830f7160abab5ecca10313e3327 WHIRLPOOL 8105c64f9d6a2c2fa7529ef1ffae78b3ab48a2790a49d3436078155b33c719192ae11c7de76c46293ab5ad3214fcb3af10792eeef8f01645c5f4392a2862e7ed DIST genpatches-4.3-6.extras.tar.xz 16280 SHA256 fc90c37419df393f084a5fbbe2d681d80aa9620c13984fb6a68b578b79504ecf SHA512 a4e347ad2181d5f2e4031f2392c33e17fb3704215ae25420a5953f9a8f8f0e5168617537c3fa07ad684540b9a8d15c7d1cb5bed62dcd8c72e75d07595d053833 WHIRLPOOL d6d736e2a3f2b816ca232caf2f9baf5e5305c1343e78fafd75d1f985d158fcc4baa438ca09c5ad34aae8b38f159c1245ab68ae872ba1455c324b13e93a4a6d74 +DIST genpatches-4.3-8.base.tar.xz 196548 SHA256 9246ac430ca198817f177093cdb628bb3eea3fad8ac0723adb38a02502cfb89a SHA512 ce2dd67fa2fba9583b9cd309d68e63b937e718cfabd9f3eb882ebc23b3139d59ff3c84beb3cf770dca367284fff6ca2bc85cf9e114da4621b7f6865b2d69dc0e WHIRLPOOL 0c5640f03d44b1219c23a7eff655b8f1749e20b30b89473c06c3a6fb0f34d30094534382ee1a1e4b5fbdffbbcce20dbe4e377410e390b8b5586ad1da9efb57fa +DIST genpatches-4.3-8.experimental.tar.xz 61636 SHA256 8f1297df01d21d8ff121549061b8a8cfb463130edb1a873c6daba6ad8c3d7894 SHA512 19df4ca02e4552befbadef8f0824eb09cccfe10fc00e48d1e684bc7e7761f4d896e605f0153c5ad7d8f96575166c4823f08d9a5f7be3df23128b39d97a685c57 WHIRLPOOL 4d6661b13be1002d9610bbd19618d77f251f6672e286ecdd9a19fccc335ccf0c3dbc9572e60919f50b562249b9589082786762cae0b961a92f056da206b17dbc +DIST genpatches-4.3-8.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c2e56e42695730a1004266b025d91dbfa2 SHA512 3513947ec3ff2a959a92c6f45ab6482d57ddf218e9ee9af70c896bfb7773135b72eed64ba7548100acc044e8e82c9a66c3dfc34757f7ef15271be65f086947a8 WHIRLPOOL 56d8afd3b28f607c3646328822f8e24da8c57f778fd1b7af61ae4a873fc980559e072447d40f6238c95a2b96a011d0e28c78d6652a759bf32121648c5b9e1d44 DIST genpatches-4.4-1.base.tar.xz 3460 SHA256 d8c94ed4b71deb4c138ab3234d9ffed1303b133f7ae2bbd6891615f0af86f849 SHA512 1b9e565f9bb173da5c9d7a4d657abb6f6f0470f8ee0cf671d638f27c9f52005b33d4984793ad8f4424215b87ab18a6fa46b2119a2d5146ccda1e9eb420525f30 WHIRLPOOL dfd911a7dbacd37e9e6c3a81501b9cfbd03ce1338c9b597f0da1e3363abf752dccdab85ebb3a494333bcdaef1fc04f9ab2f2df6797b55ce6e5f1c733be2fc737 DIST genpatches-4.4-1.experimental.tar.xz 4900 SHA256 1593bfb10d2efa52519d74b2727a4560e11ab5d6ddea2d0f0c0bc8ac59e941f6 SHA512 7523e6de6d4f58b5ebf7d46e6beee58efb96fe4711060bdb358781d95c928a16e63abc26007690df6f25addd8bb07d2034d6040e52938278a0ee8bf4aa8d3db2 WHIRLPOOL b4703ca1a8f4e79a30d1f9ef7e3457c3e6c591c2f6f626a009b609b6396764b6a03939b8fda7debf3c4e3e4f996fc6a9c6a63048f607ab96d6fbc55946f4c303 DIST genpatches-4.4-1.extras.tar.xz 16292 SHA256 b96ca9230b7dd3e91d571bf82da1ba76050cd5925c7cb537be089d5794e3a1a9 SHA512 a4826a8a652d8155665a8f39c842c0d38757230ab475e0288ce75394b2e62b88dc601b1ddb2ac5169d256ce95a9acc5ceeadc084c774d919f3ddb9e166a59067 WHIRLPOOL a53e9c415af0a8030b507479a7e8a2ff669a7bb409fc960b19b2348e367ed1f841d6339066ff211f16586965fdcaea074b50649d94120ebebdb0ca675ec3329b DIST genpatches-4.4-2.base.tar.xz 4416 SHA256 fbcbba8098ffea5957652a91de15ac41eb197443e7403b7aeb32b38b8a0d8bc7 SHA512 65cf7fc10a76be780134680811ebdbb2ed2deede73203688e5b32bef764eb2dec6bfc3399eb245082204cf571b06742dec90f9ee7cea6b34692f694cf0bc7bc6 WHIRLPOOL 554b3287f7011c62e3efe4a8e06cf635bd3768f9228fdabe25fb01b6f1acc1a47a7c96587fffe79e8aadcfe181b934c59512918453cfb27f867d5dd2d3a022d6 DIST genpatches-4.4-2.experimental.tar.xz 4904 SHA256 f1b7bf2d00c34b573d195e841efe5dfb29354d901d2b73066e57c19fd9c7b8fe SHA512 5c98ea98c4648dd2fecaf7cfc364da04d136f4b084d9c1b0b2527deb7cb52d226d5709ab0324e22d75e56d44e42cffc66add0a432639a817b59e97b275f9c232 WHIRLPOOL ab0e36bc830de699d59be6f08d6293283668a3742f216f8189dcb695ccb293c3a60ea468836321835d0bfe3336f6731647698d8252630d06f8fd96886099d2e3 DIST genpatches-4.4-2.extras.tar.xz 16272 SHA256 707735f41624d33489b10c771db536f119bcc5f0d13cbcc38e91977b8b12ec41 SHA512 4f3d9463a9e6f618e6a3a66d4b9f1ca7ffbafa2d0c13308493dd5abbb23147abbc37c0e68a38b0c11c1f424fa1b2086aae88e820a824a1313ea9531507f7f91b WHIRLPOOL d9aeba2ce4e4db0697813bf116e27ec6e91f614316b8643539fefc28f5f522532fd746a56c91e706cf6f9e621019f050dd22f60f420d2aa15d2121383fdcfe1d +DIST genpatches-4.4-5.base.tar.xz 103432 SHA256 ff3ab9884b3069ab092511aef891c8300668461b768f728bff067dc98fc0dfb9 SHA512 ba36f0f9a87a66534281a17a1bd83aa3271e41f8857ef4f27692b322bff9ef705f9d88e78699ba63055410cfb2b3c2a73c2e40c8599e74b60581bfb0d85b293b WHIRLPOOL c38af636ee6bf5bf5d2b0c5d7d3132c02efa879925b3656355e3b70d51ee253b001328225a862f68cd1a5706eaa3529231bd8cb8ed5af3baba7b072da2d2a319 +DIST genpatches-4.4-5.experimental.tar.xz 62624 SHA256 c5053b6a78375e394e099c51671fc7f83c041a3e1d6714e635df12adc4413b72 SHA512 895e0b9f2ea0839bca490ec60cccac666e51a9fd46a8a5146241329b46e4ea473af83045b876580176783b2bcf8a965235a55abb9905a5e09a5662662a2fca7e WHIRLPOOL 5a09f5f1dbf0943da25c015520579d37985a727296a8b3e0f51a4879d9fd6146be6730fd0631e0220508d3ddf90be0441848077d211f06a8fdced97b182aac8f +DIST genpatches-4.4-5.extras.tar.xz 16280 SHA256 dae9548e0a35250210f9d0c6dc3289864e4e173ff9236fdb2735ff349daec56c SHA512 c719030098d67819c8d402ac6d2c08423275bf3ae9f705932c4d22272db2d1826cd8749e26328bc59b611cc7ee3e7ab095b1005fe1fc6622d96e06dc8374d110 WHIRLPOOL 1a7437dc46838690e3d31746bb64251e5699117cdb9aa8ea2290949e31f2f284be3dc266985fd16888b68191cf075d042b9abae7e872d3b67b120020e3b0fc49 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41 diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.98.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.98.ebuild new file mode 100644 index 000000000000..1c664478f39b --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.98.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="103" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.10.95" +TUXONICE_DATE="2016-01-24" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.55.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.55.ebuild new file mode 100644 index 000000000000..3f60ee1aa986 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.55.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="52" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.12.52" +TUXONICE_DATE="2016-01-24" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.62.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.62.ebuild new file mode 100644 index 000000000000..45601c1b23b0 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.62.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="69" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.14.59" +TUXONICE_DATE="2016-01-24" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.27.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.27.ebuild new file mode 100644 index 000000000000..6ba5c7eb8f3b --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.27.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="28" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.18.25" +TUXONICE_DATE="2015-12-18" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.18.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.18.ebuild new file mode 100644 index 000000000000..baace827fd2c --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.18.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="23" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="4.1.16" +TUXONICE_DATE="2016-01-24" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.6.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.6.ebuild new file mode 100644 index 000000000000..1dbf20c8d7ab --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.6.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="8" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="4.3.4" +TUXONICE_DATE="2016-01-24" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.4.3.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.4.3.ebuild new file mode 100644 index 000000000000..cfb2f324ac4e --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.4.3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="5" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="head-4.4.0-rc7" +TUXONICE_DATE="2016-01-01" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest index d695dcf03030..1ccfda75d166 100644 --- a/sys-kernel/vanilla-sources/Manifest +++ b/sys-kernel/vanilla-sources/Manifest @@ -7,12 +7,12 @@ DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc -DIST patch-3.10.97.xz 1230652 SHA256 242f7bc6212411a3d15919bebab3a6fc119e4e340b8eb4065598a5b962a3590f SHA512 b7d8967575097c0f8f608fa4aded844381b76533ebd8fcd1411788a2e0aaff1c6693d58c33b9cb4007340804e769f400396aa04219ec5cf205a9be7ad9b75cdf WHIRLPOOL f8e5bbe60d71c89a68469e837cf10e4a631c57195589a661de730b958204e2dea296e3826757a9fdae26ad1879f94620cb2f755442c981bd4f7ca5f9c4f7e67d +DIST patch-3.10.98.xz 1241140 SHA256 28532b12b1224c182ce2aa0201d31603694ae6459cd5939667b9f4d5d04f0c1a SHA512 819fe89cee6812ad059ccd53bcd88255e628bd8ef294abe643b55333f37c5c0e666cfe5f7c09a6fb4b461ee18cfefc623ad60e15e86db8b29ea59286e6881814 WHIRLPOOL 0546e8198144984c668de8540c0163511eb2f8b199b3b0065813cee0bc62332c6b1b45b33094ec63055fe581e131f8e140cde3bdee766133a5d67870c415e99c DIST patch-3.12.54.xz 1439708 SHA256 c4fce8304d1f70645e23599100f0ba092d270df16a758086bed0cc662f720fb3 SHA512 c841db51a4dc9c9f7faa95045c660d8a40867eee748c2811d30011cc08a7613676636fef22160b037148102854847eb660fc8cf9e9a24a1414f18208e955a760 WHIRLPOOL 15b1f88aa6e3e13f99e530150dc55b4bb9f2516a726437e995690c2d618f1ea3cc67548b3eab49b85427af1bb4e8edf358a88d730ce58553f0fcb28642d2c9dd -DIST patch-3.14.61.xz 1073844 SHA256 843605d381a536dbce120b3a6a363f324a9a999320b61efd931377d603bc52b7 SHA512 961bf5566289231643cbd67b04f6dc5c452ee7691f1be87c34cdcef809d1a939fd475f875bc3cee17511ad0f6fb06e45b46296197aae0e902bcb35ad7de239ef WHIRLPOOL 423806f288fdfd25c03e4dfad749d88b5fb51c5bc482502834991cb9399cfca59bcca2a16df49d1cb029e42a4ff94c724e0854beee7dc3a127eaaa805d6a9ec6 +DIST patch-3.14.62.xz 1086096 SHA256 5a8f4a2de164edb4d921d725d6df81f26a106248536317d0b71ba30da38b1da2 SHA512 f9cbe304d7bbd85d0cdaf763a8f594fefdbd851302d66a463682d36fbcc3fd1b4e1bf71fdc57be9b88505d620dc88ceb754b7bf048a5433a2bea6f94a50dca9e WHIRLPOOL 2c8c45ed0188655f95c73389404b61bc7b3a09ccf9d807e733450d602851e0f3d705aefbdf6e51fb1ab81d5d345537acfb9df49c08924b9f2a7b2fda63accbac DIST patch-3.18.27.xz 780340 SHA256 5ab0f1f24a494fc8d208d9d1efb2d7d516f99a320b05a3201fa39706fd33473e SHA512 a0ddeda9fe9905743afd3475dcb8eed6602d959afaa50684c585ba0e84a34ecd66a3cdeeebdbf61094c32b731cf3f98cd0e96904c3327ed8be20982a1bcc3208 WHIRLPOOL f75e9c2c678b4e8cb71a53b1c14774c454e4c2a941f9b597b27b09649ed8958bdef872a4b542096c9388283cd8722541acba03646ce2787c4e48c27d1e43009f DIST patch-3.2.77.xz 1547932 SHA256 ca1a13c650fa446d8af8eb11ae41befedea57926b1e47bb263223e16779c0920 SHA512 6d2cac1816166f1d603b1682fb39473d1f27c3a3b574d3862aa51d38451d7d44a8b7036b688b4afe3cb38fb7fc7d7dc570a5ffa36b0dfafec7decbea6d7938d1 WHIRLPOOL c060c97b5bd7441c97fc2d217a6b42df9d193d9112cb3740813b885146bf5b9ce937dead8ec0ef0f221207a104499d4515b5ab694740ad31abf9df117ab1c0f5 DIST patch-3.4.110.xz 1293116 SHA256 132362637b7ba272d58acbedb172a7233c238ec1d794af111af55ee8a406e12d SHA512 fc3f95dbf831b8edf9626632983b2d38dc017ff9db8718a79c9c3f714d1114c4fc8c6673854218c5230b3f71667b735945f6f80ae11e424894570941e7431b4a WHIRLPOOL 9f1ec18591c043ba103856d2667c776bebc3369aafcb27d75174aac9d7e00653c571b245dcc8aca735838117cab62178e7a2f63a616a594fc9a508e85a997cca DIST patch-4.1.18.xz 547140 SHA256 c69cbff479740d6bbd452d2264ba0afefa99ae51bb7ae52bfbde348ea8d8b20c SHA512 b95b82452206c2ef19e9fb1b01dcd6880c74f1b1fb9d8e1f209add734ba342d7c65401f3a4a2101eaa6b20b653b265ebc863052de71e01fa886ff7d7b1c1ad17 WHIRLPOOL 3a47222b9349ebfe8820e79b70c50c145283a31c01d3a63b6ae08ee0a008ee85a408c44aa1711fc1dd808d9c7ccf090fee35b23abe9d85bc34650e7db39986e7 DIST patch-4.3.6.xz 190488 SHA256 a68b16b1f6841e2be6d492c8502cb0d0a709097b55c400ad7d90b60fa4355d6b SHA512 d0b8c278a0c7b4e829d4e98884d9c2ed6cbc4bbd6e21f3d7b6fc0f1e50a267ad871a0b82723fc4bc5e560748af4ba07e8af8f9c28a0b01307d8e6f8fcdbff0d7 WHIRLPOOL bc0323e041c666243312737b0eee284636d783acbdf36ee2ba831fa9a20396a386a772f0a2e2a41efec1df802fa241f77cf5a6e6ece04962c8389e209469c833 -DIST patch-4.4.2.xz 60144 SHA256 5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c SHA512 3222ddc913d14cd4b4ae999890afb580db9a79337dcd42876db6bbf08d351982bb1849fd97152915b570a3408ddd2be645e851736615f90ad8354244116ae12c WHIRLPOOL 3ca5d83d1a02d41e311a88a8b7e6df59586ebfd49528640e9716a3470bb88c6f02f1c79a054b3d8b246fade3a4ef248bc580b5dd7891d68cd6848c140e56a473 +DIST patch-4.4.3.xz 99576 SHA256 4a24c79c40b2cb820ce9f22d44f31edcbde5971432753ab0289772946ed05b7b SHA512 8477ecd07d06bc6c6d75dc95027920e1f41128fa8a6b382377d7a0a64ccbca719a464ef64397a3715e7ffe400640c6590ab5da691690472d1f9311ed82041d50 WHIRLPOOL 8f2c775d79731e32ed5ed3f50f3a5dd5a2a81e991a11e1d2234622bd20ccd9df3f8dcf1049f36f555238af7d7b457df738bb30e9766ff8ae5f3f4153e8078773 diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.10.97.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.10.98.ebuild index d8dab37130e2..d8dab37130e2 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-3.10.97.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-3.10.98.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.14.61.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.14.62.ebuild index d8dab37130e2..d8dab37130e2 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-3.14.61.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-3.14.62.ebuild diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.3.ebuild index d8dab37130e2..d8dab37130e2 100644 --- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.2.ebuild +++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.3.ebuild diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 2dc47953c086..d5c7e9a085bd 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,3 @@ -DIST chromium-48.0.2564.109.tar.xz 432310300 SHA256 2eb1e5b6dda718a5e501ba26f47015c1629adeb9f2bf2877bd9d8bf346abeb03 SHA512 2891384385a6ac1ebab218837ce609c16abcf2500e1d49396fea931bf0f709097b4a99c6ca11ae409d757c7c94b0f3af9d6848084047d981597c0bb0f73257cd WHIRLPOOL b5e4e8e185937b61e3e38c74be86bb1a7808090ab713cc284a38a307ad4eca4a6080fd81c42981834857845caaedd3edcd2541f90a9514a0b95236c271d62d0c DIST chromium-48.0.2564.116.tar.xz 432321192 SHA256 6a1eb9b4c853f15eeec0a55af7ac3b41835f0fc592ba6c0a500873cb12a84d0f SHA512 22c653580c1320b00e56a8b055e215b0292518af52e2d7e24b0610950ef1457a03dcec62b5417dd2e1021a2cf42b06d38b2249ee39d97aa662728f4972c54fc6 WHIRLPOOL c904185cb2e476bc253474e5ba044153bae1489a1e783bd38cd739409d46d0aa410a84553624b97e8261b1ba6ea0d6ce176703d566305634c8d8679e62c207d4 -DIST chromium-48.0.2564.82.tar.xz 432281684 SHA256 cda64bf427d01bae7d45863812edcd7fa43176238ec07c7752e42afd3e1714fd SHA512 45e50fa0a4a4ac593e95c27fc16c2699736fbdf0bb88fd84be70e17cf1b2058c8cc55cccfe5c7ab381e8d80a0816ffb1e327626992779204d85fc558a946d076 WHIRLPOOL db51d66242d8989f7db7a2c1a1e87c012b59fa6afd21b8dae745f8b9a7d5f8c5249dee95c152a9e9f4da13950b17cbc03a1d2bd23622c50e61d7f97d03181398 DIST chromium-49.0.2623.0.tar.xz 452249352 SHA256 1637e2d16c233c75c4c4094bb83af9f8ef5add2d84a1df544ad08f53d7958357 SHA512 3f1ca7cedc121fc09823a9ecd0d8a544a0ce7561e7d9e9c5c97bfab7a0d3157ede0377ace4ae124a755844eae33d551efc07b52cb55e06ffaf54749539f55edc WHIRLPOOL 06c7f034bc007a2fe04bab8323000bcaad058a2395cf7d6affcac682466f8a81e32a5fc231ab8e8851ea4f183dae51eb0842bf352c70fea2b90d2e3d6ffb39ef DIST chromium-49.0.2623.28.tar.xz 452236624 SHA256 88e15a295fd584424603a3aac0f39fdb66223f2e35284ec20487bf693873efb2 SHA512 b63df71e45fb12b012d25ec2d3de66006e4597b88b814d44aa595e3762f8405f6242758729909d378fa3010634b65829d46172b07eec7639e6b65432ad5a4f63 WHIRLPOOL 62405dfd90ca731c5e8fe0d816473506fb30956493f303e55d1af8cca6604af58ac9f1a247fa774bad2db0591e7000a795d54e2e6bc4171bef16fabd92c7a0ac diff --git a/www-client/chromium/chromium-48.0.2564.109.ebuild b/www-client/chromium/chromium-48.0.2564.109.ebuild deleted file mode 100644 index 46cec75eee75..000000000000 --- a/www-client/chromium/chromium-48.0.2564.109.ebuild +++ /dev/null @@ -1,690 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr - sv sw ta te th tr uk vi zh_CN zh_TW" - -inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \ - portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" - -LICENSE="BSD hotwording? ( no-source-code )" -SLOT="0" -KEYWORDS="amd64 ~arm ~x86" -IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" - -REQUIRED_USE="gn? ( kerberos !system-ffmpeg )" - -# Native Client binaries are compiled with different set of flags, bug #452066. -QA_FLAGS_IGNORED=".*\.nexe" - -# Native Client binaries may be stripped by the build system, which uses the -# right tools for it, bug #469144 . -QA_PRESTRIPPED=".*\.nexe" - -RDEPEND=" - app-arch/bzip2:= - cups? ( >=net-print/cups-1.3.11:= ) - >=dev-libs/elfutils-0.149 - dev-libs/expat:= - dev-libs/glib:= - >=dev-libs/jsoncpp-0.5.0-r1:= - dev-libs/nspr:= - >=dev-libs/nss-3.14.3:= - gnome? ( >=gnome-base/gconf-2.24.0:= ) - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) - >=media-libs/alsa-lib-1.0.19:= - media-libs/fontconfig:= - media-libs/freetype:= - media-libs/libexif:= - media-libs/speex:= - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) - sys-apps/dbus:= - sys-apps/pciutils:= - >=sys-libs/libcap-2.22:= - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:= - gtk3? ( x11-libs/gtk+:3= ) - !gtk3? ( x11-libs/gtk+:2= ) - x11-libs/libdrm - x11-libs/libX11:= - x11-libs/libXcomposite:= - x11-libs/libXcursor:= - x11-libs/libXdamage:= - x11-libs/libXext:= - x11-libs/libXfixes:= - >=x11-libs/libXi-1.6.0:= - x11-libs/libXinerama:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXScrnSaver:= - x11-libs/libXtst:= - x11-libs/pango:= - kerberos? ( virtual/krb5 ) - !gn? ( - >=app-accessibility/speech-dispatcher-0.8:= - app-arch/snappy:= - >=dev-libs/icu-55.1:= - >=dev-libs/libevent-1.4.13:= - dev-libs/libxml2:=[icu] - dev-libs/libxslt:= - dev-libs/re2:= - media-libs/flac:= - >=media-libs/harfbuzz-0.9.41:=[icu(+)] - >=media-libs/libjpeg-turbo-1.2.0-r1:= - media-libs/libpng:0= - >=media-libs/libwebp-0.4.0:= - sys-libs/zlib:=[minizip] - )" -DEPEND="${RDEPEND} - !arm? ( - dev-lang/yasm - ) - dev-lang/perl - dev-perl/JSON - >=dev-util/gperf-3.0.3 - dev-util/ninja - sys-apps/hwids[usb(+)] - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig" - -# For nvidia-drivers blocker, see bug #413637 . -RDEPEND+=" - !=www-client/chromium-9999 - !<www-plugins/chrome-binary-plugins-37 - x11-misc/xdg-utils - virtual/opengl - virtual/ttf-fonts - selinux? ( sec-policy/selinux-chromium ) - tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) - widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )" - -# Python dependencies. The DEPEND part needs to be kept in sync -# with python_check_deps. -DEPEND+=" $(python_gen_any_dep ' - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] -')" -python_check_deps() { - has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \ - has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \ - has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \ - has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \ - has_version "dev-python/ply[${PYTHON_USEDEP}]" && \ - has_version "dev-python/simplejson[${PYTHON_USEDEP}]" -} - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Some web pages may require additional fonts to display properly. -Try installing some of the following packages if some characters -are not displayed properly: -- media-fonts/arphicfonts -- media-fonts/bitstream-cyberbit -- media-fonts/droid -- media-fonts/ipamonafont -- media-fonts/ja-ipafonts -- media-fonts/takao-fonts -- media-fonts/wqy-microhei -- media-fonts/wqy-zenhei - -Depending on your desktop environment, you may need -to install additional packages to get icons on the Downloads page. - -For KDE, the required package is kde-frameworks/oxygen-icons. - -For other desktop environments, try one of the following: -- x11-themes/gnome-icon-theme -- x11-themes/tango-icon-theme -" - -pkg_pretend() { - if [[ $(tc-getCC)$ == *gcc* ]] && \ - [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then - die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.' - fi - - # Check build requirements, bug #541816 and bug #471810 . - CHECKREQS_MEMORY="3G" - CHECKREQS_DISK_BUILD="5G" - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - CHECKREQS_DISK_BUILD="25G" - fi - eshopts_pop - check-reqs_pkg_pretend -} - -pkg_setup() { - if [[ "${SLOT}" == "0" ]]; then - CHROMIUM_SUFFIX="" - else - CHROMIUM_SUFFIX="-${SLOT}" - fi - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" - - # Make sure the build system will use the right python, bug #344367. - python-any-r1_pkg_setup - - chromium_suid_sandbox_check_kernel_config -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-system-ffmpeg-r1.patch" - epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" - epatch "${FILESDIR}/${PN}-widevine-r1.patch" - epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch" - epatch "${FILESDIR}/${PN}-snapshot-toolchain-r0.patch" - epatch "${FILESDIR}/${PN}-system-icu-r0.patch" - - epatch_user - - local conditional_bundled_libraries="" - if ! use system-ffmpeg; then - conditional_bundled_libraries+=" third_party/ffmpeg" - fi - if use gn; then - conditional_bundled_libraries+=" - third_party/adobe - third_party/ffmpeg - third_party/flac - third_party/harfbuzz-ng - third_party/icu - third_party/jinja2 - third_party/libevent - third_party/libjpeg_turbo - third_party/libpng - third_party/libwebp - third_party/libxml - third_party/libxslt - third_party/markupsafe - third_party/re2 - third_party/snappy - third_party/speech-dispatcher - third_party/usb_ids - third_party/xdg-utils - third_party/yasm - third_party/zlib - " - fi - - # Remove most bundled libraries. Some are still needed. - build/linux/unbundle/remove_bundled_libraries.py \ - ${conditional_bundled_libraries} \ - 'base/third_party/dmg_fp' \ - 'base/third_party/dynamic_annotations' \ - 'base/third_party/icu' \ - 'base/third_party/nspr' \ - 'base/third_party/superfasthash' \ - 'base/third_party/symbolize' \ - 'base/third_party/valgrind' \ - 'base/third_party/xdg_mime' \ - 'base/third_party/xdg_user_dirs' \ - 'breakpad/src/third_party/curl' \ - 'chrome/third_party/mozilla_security_manager' \ - 'courgette/third_party' \ - 'crypto/third_party/nss' \ - 'net/third_party/mozilla_security_manager' \ - 'net/third_party/nss' \ - 'third_party/WebKit' \ - 'third_party/analytics' \ - 'third_party/angle' \ - 'third_party/angle/src/third_party/compiler' \ - 'third_party/boringssl' \ - 'third_party/brotli' \ - 'third_party/cacheinvalidation' \ - 'third_party/catapult' \ - 'third_party/catapult/third_party/py_vulcanize' \ - 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ - 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ - 'third_party/catapult/tracing/third_party/components/polymer' \ - 'third_party/catapult/tracing/third_party/d3' \ - 'third_party/catapult/tracing/third_party/gl-matrix' \ - 'third_party/catapult/tracing/third_party/jszip' \ - 'third_party/cld_2' \ - 'third_party/cros_system_api' \ - 'third_party/cython/python_flags.py' \ - 'third_party/devscripts' \ - 'third_party/dom_distiller_js' \ - 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ - 'third_party/fips181' \ - 'third_party/flot' \ - 'third_party/google_input_tools' \ - 'third_party/google_input_tools/third_party/closure_library' \ - 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ - 'third_party/hunspell' \ - 'third_party/iccjpeg' \ - 'third_party/jstemplate' \ - 'third_party/khronos' \ - 'third_party/leveldatabase' \ - 'third_party/libXNVCtrl' \ - 'third_party/libaddressinput' \ - 'third_party/libjingle' \ - 'third_party/libphonenumber' \ - 'third_party/libsecret' \ - 'third_party/libsrtp' \ - 'third_party/libudev' \ - 'third_party/libusb' \ - 'third_party/libvpx_new' \ - 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \ - 'third_party/libxml/chromium' \ - 'third_party/libwebm' \ - 'third_party/libyuv' \ - 'third_party/lss' \ - 'third_party/lzma_sdk' \ - 'third_party/mesa' \ - 'third_party/modp_b64' \ - 'third_party/mojo' \ - 'third_party/mt19937ar' \ - 'third_party/npapi' \ - 'third_party/openmax_dl' \ - 'third_party/opus' \ - 'third_party/ots' \ - 'third_party/pdfium' \ - 'third_party/pdfium/third_party/agg23' \ - 'third_party/pdfium/third_party/base' \ - 'third_party/pdfium/third_party/bigint' \ - 'third_party/pdfium/third_party/freetype' \ - 'third_party/pdfium/third_party/lcms2-2.6' \ - 'third_party/pdfium/third_party/libjpeg' \ - 'third_party/pdfium/third_party/libopenjpeg20' \ - 'third_party/pdfium/third_party/zlib_v128' \ - 'third_party/polymer' \ - 'third_party/protobuf' \ - 'third_party/qcms' \ - 'third_party/sfntly' \ - 'third_party/skia' \ - 'third_party/smhasher' \ - 'third_party/sqlite' \ - 'third_party/tcmalloc' \ - 'third_party/usrsctp' \ - 'third_party/web-animations-js' \ - 'third_party/webdriver' \ - 'third_party/webrtc' \ - 'third_party/widevine' \ - 'third_party/x86inc' \ - 'third_party/zlib/google' \ - 'url/third_party/mozilla' \ - 'v8/src/third_party/fdlibm' \ - 'v8/src/third_party/valgrind' \ - --do-remove || die -} - -src_configure() { - local myconf_gyp="" - local myconf_gn="" - - # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. - myconf_gn+=" is_debug=false" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf_gyp+=" -Ddisable_sse2=1" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf_gyp+=" -Ddisable_nacl=1" - myconf_gn+=" enable_nacl=false" - - # Make it possible to remove third_party/adobe. - echo > "${T}/flapper_version.h" || die - myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h" - - # Use system-provided libraries. - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_libsrtp (bug #459932). - # TODO: use_system_libusb (http://crbug.com/266149). - # TODO: use_system_libvpx (http://crbug.com/494939). - # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - myconf_gyp+=" - -Duse_system_bzip2=1 - -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) - -Duse_system_flac=1 - -Duse_system_harfbuzz=1 - -Duse_system_icu=1 - -Duse_system_jsoncpp=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_libxslt=1 - -Duse_system_minizip=1 - -Duse_system_nspr=1 - -Duse_system_re2=1 - -Duse_system_snappy=1 - -Duse_system_speex=1 - -Duse_system_xdg_utils=1 - -Duse_system_zlib=1" - - # Needed for system icu - we don't need additional data files. - myconf_gyp+=" -Dicu_use_data_file_flag=0" - - # TODO: patch gyp so that this arm conditional is not needed. - if ! use arm; then - myconf_gyp+=" - -Duse_system_yasm=1" - fi - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf_gyp+=" - $(gyp_use cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use gtk3) - $(gyp_use hangouts enable_hangout_services_extension) - $(gyp_use hidpi enable_hidpi) - $(gyp_use hotwording enable_hotwording) - $(gyp_use kerberos) - $(gyp_use pulseaudio) - $(gyp_use tcmalloc use_allocator tcmalloc none) - $(gyp_use widevine enable_widevine)" - - myconf_gn+=" use_cups=$(usex cups true false)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf_gyp+=" - -Dlinux_link_gsettings=1 - -Dlinux_link_libpci=1 - -Dlinux_link_libspeechd=1 - -Dlibspeechd_h_prefix=speech-dispatcher/" - - # TODO: use the file at run time instead of effectively compiling it in. - myconf_gyp+=" - -Dusb_ids_path=/usr/share/misc/usb.ids" - - # Save space by removing DLOG and DCHECK messages (about 6% reduction). - myconf_gyp+=" - -Dlogging_like_official_build=1" - - if [[ $(tc-getCC) == *clang* ]]; then - myconf_gyp+=" -Dclang=1" - myconf_gn+=" is_clang=true" - else - myconf_gyp+=" -Dclang=0" - myconf_gn+=" is_clang=false" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - # Do not use bundled clang. - myconf_gyp+=" - -Dclang_use_chrome_plugins=0 - -Dhost_clang=0 - -Dlinux_use_bundled_binutils=0 - -Dlinux_use_bundled_gold=0 - -Dlinux_use_gold_flags=0" - - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" - myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}" - - # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . - # Note: these are for Gentoo use ONLY. For your own distribution, - # please get your own set of keys. Feel free to contact chromium@gentoo.org - # for more info. - myconf_gyp+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc - -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com - -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - target_arch=x64 - ffmpeg_target_arch=x64 - elif [[ $myarch = x86 ]] ; then - target_arch=ia32 - ffmpeg_target_arch=ia32 - elif [[ $myarch = arm ]] ; then - target_arch=arm - ffmpeg_target_arch=$(usex neon arm-neon arm) - # TODO: re-enable NaCl (NativeClient). - local CTARGET=${CTARGET:-${CHOST}} - if [[ $(tc-is-softfloat) == "no" ]]; then - - myconf_gyp+=" -Darm_float_abi=hard" - fi - filter-flags "-mfpu=*" - use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" - - if [[ ${CTARGET} == armv[78]* ]]; then - myconf_gyp+=" -Darmv7=1" - else - myconf_gyp+=" -Darmv7=0" - fi - myconf_gyp+=" -Dsysroot= - $(gyp_use neon arm_neon) - -Ddisable_nacl=1" - else - die "Failed to determine target arch, got '$myarch'." - fi - - myconf_gyp+=" -Dtarget_arch=${target_arch}" - - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. - myconf_gyp+=" -Dwerror=" - myconf_gn+=" treat_warnings_as_errors=false" - - # Disable fatal linker warnings, bug 506268. - myconf_gyp+=" -Ddisable_fatal_linker_warnings=1" - - # Avoid CFLAGS problems, bug #352457, bug #390147. - if ! use custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - - # Prevent linker from running out of address space, bug #471810 . - if use x86; then - filter-flags "-g*" - fi - - # Prevent libvpx build failures. Bug 530248, 544702, 546984. - if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then - filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 - fi - fi - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX NM - - # Tools for building programs to be executed on the build system, bug #410883. - if tc-is-cross-compiler; then - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export NM_host=$(tc-getBUILD_NM) - fi - - # Bug 491582. - export TMPDIR="${WORKDIR}/temp" - mkdir -p -m 755 "${TMPDIR}" || die - - # TODO: also do this for GN bundled ffmpeg build. - if ! use system-ffmpeg && ! use gn; then - local build_ffmpeg_args="" - if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then - build_ffmpeg_args+=" --disable-asm" - fi - - # Re-configure bundled ffmpeg. See bug #491378 for example reasons. - einfo "Configuring bundled ffmpeg..." - pushd third_party/ffmpeg > /dev/null || die - chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ - --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die - chromium/scripts/copy_config.sh || die - chromium/scripts/generate_gyp.py || die - popd > /dev/null || die - fi - - third_party/libaddressinput/chromium/tools/update-strings.py || die - - touch chrome/test/data/webui/i18n_process_css_test.html || die - - einfo "Configuring Chromium..." - if use gn; then - tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die - out/Release/gn gen --args="${myconf_gn}" out/Release || die - else - build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die - egyp_chromium ${myconf_gyp} || die - fi -} - -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - local jobs=$(makeopts_jobs) - local loadavg=$(makeopts_loadavg) - - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then - NINJAOPTS+=" -j ${jobs}" - fi - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then - NINJAOPTS+=" -l ${loadavg}" - fi - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" -} - -src_compile() { - local ninja_targets="chrome chrome_sandbox chromedriver" - - if ! use gn; then - # Build mksnapshot and pax-mark it. - eninja -C out/Release mksnapshot || die - pax-mark m out/Release/mksnapshot - fi - - # Even though ninja autodetects number of CPUs, we respect - # user's options, for debugging with -j 1 or any other reason. - eninja -C out/Release ${ninja_targets} || die - - pax-mark m out/Release/chrome -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome || die - - newexe out/Release/chrome_sandbox chrome-sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" - - doexe out/Release/chromedriver || die - use widevine && doexe out/Release/libwidevinecdmadapter.so - - # if ! use arm; then - # doexe out/Release/nacl_helper{,_bootstrap} || die - # insinto "${CHROMIUM_HOME}" - # doins out/Release/nacl_irt_*.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # fi - - local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) - if [[ -n ${CHROMIUM_SUFFIX} ]]; then - sedargs+=( - -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" - -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" - -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" - ) - fi - sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die - doexe chromium-launcher.sh - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die - - dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die - - # Allow users to override command-line options, bug #357629. - dodir /etc/chromium || die - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" || die - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.bin || die - doins out/Release/*.pak || die - - if use gn; then - doins out/Release/icudtl.dat || die - fi - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die - newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die - - # Install icons and desktop entry. - local branding size - for size in 16 22 24 32 48 64 128 256 ; do - case ${size} in - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; - *) branding="chrome/app/theme/chromium" ;; - esac - newicon -s ${size} "${branding}/product_logo_${size}.png" \ - chromium-browser${CHROMIUM_SUFFIX}.png - done - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - mime_types+="x-scheme-handler/ftp;" # bug #412185 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 - make_desktop_entry \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Chromium${CHROMIUM_SUFFIX}" \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=chromium-browser" - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die - - # Install GNOME default application entry (bug #303100). - if use gnome; then - dodir /usr/share/gnome-control-center/default-apps || die - insinto /usr/share/gnome-control-center/default-apps - newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ - "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml - fi - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_print_elog -} diff --git a/www-client/chromium/chromium-48.0.2564.82.ebuild b/www-client/chromium/chromium-48.0.2564.82.ebuild deleted file mode 100644 index 91a38643a161..000000000000 --- a/www-client/chromium/chromium-48.0.2564.82.ebuild +++ /dev/null @@ -1,690 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr - sv sw ta te th tr uk vi zh_CN zh_TW" - -inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \ - portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" - -LICENSE="BSD hotwording? ( no-source-code )" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" - -REQUIRED_USE="gn? ( kerberos !system-ffmpeg )" - -# Native Client binaries are compiled with different set of flags, bug #452066. -QA_FLAGS_IGNORED=".*\.nexe" - -# Native Client binaries may be stripped by the build system, which uses the -# right tools for it, bug #469144 . -QA_PRESTRIPPED=".*\.nexe" - -RDEPEND=" - app-arch/bzip2:= - cups? ( >=net-print/cups-1.3.11:= ) - >=dev-libs/elfutils-0.149 - dev-libs/expat:= - dev-libs/glib:= - >=dev-libs/jsoncpp-0.5.0-r1:= - dev-libs/nspr:= - >=dev-libs/nss-3.14.3:= - gnome? ( >=gnome-base/gconf-2.24.0:= ) - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) - >=media-libs/alsa-lib-1.0.19:= - media-libs/fontconfig:= - media-libs/freetype:= - media-libs/libexif:= - media-libs/speex:= - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) - sys-apps/dbus:= - sys-apps/pciutils:= - >=sys-libs/libcap-2.22:= - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:= - gtk3? ( x11-libs/gtk+:3= ) - !gtk3? ( x11-libs/gtk+:2= ) - x11-libs/libdrm - x11-libs/libX11:= - x11-libs/libXcomposite:= - x11-libs/libXcursor:= - x11-libs/libXdamage:= - x11-libs/libXext:= - x11-libs/libXfixes:= - >=x11-libs/libXi-1.6.0:= - x11-libs/libXinerama:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXScrnSaver:= - x11-libs/libXtst:= - x11-libs/pango:= - kerberos? ( virtual/krb5 ) - !gn? ( - >=app-accessibility/speech-dispatcher-0.8:= - app-arch/snappy:= - >=dev-libs/icu-55.1:= - >=dev-libs/libevent-1.4.13:= - dev-libs/libxml2:=[icu] - dev-libs/libxslt:= - dev-libs/re2:= - media-libs/flac:= - >=media-libs/harfbuzz-0.9.41:=[icu(+)] - >=media-libs/libjpeg-turbo-1.2.0-r1:= - media-libs/libpng:0= - >=media-libs/libwebp-0.4.0:= - sys-libs/zlib:=[minizip] - )" -DEPEND="${RDEPEND} - !arm? ( - dev-lang/yasm - ) - dev-lang/perl - dev-perl/JSON - >=dev-util/gperf-3.0.3 - dev-util/ninja - sys-apps/hwids[usb(+)] - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig" - -# For nvidia-drivers blocker, see bug #413637 . -RDEPEND+=" - !=www-client/chromium-9999 - !<www-plugins/chrome-binary-plugins-37 - x11-misc/xdg-utils - virtual/opengl - virtual/ttf-fonts - selinux? ( sec-policy/selinux-chromium ) - tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) - widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )" - -# Python dependencies. The DEPEND part needs to be kept in sync -# with python_check_deps. -DEPEND+=" $(python_gen_any_dep ' - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] -')" -python_check_deps() { - has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \ - has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \ - has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \ - has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \ - has_version "dev-python/ply[${PYTHON_USEDEP}]" && \ - has_version "dev-python/simplejson[${PYTHON_USEDEP}]" -} - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Some web pages may require additional fonts to display properly. -Try installing some of the following packages if some characters -are not displayed properly: -- media-fonts/arphicfonts -- media-fonts/bitstream-cyberbit -- media-fonts/droid -- media-fonts/ipamonafont -- media-fonts/ja-ipafonts -- media-fonts/takao-fonts -- media-fonts/wqy-microhei -- media-fonts/wqy-zenhei - -Depending on your desktop environment, you may need -to install additional packages to get icons on the Downloads page. - -For KDE, the required package is kde-frameworks/oxygen-icons. - -For other desktop environments, try one of the following: -- x11-themes/gnome-icon-theme -- x11-themes/tango-icon-theme -" - -pkg_pretend() { - if [[ $(tc-getCC)$ == *gcc* ]] && \ - [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then - die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.' - fi - - # Check build requirements, bug #541816 and bug #471810 . - CHECKREQS_MEMORY="3G" - CHECKREQS_DISK_BUILD="5G" - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - CHECKREQS_DISK_BUILD="25G" - fi - eshopts_pop - check-reqs_pkg_pretend -} - -pkg_setup() { - if [[ "${SLOT}" == "0" ]]; then - CHROMIUM_SUFFIX="" - else - CHROMIUM_SUFFIX="-${SLOT}" - fi - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" - - # Make sure the build system will use the right python, bug #344367. - python-any-r1_pkg_setup - - chromium_suid_sandbox_check_kernel_config -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-system-ffmpeg-r1.patch" - epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" - epatch "${FILESDIR}/${PN}-widevine-r1.patch" - epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch" - epatch "${FILESDIR}/${PN}-snapshot-toolchain-r0.patch" - epatch "${FILESDIR}/${PN}-system-icu-r0.patch" - - epatch_user - - local conditional_bundled_libraries="" - if ! use system-ffmpeg; then - conditional_bundled_libraries+=" third_party/ffmpeg" - fi - if use gn; then - conditional_bundled_libraries+=" - third_party/adobe - third_party/ffmpeg - third_party/flac - third_party/harfbuzz-ng - third_party/icu - third_party/jinja2 - third_party/libevent - third_party/libjpeg_turbo - third_party/libpng - third_party/libwebp - third_party/libxml - third_party/libxslt - third_party/markupsafe - third_party/re2 - third_party/snappy - third_party/speech-dispatcher - third_party/usb_ids - third_party/xdg-utils - third_party/yasm - third_party/zlib - " - fi - - # Remove most bundled libraries. Some are still needed. - build/linux/unbundle/remove_bundled_libraries.py \ - ${conditional_bundled_libraries} \ - 'base/third_party/dmg_fp' \ - 'base/third_party/dynamic_annotations' \ - 'base/third_party/icu' \ - 'base/third_party/nspr' \ - 'base/third_party/superfasthash' \ - 'base/third_party/symbolize' \ - 'base/third_party/valgrind' \ - 'base/third_party/xdg_mime' \ - 'base/third_party/xdg_user_dirs' \ - 'breakpad/src/third_party/curl' \ - 'chrome/third_party/mozilla_security_manager' \ - 'courgette/third_party' \ - 'crypto/third_party/nss' \ - 'net/third_party/mozilla_security_manager' \ - 'net/third_party/nss' \ - 'third_party/WebKit' \ - 'third_party/analytics' \ - 'third_party/angle' \ - 'third_party/angle/src/third_party/compiler' \ - 'third_party/boringssl' \ - 'third_party/brotli' \ - 'third_party/cacheinvalidation' \ - 'third_party/catapult' \ - 'third_party/catapult/third_party/py_vulcanize' \ - 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ - 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ - 'third_party/catapult/tracing/third_party/components/polymer' \ - 'third_party/catapult/tracing/third_party/d3' \ - 'third_party/catapult/tracing/third_party/gl-matrix' \ - 'third_party/catapult/tracing/third_party/jszip' \ - 'third_party/cld_2' \ - 'third_party/cros_system_api' \ - 'third_party/cython/python_flags.py' \ - 'third_party/devscripts' \ - 'third_party/dom_distiller_js' \ - 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ - 'third_party/fips181' \ - 'third_party/flot' \ - 'third_party/google_input_tools' \ - 'third_party/google_input_tools/third_party/closure_library' \ - 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ - 'third_party/hunspell' \ - 'third_party/iccjpeg' \ - 'third_party/jstemplate' \ - 'third_party/khronos' \ - 'third_party/leveldatabase' \ - 'third_party/libXNVCtrl' \ - 'third_party/libaddressinput' \ - 'third_party/libjingle' \ - 'third_party/libphonenumber' \ - 'third_party/libsecret' \ - 'third_party/libsrtp' \ - 'third_party/libudev' \ - 'third_party/libusb' \ - 'third_party/libvpx_new' \ - 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \ - 'third_party/libxml/chromium' \ - 'third_party/libwebm' \ - 'third_party/libyuv' \ - 'third_party/lss' \ - 'third_party/lzma_sdk' \ - 'third_party/mesa' \ - 'third_party/modp_b64' \ - 'third_party/mojo' \ - 'third_party/mt19937ar' \ - 'third_party/npapi' \ - 'third_party/openmax_dl' \ - 'third_party/opus' \ - 'third_party/ots' \ - 'third_party/pdfium' \ - 'third_party/pdfium/third_party/agg23' \ - 'third_party/pdfium/third_party/base' \ - 'third_party/pdfium/third_party/bigint' \ - 'third_party/pdfium/third_party/freetype' \ - 'third_party/pdfium/third_party/lcms2-2.6' \ - 'third_party/pdfium/third_party/libjpeg' \ - 'third_party/pdfium/third_party/libopenjpeg20' \ - 'third_party/pdfium/third_party/zlib_v128' \ - 'third_party/polymer' \ - 'third_party/protobuf' \ - 'third_party/qcms' \ - 'third_party/sfntly' \ - 'third_party/skia' \ - 'third_party/smhasher' \ - 'third_party/sqlite' \ - 'third_party/tcmalloc' \ - 'third_party/usrsctp' \ - 'third_party/web-animations-js' \ - 'third_party/webdriver' \ - 'third_party/webrtc' \ - 'third_party/widevine' \ - 'third_party/x86inc' \ - 'third_party/zlib/google' \ - 'url/third_party/mozilla' \ - 'v8/src/third_party/fdlibm' \ - 'v8/src/third_party/valgrind' \ - --do-remove || die -} - -src_configure() { - local myconf_gyp="" - local myconf_gn="" - - # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. - myconf_gn+=" is_debug=false" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf_gyp+=" -Ddisable_sse2=1" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf_gyp+=" -Ddisable_nacl=1" - myconf_gn+=" enable_nacl=false" - - # Make it possible to remove third_party/adobe. - echo > "${T}/flapper_version.h" || die - myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h" - - # Use system-provided libraries. - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_libsrtp (bug #459932). - # TODO: use_system_libusb (http://crbug.com/266149). - # TODO: use_system_libvpx (http://crbug.com/494939). - # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - myconf_gyp+=" - -Duse_system_bzip2=1 - -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) - -Duse_system_flac=1 - -Duse_system_harfbuzz=1 - -Duse_system_icu=1 - -Duse_system_jsoncpp=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_libxslt=1 - -Duse_system_minizip=1 - -Duse_system_nspr=1 - -Duse_system_re2=1 - -Duse_system_snappy=1 - -Duse_system_speex=1 - -Duse_system_xdg_utils=1 - -Duse_system_zlib=1" - - # Needed for system icu - we don't need additional data files. - myconf_gyp+=" -Dicu_use_data_file_flag=0" - - # TODO: patch gyp so that this arm conditional is not needed. - if ! use arm; then - myconf_gyp+=" - -Duse_system_yasm=1" - fi - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf_gyp+=" - $(gyp_use cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use gtk3) - $(gyp_use hangouts enable_hangout_services_extension) - $(gyp_use hidpi enable_hidpi) - $(gyp_use hotwording enable_hotwording) - $(gyp_use kerberos) - $(gyp_use pulseaudio) - $(gyp_use tcmalloc use_allocator tcmalloc none) - $(gyp_use widevine enable_widevine)" - - myconf_gn+=" use_cups=$(usex cups true false)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf_gyp+=" - -Dlinux_link_gsettings=1 - -Dlinux_link_libpci=1 - -Dlinux_link_libspeechd=1 - -Dlibspeechd_h_prefix=speech-dispatcher/" - - # TODO: use the file at run time instead of effectively compiling it in. - myconf_gyp+=" - -Dusb_ids_path=/usr/share/misc/usb.ids" - - # Save space by removing DLOG and DCHECK messages (about 6% reduction). - myconf_gyp+=" - -Dlogging_like_official_build=1" - - if [[ $(tc-getCC) == *clang* ]]; then - myconf_gyp+=" -Dclang=1" - myconf_gn+=" is_clang=true" - else - myconf_gyp+=" -Dclang=0" - myconf_gn+=" is_clang=false" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - # Do not use bundled clang. - myconf_gyp+=" - -Dclang_use_chrome_plugins=0 - -Dhost_clang=0 - -Dlinux_use_bundled_binutils=0 - -Dlinux_use_bundled_gold=0 - -Dlinux_use_gold_flags=0" - - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" - myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}" - - # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . - # Note: these are for Gentoo use ONLY. For your own distribution, - # please get your own set of keys. Feel free to contact chromium@gentoo.org - # for more info. - myconf_gyp+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc - -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com - -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - target_arch=x64 - ffmpeg_target_arch=x64 - elif [[ $myarch = x86 ]] ; then - target_arch=ia32 - ffmpeg_target_arch=ia32 - elif [[ $myarch = arm ]] ; then - target_arch=arm - ffmpeg_target_arch=$(usex neon arm-neon arm) - # TODO: re-enable NaCl (NativeClient). - local CTARGET=${CTARGET:-${CHOST}} - if [[ $(tc-is-softfloat) == "no" ]]; then - - myconf_gyp+=" -Darm_float_abi=hard" - fi - filter-flags "-mfpu=*" - use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" - - if [[ ${CTARGET} == armv[78]* ]]; then - myconf_gyp+=" -Darmv7=1" - else - myconf_gyp+=" -Darmv7=0" - fi - myconf_gyp+=" -Dsysroot= - $(gyp_use neon arm_neon) - -Ddisable_nacl=1" - else - die "Failed to determine target arch, got '$myarch'." - fi - - myconf_gyp+=" -Dtarget_arch=${target_arch}" - - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. - myconf_gyp+=" -Dwerror=" - myconf_gn+=" treat_warnings_as_errors=false" - - # Disable fatal linker warnings, bug 506268. - myconf_gyp+=" -Ddisable_fatal_linker_warnings=1" - - # Avoid CFLAGS problems, bug #352457, bug #390147. - if ! use custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - - # Prevent linker from running out of address space, bug #471810 . - if use x86; then - filter-flags "-g*" - fi - - # Prevent libvpx build failures. Bug 530248, 544702, 546984. - if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then - filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 - fi - fi - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX NM - - # Tools for building programs to be executed on the build system, bug #410883. - if tc-is-cross-compiler; then - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export NM_host=$(tc-getBUILD_NM) - fi - - # Bug 491582. - export TMPDIR="${WORKDIR}/temp" - mkdir -p -m 755 "${TMPDIR}" || die - - # TODO: also do this for GN bundled ffmpeg build. - if ! use system-ffmpeg && ! use gn; then - local build_ffmpeg_args="" - if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then - build_ffmpeg_args+=" --disable-asm" - fi - - # Re-configure bundled ffmpeg. See bug #491378 for example reasons. - einfo "Configuring bundled ffmpeg..." - pushd third_party/ffmpeg > /dev/null || die - chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ - --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die - chromium/scripts/copy_config.sh || die - chromium/scripts/generate_gyp.py || die - popd > /dev/null || die - fi - - third_party/libaddressinput/chromium/tools/update-strings.py || die - - touch chrome/test/data/webui/i18n_process_css_test.html || die - - einfo "Configuring Chromium..." - if use gn; then - tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die - out/Release/gn gen --args="${myconf_gn}" out/Release || die - else - build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die - egyp_chromium ${myconf_gyp} || die - fi -} - -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - local jobs=$(makeopts_jobs) - local loadavg=$(makeopts_loadavg) - - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then - NINJAOPTS+=" -j ${jobs}" - fi - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then - NINJAOPTS+=" -l ${loadavg}" - fi - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" -} - -src_compile() { - local ninja_targets="chrome chrome_sandbox chromedriver" - - if ! use gn; then - # Build mksnapshot and pax-mark it. - eninja -C out/Release mksnapshot || die - pax-mark m out/Release/mksnapshot - fi - - # Even though ninja autodetects number of CPUs, we respect - # user's options, for debugging with -j 1 or any other reason. - eninja -C out/Release ${ninja_targets} || die - - pax-mark m out/Release/chrome -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome || die - - newexe out/Release/chrome_sandbox chrome-sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" - - doexe out/Release/chromedriver || die - use widevine && doexe out/Release/libwidevinecdmadapter.so - - # if ! use arm; then - # doexe out/Release/nacl_helper{,_bootstrap} || die - # insinto "${CHROMIUM_HOME}" - # doins out/Release/nacl_irt_*.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # fi - - local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) - if [[ -n ${CHROMIUM_SUFFIX} ]]; then - sedargs+=( - -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" - -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" - -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" - ) - fi - sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die - doexe chromium-launcher.sh - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die - - dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die - - # Allow users to override command-line options, bug #357629. - dodir /etc/chromium || die - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" || die - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.bin || die - doins out/Release/*.pak || die - - if use gn; then - doins out/Release/icudtl.dat || die - fi - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die - newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die - - # Install icons and desktop entry. - local branding size - for size in 16 22 24 32 48 64 128 256 ; do - case ${size} in - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; - *) branding="chrome/app/theme/chromium" ;; - esac - newicon -s ${size} "${branding}/product_logo_${size}.png" \ - chromium-browser${CHROMIUM_SUFFIX}.png - done - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - mime_types+="x-scheme-handler/ftp;" # bug #412185 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 - make_desktop_entry \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Chromium${CHROMIUM_SUFFIX}" \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=chromium-browser" - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die - - # Install GNOME default application entry (bug #303100). - if use gnome; then - dodir /usr/share/gnome-control-center/default-apps || die - insinto /usr/share/gnome-control-center/default-apps - newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ - "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml - fi - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_print_elog -} diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest index dd6428b6365e..6030a1652de0 100644 --- a/www-client/opera-beta/Manifest +++ b/www-client/opera-beta/Manifest @@ -1,2 +1,4 @@ DIST opera-beta_35.0.2066.35_amd64.deb 45196244 SHA256 fffa77b114ce8434d4b48987042f26a919e319a40ad61250af891e6119fa9d0e SHA512 c75798d17f59aff11e5e58f21d5606f9d92b1136bcddc901662f5adba1ddc400729a653c12e39d2cf7754e741834f46f82ba44c39220371c037c73964e72d539 WHIRLPOOL f6b8b7133d701a60baca44f93160e4d67bbe65aa45643fed6b84e337926582b784e488e4287806dd88b03dbd46abd673eefa9d880ef71e5d775b81d4732697d7 +DIST opera-beta_36.0.2130.21_amd64.deb 47382256 SHA256 3ac3a2a9b8f6d69ad1de88859405115acb83269447697f758b6e713ba647a766 SHA512 2de58ea2f48c17007abd945bb8f7dc4f0552a2ddf9136707f8c3fadcaa7be02ead018108f34e1e6886c50e2d6698f4038cc13b5ed1a15ae721cc111e571701d2 WHIRLPOOL abf6a9d6b25c530f74daeeff2136af7556e0b7a701b0780d38b87ba5addc801eaaae14abe5373243ed344e984ec8c558a945c887cdcaa64d0bb0096910b19cd4 +DIST opera-beta_36.0.2130.21_i386.deb 48429050 SHA256 7f799a406689bba3ccfc34f632257c2f3632e857872d5de835f356b5dc0f9da0 SHA512 5c92180cd9416586fa811c620e4a985de6fe7072c0f2677e6d48c7fbd44665ec11b93f20d689811febc135899487a30ab03f241f4bf714052575f6987750bdc9 WHIRLPOOL 80c22311d869ab033f784756ad702e45a4d44101ba0d7199e5c533bc3b85d85df009683a98ad37e921394567186bdfd6c6244bbbf80d7f3e05bb5bb8830d3c84 DIST opera-beta_36.0.2130.2_amd64.deb 46519260 SHA256 ce314768010d605e1a365dabea5b8cd02c0c9bd33abca6e94515f8ff39299295 SHA512 c5502bbbacbd501408b0502d656053ef429cd1e25124438fb68e1615c8a7f367b7efe6d56124d8c8a2d8a702215523027d739fe40bad74e9196a618f02dfacba WHIRLPOOL abfa182bb930fa853f5df3a9d484c305bf7be5bb0ae695470d8b66aa18c74fbafe6408d98699a68417870c53b025b87d6de3712fbad9860ca399f732284216a6 diff --git a/www-client/opera-beta/opera-beta-36.0.2130.21.ebuild b/www-client/opera-beta/opera-beta-36.0.2130.21.ebuild new file mode 100644 index 000000000000..bfeded8ebfc9 --- /dev/null +++ b/www-client/opera-beta/opera-beta-36.0.2130.21.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CHROMIUM_LANGS=" + af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd + hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk + sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu +" +inherit chromium multilib unpacker + +DESCRIPTION="A fast and secure web browser" +HOMEPAGE="http://www.opera.com/" +LICENSE="OPERA-2014" +SLOT="0" +SRC_URI_BASE="http://get.geo.opera.com/pub/" +SRC_URI=" + amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" ) + x86? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" ) +" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + gnome-base/gconf:2 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + net-misc/curl + net-print/cups + sys-apps/dbus + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libnotify + x11-libs/pango[X] +" + +QA_PREBUILT="*" +S=${WORKDIR} +OPERA_HOME="usr/$(get_libdir)/${PN}" + +src_unpack() { + unpack_deb ${A} +} + +src_prepare() { + case ${ARCH} in + amd64) + mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die + rm -r usr/lib || die + ;; + x86) + mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die + ;; + esac + + rm usr/bin/${PN} || die + + rm usr/share/doc/${PN}/copyright || die + mv usr/share/doc/${PN} usr/share/doc/${PF} || die + + pushd "${OPERA_HOME}/localization" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + sed -i \ + -e 's|^TargetEnvironment|X-&|g' \ + usr/share/applications/${PN}.desktop || die +} + +src_install() { + mv * "${D}" || die + dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN} + fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox +} diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest index 9d05e9360750..9a17289b021b 100644 --- a/www-client/vivaldi/Manifest +++ b/www-client/vivaldi/Manifest @@ -2,3 +2,5 @@ DIST vivaldi-1.0.390.3_p1-amd64.deb 44041614 SHA256 18e976f4a500ca069ac85520562f DIST vivaldi-1.0.390.3_p1-i386.deb 44459070 SHA256 9fb5a5e468a04021d01f28ad08ac8df5c61edf7f0e01b02e73e7b57b2d1dd5c8 SHA512 56782ea9767a7e44872548ee8a4aa5d3f5a6073bd2ae533b175a4943b6c7c73b353a42aca9b239a9af52825df6cb83842ee5267e7a9177d1c5202ef8a4c1808e WHIRLPOOL 0272db44cbab2af8b37f4fffde1ad026cf9ba5686522a77f509c7a0b745d7d632e472a2a77a488b58edb4e1eef1e38d087e7586902035d839cf4982c11cb076f DIST vivaldi-1.0.403.15_p1-amd64.deb 43941722 SHA256 757553335e53334d378c67775221447b350214638e368a7c8a7bf3fcc3fa43d5 SHA512 96ab3eb2bcbbf51f3c5c730774e0f08c642a90fe89c34ad559bcad85f0a9efb1c24e2dfdf6ff82f06a981a6fe733f46033311ecbcdf72d2a358b7d1dd709e350 WHIRLPOOL 056cdc318f3e0cd6df59e0421d820a9b80f3fe2eec47e71cb5bc3a15ac239d4ff53417be51558c6fda0b37dfb2c5841b1025bd9f2c82f485c3d017725d728c55 DIST vivaldi-1.0.403.15_p1-i386.deb 44476594 SHA256 d0e108dd6d0f1405864239e2d15121fa1d8b7607bccc662b9517f9300aec8fa4 SHA512 9ba36227087f2c5935e9a7fecf5c0dcd659204e413ea70cfa1d27273e828badad41f4f9f97bbc78610406ff259f32535aeaf17e6e2e63849dd55d582a7c14110 WHIRLPOOL 1307a85fbca3f5b08c0ca46923f38e3d1ebda309f6f4f161ff13bd748e606c071f43c5a284aadab183345dc5fd5bc29245a9fb5b7d7196cf8dc9e363a1a47142 +DIST vivaldi-1.0.403.17_p1-amd64.deb 44005668 SHA256 18a6b14f9340b00b61e4e1433a3fd4a91a0e42490d69cf38332385dfd0911191 SHA512 9646c0bf48f52ac1d9bd3ce54f4c12bad7731625cf50b47610b05d85fb12deeeeda2c0b148a002c8dbdf5880fb6dc7a82475f137fe4aaeaac04a7a0c9fd22565 WHIRLPOOL 6381a2e1d5cee119ade5c8364b83fa195397aa497e912f8236a6c831aae975cfb8a2ad785be602278df8e542dbaf324267ed0e8ada8295f7ae3a77343977f077 +DIST vivaldi-1.0.403.17_p1-i386.deb 44537126 SHA256 30833b37178e57c061b63d85c63858329b2a67db68b4d3cb6e843780972d3f97 SHA512 3b7c03d8b6926cc5bf696ca2aeb19aa13b41b84487730c45f823303cac2704a1ccb8170479c4b0d9c08190c2b5adcb13391225f401f86d58b0d38ca3d20db5d5 WHIRLPOOL cc65888ceeb6caa57302172315750f9cac6788dadcb7a3bf835dcb9b6f29ac5ddfa7b4acd0b2a0ff68be64baf380d574222fd37c47f391c7974a64b71926ff4a diff --git a/www-client/vivaldi/vivaldi-1.0.403.17_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.403.17_p1.ebuild new file mode 100644 index 000000000000..f985379c7cbb --- /dev/null +++ b/www-client/vivaldi/vivaldi-1.0.403.17_p1.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CHROMIUM_LANGS=" + am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he hi + hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv + sw ta te th tr uk vi zh_CN zh_TW +" +inherit chromium eutils multilib unpacker toolchain-funcs + +DESCRIPTION="A new browser for our friends" +HOMEPAGE="http://vivaldi.com/" +VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_" +SRC_URI=" + amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb ) + x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb ) +" + +LICENSE="Vivaldi" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RESTRICT="bindist mirror" + +S=${WORKDIR} + +RDEPEND=" + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + >=dev-libs/openssl-1.0.1:0 + gnome-base/gconf:2 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + net-misc/curl + net-print/cups + sys-apps/dbus + sys-libs/libcap + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/pango[X] +" + +QA_PREBUILT="*" +S=${WORKDIR} +VIVALDI_HOME="opt/${PN}-snapshot" + +src_unpack() { + unpack_deb ${A} +} + +src_prepare() { + sed -i \ + -e "s|@LIBDIR@|$(get_libdir)|g" \ + opt/vivaldi-snapshot/vivaldi-snapshot || die + + sed -i \ + -e 's|vivaldi-snapshot|vivaldi|g' \ + usr/share/applications/${PN}-snapshot.desktop \ + usr/share/xfce4/helpers/${PN}-snapshot.desktop || die + + mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die + + rm \ + _gpgbuilder \ + etc/cron.daily/${PN}-snapshot \ + usr/bin/${PN}-snapshot \ + || die + rmdir \ + etc/cron.daily/ \ + etc/ \ + || die + + local c d + for d in 16 22 24 32 48 64 128 256; do + mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die + cp \ + ${VIVALDI_HOME}/product_logo_${d}.png \ + usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die + done + + pushd "${VIVALDI_HOME}/locales" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + +} + +src_install() { + mv * "${D}" || die + dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN} + + fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox +} diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest index 00a5f8f6d5ae..cb65733d4a8b 100644 --- a/x11-drivers/xf86-input-libinput/Manifest +++ b/x11-drivers/xf86-input-libinput/Manifest @@ -1,4 +1,4 @@ DIST xf86-input-libinput-0.14.0.tar.bz2 312256 SHA256 e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265 SHA512 229b45cb9e76ca96dce4247b421135ff74054f2cbcfd019d2ceb409fdb4bc8166e3fa1d068ba6e8f6d6ac0c44ade275e31cc6a1ee6d7f6de8918eced5c59d508 WHIRLPOOL 45400e7966d730fe809043ced977dc0faa456336157dba9049558f0489463c8ade5f9a130b77ea2e85ae82e27c320e1f70780acca53fae253f930a53c0ac823b -DIST xf86-input-libinput-0.15.0.tar.bz2 314205 SHA256 28707c504194648b11a1e26acf13039b60bf344efa6aa9788afed6d47f019a41 SHA512 f9c9f5f09537cd4830bd17720135102a9b02454e0acc4a80230ddd066c39a106c91260f7774da364760fd4f3b59b8ba9ab6abc83ad49ae6e9dad1609b9b25cf4 WHIRLPOOL 3dad70a7ce44dd8812d4dd1ebdcf7325c521b5dce4763c87bdd89962df577a4d9b9cf457ca7d72cc987554034636429d2f047b8a7cf257bd79b2c233e56f3925 DIST xf86-input-libinput-0.16.0.tar.bz2 340816 SHA256 fdade531e91e79acf6dce8ac55fa4f65abe3f1358c5d3d777ae48dbc74b76f49 SHA512 6b1243a29d94e6b26e92da04ce9d308d0957c46fcacb16711f5037f351bb48e9e80070a7e8d4f7e934698d4b394df982c81df489a8bb8b8f6021e2c99c0b0c19 WHIRLPOOL e0b13a91c54d9823ff03ea4fe67ce48abe744c9bb3929c81286794e8edb5211668237d75d578c64df22bc1b286a97cba2e5769c6cb7b96aff0611c9c7107eacc +DIST xf86-input-libinput-0.17.0.tar.bz2 341722 SHA256 2a378a25da46a875b6699ada29332290798e37df708ab2f2e4b0915ef1fbbab2 SHA512 738d4937f25dcb432bd664a204cbd4c66f38bd3385040ec56bc1949842d7099491d4ad96f2ba68342119046ed3d94ac562568f228c6a38686ba6cc86e9256f4d WHIRLPOOL ad45e800c223fd26edc1f2fcfe1c6895655b50a3b1c53a75e1221b8b3f7448a6c724b080bf18299c237581fcbedf5e0a9e1f5e0c69e475703f7de79da2bc94c8 DIST xf86-input-libinput-0.6.0.tar.bz2 287826 SHA256 2f29be1ed7f9b9c597b6f5c6ef24c37a244a0ba87ccd1c2586ffa4d08452ad79 SHA512 536324b4bf52b6a1905655d6d82af5d12d40503e48018e10b1922bcfd18bddad742a716bcc7588188993f46f9724874456e90a70e5a764432f968a66a9d2b639 WHIRLPOOL 5d8994c86b5682d7e5ae0e53b7c8d1b13fdba304603b9ecf3c97297ab732e59111f4c902403a6d0a19492f3e34a7b9a718fbbe105591da19260a3c1f3e2c2a4b diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.15.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.17.0.ebuild index a59a6b472a25..f87e480f668b 100644 --- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.15.0.ebuild +++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.17.0.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$ @@ -11,7 +11,7 @@ DESCRIPTION="X.org input driver based on libinput" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" IUSE="" -RDEPEND=">=dev-libs/libinput-1.1.0:0=" +RDEPEND=">=dev-libs/libinput-1.2.0:0=" DEPEND="${RDEPEND}" DOCS=( "README.md" "conf/90-libinput.conf" ) diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest index b88cabaa8bc1..c1246d90111e 100644 --- a/x11-drivers/xf86-video-intel/Manifest +++ b/x11-drivers/xf86-video-intel/Manifest @@ -1,5 +1,5 @@ DIST xf86-video-intel-2.21.15.tar.bz2 1977431 SHA256 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc SHA512 ca9680716445d0e9ba1a5d87433455f7a5f558802b4d214d79496426dbfd3e598968f784b531de024df30fefcc114d6e40cc9c6da94604beb48cd4430bf9e491 WHIRLPOOL 352b114b1030d1fbe2d33f028e7c03be8b4a6a4b0e4cb4fd7c890dd4cc5594ebf1fd6477c9319c1e2ff5033fc3276fb9caa8d91d1d3ba6b0c2f1734b60d3efed DIST xf86-video-intel-2.9.1.tar.bz2 789001 SHA256 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76 SHA512 62a7c1852b2d0b89be93536e7852caf398fc743e11a12c5071baed5e767b29c382ff5eb9d6c3ab453fc4d94aa16245b607ef33b94198bf7c7626746772fcc290 WHIRLPOOL 7e61c5d1396829aa354c9fdfbe5a21723171390d86b3307a2a331061e128a9866408993410090fe5d607609d245c55843633730bc4521e9cb0ec478c8d6ede1c DIST xf86-video-intel-2.99.917.tar.bz2 2259040 SHA256 00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9 SHA512 cbf4d46ad1ad5e5587c0f1f620ff534ef0645270517b60056b9f03e83d8216e2f456de46352a06c37c0c46963cc4ed20b71b815b20ec1bf680ff046e535f580f WHIRLPOOL b26f1b303a27825120e1036f15493119e8869ebae74a2663204fe1ee63cf9fc217e593c469d6c33151a73c9ea6e9df88d0e3a0bb74ece5109b51593785fd4d7d -DIST xf86-video-intel-2.99.917_p20160213.tar.xz 933036 SHA256 0c0b67ef52d02080f1361bde45b7bd4f901e6d64028e1a768223d63769f72616 SHA512 b762afdde5ef8eaf0e310985fbfd0c192f7463b3114507e3ed7edb16c99bbcf28e4c439d257d59d937c5b1e9f240d512a1025ebd23a0984160a8339df3a30995 WHIRLPOOL 723474bba515f222f2aa5392fc9dc8dc6d3cf548f6ffd1b0396f9c78b148588424da703fe9ade5730bd33f99ce10f4de77738e6a7d46212f1425ab2e82faa205 DIST xf86-video-intel-2.99.917_p20160218.tar.xz 933036 SHA256 0c0b67ef52d02080f1361bde45b7bd4f901e6d64028e1a768223d63769f72616 SHA512 b762afdde5ef8eaf0e310985fbfd0c192f7463b3114507e3ed7edb16c99bbcf28e4c439d257d59d937c5b1e9f240d512a1025ebd23a0984160a8339df3a30995 WHIRLPOOL 723474bba515f222f2aa5392fc9dc8dc6d3cf548f6ffd1b0396f9c78b148588424da703fe9ade5730bd33f99ce10f4de77738e6a7d46212f1425ab2e82faa205 +DIST xf86-video-intel-2.99.917_p20160224.tar.xz 933972 SHA256 7406ef1646be39d1130f76f8d60d29a9278d0561f1fcb8b6bfe0851533755e2b SHA512 a0d78ec9db62447c1851fc24952b02a0c0ac063b229053ab6c11cde7fee4e81c3ae7b9ae93d0d9e2171c3dfe986312f6cb433208362b5b5c7dac65e8b1984391 WHIRLPOOL 497225db28fba4c5a92934d6ec92095061819876b3fbfca0987c76a9dbe786a78666dc470dad9a901356e2c380d0f1eb7ee4ee44c68e8e31a55e2544a1408fdb diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160213.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160224.ebuild index 8ebdc86a8538..b13f3a0c89a3 100644 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160213.ebuild +++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160224.ebuild @@ -5,13 +5,14 @@ EAPI=5 XORG_DRI=dri +XORG_EAUTORECONF=yes inherit linux-info xorg-2 DESCRIPTION="X.Org driver for Intel cards" KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd" -IUSE="debug dri3 +sna +udev uxa xvmc" -COMMIT_ID="636b52913cac10e691834a699cff10fb94d395fa" +IUSE="debug +dri3 +sna +udev uxa xvmc" +COMMIT_ID="d1672806a5222f00dcc2eb24ccddd03f727f71bc" SRC_URI="http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz" S=${WORKDIR}/${COMMIT_ID} @@ -39,16 +40,11 @@ RDEPEND="x11-libs/libXext ) " DEPEND="${RDEPEND} - x11-misc/util-macros >=x11-proto/dri2proto-2.6 x11-proto/dri3proto x11-proto/presentproto x11-proto/resourceproto" -src_prepare() { - eautoreconf -} - src_configure() { XORG_CONFIGURE_OPTIONS=( $(use_enable debug) diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch new file mode 100644 index 000000000000..77ea7e75521e --- /dev/null +++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch @@ -0,0 +1,34 @@ +From 21b8eb73d9272e06707ad6d0357f3034b8d9a46f Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" <blueness@gentoo.org> +Date: Wed, 14 Oct 2015 16:18:19 -0400 +Subject: [PATCH] tests/pixbuf-lowmem.c: Do not run pixbuf-lowmem test on + uClibc + +pixbuf-lowmem.c depends on GNU libc internals and does not build +on musl or uClibc. Commit e1fd25a fixes this issue for musl by +testing if __GLIBC__ is set. However, uClibc sets __GLIBC__ and +so this check is insufficient there. We expand the check so that +we run pixbuf-lowmem on glibc, while avoiding it on both musl and +uClibc. + +Signed-off-by: Anthony G. Basile <blueness@gentoo.org> +--- + tests/pixbuf-lowmem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c +index 9e9571f..ec7504f 100644 +--- a/tests/pixbuf-lowmem.c ++++ b/tests/pixbuf-lowmem.c +@@ -24,7 +24,7 @@ + #include <time.h> + #include <string.h> + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + #define PRETEND_MEM_SIZE (16 * 1024 * 1024) + #define REMAINING_MEM_SIZE 100000 + +-- +2.4.9 + diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild index a8fa23988b1b..5ca298a56ad7 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild @@ -43,6 +43,9 @@ MULTILIB_CHOST_TOOLS=( ) src_prepare() { + # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 + epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch + # This will avoid polluting the pkg-config file with versioned libpng, # which is causing problems with libpng14 -> libpng15 upgrade # See upstream bug #667068 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild index 27a8968bf53e..b7f65978e990 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild @@ -43,6 +43,9 @@ MULTILIB_CHOST_TOOLS=( ) src_prepare() { + # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 + epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch + # This will avoid polluting the pkg-config file with versioned libpng, # which is causing problems with libpng14 -> libpng15 upgrade # See upstream bug #667068 diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest index 3d29b4ce30ce..fc01b70a3a41 100644 --- a/x11-misc/shared-mime-info/Manifest +++ b/x11-misc/shared-mime-info/Manifest @@ -1,2 +1,3 @@ DIST shared-mime-info-1.4.tar.xz 537916 SHA256 bbc0bd023f497dfd75e1ca73441cbbb5a63617d9e14f2790b868361cc055b5b1 SHA512 ac643a5360c1e4811b2df8e3c52434e5ee48f8e62a01ede3fb0895d30721b58b5b26c0edc43f779576ff899bd1a8b181699a08dbbb1e956394555f6ca983a582 WHIRLPOOL 32cb301cd54140b83af8c321b7ebc571b87b07ca86bfc68e6760e4dd3551188a092a96087042b13f1278c11cd88c261879fc816d0c2efcbee473211d929194bf DIST shared-mime-info-1.5.tar.xz 559040 SHA256 d6412840eb265bf36e61fd7b6fc6bea21b0f58cb22bed16f2ccccdd54bea4180 SHA512 8a97c8fa5a60eede056a42c36d9f8d015bf2788feca4630397ef71ba2cfe29ad469fb1669c368674edd4661af6b2f6823377cc27525f44c61788533c0c28e22a WHIRLPOOL 157dfc0f3a6aacde8ca734217f9a3b2e8baa9bc0254a2024716136215624e642b25537216f79c9a95ba55ee70dff872eb746cb3e0e07cb31a8a190d7d5bf6b7b +DIST shared-mime-info-1.6.tar.xz 557240 SHA256 b2f8f85b6467933824180d0252bbcaee523f550a8fbc95cc4391bd43c03bc34c SHA512 01c57759d363a2f0513cda94de5eb236f3d56683630a1be12278d9043d6184cf5f04a25b9cdca76b72fe42590542dfd41ae39f4e9bcd9cb239c200e9079a5840 WHIRLPOOL d8c1a5cee530eb919d3f65c1c90fe3f443c4adee5f9e0cc4ed850866625776c532fac5d48c38607e23af516b98800a5016e35e6364ccb1ff7f30f2644fc16f6e diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild new file mode 100644 index 000000000000..90fa11491507 --- /dev/null +++ b/x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils fdo-mime + +DESCRIPTION="The Shared MIME-info Database specification" +HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info" +SRC_URI="http://people.freedesktop.org/~hadess/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" + +RDEPEND=">=dev-libs/glib-2 + dev-libs/libxml2" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +DOCS=( ChangeLog HACKING NEWS README ) + +src_prepare() { + epatch_user +} + +src_configure() { + export ac_cv_func_fdatasync=no #487504 + + econf \ + $(use_enable test default-make-check) \ + --disable-update-mimedb +} + +src_compile() { + # FIXME: 0.91 fails with -j9 every second time like: + # update_mime_database-update-mime-database.o: file not recognized: File truncated + # collect2: ld returned 1 exit status + emake -j1 +} + +src_install() { + default + + # in prefix, install an env.d entry such that prefix patch is used/added + if use prefix; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo + doenvd "${T}"/50mimeinfo + fi +} + +pkg_postinst() { + use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share + fdo-mime_mime_database_update +} diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest index 1c873f67e682..d71005f59ded 100644 --- a/x11-terms/mlterm/Manifest +++ b/x11-terms/mlterm/Manifest @@ -1,3 +1,3 @@ DIST mlterm-3.4.5.tar.gz 3659801 SHA256 7df146099e1d578caddaeb7e93459f96ca1e2381fcc51157a25fe00336072752 SHA512 a85d092680dfe5498a90a4ad4935d441e41efa4ce3aa26f2e8897ef254f9c20d053bb045b5709626ee5bb4c9fdecda9f311a26db7fac6d6369d50336af7ab1f5 WHIRLPOOL 4533009727ad30b94b9b2814a17464975986df7eb2a42b383e654b1233651455a1ff938fae5273af350ccce29cbe08c7e68d26237a511ab7e3fcc45d05665b58 -DIST mlterm-3.5.0.tar.gz 3707639 SHA256 dedb211c52a8cdaa8891920da0a4f08f4b72f7b3514a5acb038b38419b24e4d3 SHA512 aaeac36a23d8544428b511760a5a23a843509fb75ceec59fea6f012d1626ca99f2772b9b18155d6b527482de649304b7e01ee8b7caef211bf5a01d71718d5ca8 WHIRLPOOL 347286ddcdc4aa97f6ebaa55ddcc0d8930f8396491b2d999d504cea2041d61b9eea090b70921b6f35c4f3eef26093403fcdde6538b1fcdb21299aae348b906ad DIST mlterm-3.6.0.tar.gz 3751065 SHA256 b6b08e3ce3c2136ed091776f0bb3b9ad0b7070bc2d845c9debe6e2cdc34cec05 SHA512 c7b57340069613d7b19c1b3175f4b2686021b5e336c762bd04045065d290f413c38b84a5b29fa26cf5c4744d0f021d5b7699c3ea48310f596963dfe51668f495 WHIRLPOOL 9e85c26d209a13a695b593c1b5f07f298f861ba6bc8cc44076ac9ac0027e465f356433544dd1a9c4f29c08342e280b45e1d5e8ae77f1480200ed33b6ca0ff5e7 +DIST mlterm-3.6.3.tar.gz 3677639 SHA256 021935df82fd63a280500185e7c4b2ae833bd8c1f58e4386d0d772c55d4d2743 SHA512 bbc6c61422f81a793b64fcbabb972765f7e544c7d4fc3d8874ab78a25fe8e7a97dc96c3d44e582127dde8822e7c254ed58004535524e361a2a0d91410e7ef027 WHIRLPOOL ebbed33cddcab4ca1cc49634b917b9a36077f64ba9b15dccc044c464b5696d4e8b3bac74c74ddcb42e2559c25d1e6e34991150b66325eb42daf9cf90236f3af0 diff --git a/x11-terms/mlterm/mlterm-3.6.0.ebuild b/x11-terms/mlterm/mlterm-3.6.0.ebuild index af51236e2b27..f15dfac235d3 100644 --- a/x11-terms/mlterm/mlterm-3.6.0.ebuild +++ b/x11-terms/mlterm/mlterm-3.6.0.ebuild @@ -1,10 +1,10 @@ -# 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 +inherit eutils DESCRIPTION="A multi-lingual terminal emulator" HOMEPAGE="http://mlterm.sourceforge.net/" @@ -50,7 +50,6 @@ src_prepare() { etc/main epatch_user - eautoconf } src_configure() { diff --git a/x11-terms/mlterm/mlterm-3.5.0.ebuild b/x11-terms/mlterm/mlterm-3.6.3.ebuild index e038f716eab8..a4a8384b9190 100644 --- a/x11-terms/mlterm/mlterm-3.5.0.ebuild +++ b/x11-terms/mlterm/mlterm-3.6.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" -inherit autotools-utils eutils +inherit eutils DESCRIPTION="A multi-lingual terminal emulator" HOMEPAGE="http://mlterm.sourceforge.net/" @@ -42,9 +42,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext )" -DOCS=( ChangeLog README doc/{en,ja} ) - -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" +DOCS=( doc/{en,ja} ) src_prepare() { # default config @@ -53,11 +51,12 @@ src_prepare() { -e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \ etc/main - autotools-utils_src_prepare + default } src_configure() { - local myeconfargs=( + local myconf=( + --disable-static --with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "") --enable-optimize-redrawing --enable-vt52 @@ -78,11 +77,11 @@ src_configure() { local scrollbars="sample,extra" local tools="mlclient,mlcc,mlmenu,mlterm-zoom" if use gtk; then - myeconfargs+=(--with-imagelib=gdk-pixbuf) + myconf+=(--with-imagelib=gdk-pixbuf) if has_version x11-libs/gtk+:3; then - myeconfargs+=(--with-gtk=3.0) + myconf+=(--with-gtk=3.0) else - myeconfargs+=(--with-gtk=2.0) + myconf+=(--with-gtk=2.0) fi scrollbars+=",pixmap_engine" tools+=",mlconfig,mlimgloader" @@ -90,11 +89,11 @@ src_configure() { if use regis; then tools+=",registobmp" fi - myeconfargs+=(--with-scrollbars="${scrollbars}") - myeconfargs+=(--with-tools="${tools}") + myconf+=(--with-scrollbars="${scrollbars}") + myconf+=(--with-tools="${tools}") addpredict /dev/ptmx - autotools-utils_src_configure + econf "${myconf[@]}" } src_test() { @@ -102,14 +101,12 @@ src_test() { } src_install () { - autotools-utils_src_install + default + prune_libtool_files + docinto contrib/icon dodoc contrib/icon/README doicon contrib/icon/mlterm* make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator" } - -pkg_postinst() { - elog "The 'use_scrollbar' option was renamed to 'use_mdi'." -} diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml index 55ce781aa913..578e246bcbd1 100644 --- a/x11-wm/stumpwm/metadata.xml +++ b/x11-wm/stumpwm/metadata.xml @@ -5,22 +5,50 @@ <email>nimiux@gentoo.org</email> <name>Chema Alonso</name> </maintainer> - <longdescription> - Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp. + <longdescription lang="en"> + Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in + Common Lisp. - If you're tired of flipping through themes like channel-surfing, and going from one perfect-except-for-just-one-thing - window manager to another even-more-broken-in-some-other-way then perhaps Stumpwm can help. + If you're tired of flipping through themes like channel-surfing, and going + from one perfect-except-for-just-one-thing window manager to another + even-more-broken-in-some-other-way then perhaps Stumpwm can help. - Stumpwm attempts to be customizable yet visually minimal. There are no window decorations, no icons, and no buttons. - It does have various hooks to attach your personal customizations, and variables to tweak. + Stumpwm attempts to be customizable yet visually minimal. There are no + window decorations, no icons, and no buttons. + It does have various hooks to attach your personal customizations, and + variables to tweak. - * Hack the good hack - * debug your good hack - * customize your window manager + * Hack the good hack + * debug your good hack + * customize your window manager - while it's running. That's right. With a 100% Common Lisp window manager there's no stopping the hacks. Just re-eval and GO! + while it's running. That's right. With a 100% Common Lisp window manager + there's no stopping the hacks. Just re-eval and GO! + </longdescription> + <longdescription lang="es"> + Stumpwm es un gestor de ventanas estilo mosaico gestionado por teclado + escrito completamente en Common Lisp. + + Si está cansado de cambiar de temas como navegación por canales y vagar + de un gestor de ventanas perfecto excepto por esa pequeña característica + a otro incluso más roto de alguna otra forma, entonces quizá Stumpwm + pueda ser de ayuda. + + Stumpwm persigue ser personalizable a la vez que mínimo. No hay + decoración en las ventanas, ni iconos ni botones. + Dispone de varios enganches para realizar nuestras propias configuraciones + personales y variables que podemos ajustar a nuestras necesidades para: + + * Cacharrear de forma correcta + * Depurar nuestro propio cacharreo + * Personalizar nuestro gestor de ventanas + + mientras está corriendo. Eso está bien. Con un gestor de ventanas escrito + al 100% en Common Lisp no hay forma de detener el cacharreo. ¡Simplemente + reevalúe y CONTINÚE! </longdescription> <use> + <flag name="contrib">Install contrib modules</flag> <flag name="doc">Include documentation</flag> <flag name="emacs">Add support for GNU Emacs</flag> <flag name="clisp">Use CLISP for the runtime</flag> diff --git a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild index e275cdcf8f17..29808a6e8aa5 100644 --- a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild +++ b/x11-wm/stumpwm/stumpwm-0.9.9.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$ @@ -6,14 +6,14 @@ EAPI=5 inherit common-lisp-3 eutils elisp-common autotools -DESCRIPTION="Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp." +DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp." HOMEPAGE="http://www.nongnu.org/stumpwm/" SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc emacs clisp ecl +sbcl" +IUSE="contrib doc emacs clisp ecl +sbcl" RESTRICT="strip mirror" @@ -29,6 +29,8 @@ DEPEND="${RDEPEND} doc? ( virtual/texi2dvi )" SITEFILE=70${PN}-gentoo.el +CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}" +CONTRIBDIR="${CLPKGDIR}/contrib" get_lisp() { local lisp @@ -48,20 +50,34 @@ do_doc() { docinto examples ; dodoc sample-stumpwmrc.lisp } +do_contrib() { + emake install-modules + rm -r "${D}${CONTRIBDIR}"/.git* || die +} + src_prepare() { + # Fix ASDF dir + sed -i -e "/^STUMPWM_ASDF_DIR/s|\`pwd\`|${CLPKGDIR}|" configure.ac || die # Upstream didn't change the version before packaging - sed -i "${S}/${PN}.asd" -e 's/:version "0.9.8"/:version "0.9.9"/' || die + sed -i -e 's/:version "0.9.8"/:version "0.9.9"/' "${PN}.asd" || die # Bug 534592. Does not build with asdf:oos, using require to load the package - sed -i "${S}/load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die + sed -i "load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die + if use contrib ; then + # Fix contrib directory + sed -i -e "s|@CONTRIB_DIR@|@MODULE_DIR@|" make-image.lisp.in || die + sed -i -e "s|\~\/.${CLPACKAGE}\.d/modules|${D}${CONTRIBDIR}|" Makefile.in || die + sed -i -e "s|\${HOME}/\.${CLPACKAGE}\.d/modules|${CONTRIBDIR}|" configure.ac || die + fi eautoreconf } src_configure() { - econf --with-lisp=$(get_lisp sbcl clisp ecl) + econf --with-lisp=$(get_lisp sbcl clisp ecl) --with-module-dir="${CLSOURCEROOT}/${CLPACKAGE}/contrib" } src_compile() { emake -j1 + echo "HOLa" } src_install() { @@ -72,6 +88,7 @@ src_install() { common-lisp-install-sources *.lisp common-lisp-install-asdf ${PN}.asd use doc && do_doc + use contrib && do_contrib } pkg_postinst() { diff --git a/x11-wm/stumpwm/stumpwm-9999.ebuild b/x11-wm/stumpwm/stumpwm-9999.ebuild index cf73b6f39232..cec821a91ec8 100644 --- a/x11-wm/stumpwm/stumpwm-9999.ebuild +++ b/x11-wm/stumpwm/stumpwm-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit autotools common-lisp-3 git-2 -DESCRIPTION="Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp." +DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp." HOMEPAGE="http://www.nongnu.org/stumpwm/index.html" EGIT_REPO_URI="git://github.com/stumpwm/stumpwm" @@ -33,6 +33,8 @@ do_doc() { } src_prepare() { + # Fix ASDF dir + sed -i -e "/^STUMPWM_ASDF_DIR/s|\`pwd\`|${CLPKGDIR}|" configure.ac || die eautoreconf } |