diff options
78 files changed, 916 insertions, 926 deletions
diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild index 66ab2f58d0be..cc6b12a44851 100644 --- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild +++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN/-utils}-${PV/_}" SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" S=${WORKDIR}/${MY_P} EXTRA_DEPEND= fi diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest index 8a91513c5ba7..ae99b7e9d6ad 100644 --- a/app-cdr/cdemu-daemon/Manifest +++ b/app-cdr/cdemu-daemon/Manifest @@ -1,2 +1,2 @@ -DIST cdemu-daemon-2.1.1.tar.bz2 62600 SHA256 d26782071184d555b06ad5def7d1c22916cbeb73377328879499b91e1196f36f SHA512 be59bf12e326855ccdfe5cec72a813b7a80dcc2cb408c3f19b9abe66eeb8d092e2755b1ba9f746ac7d3c1b27276ed857947ce1b2509d8cbf07eb1c6663f3536d WHIRLPOOL fd6ad9aa28ae9c821934099a3be271a1fe85db684dcc1ca9b65d499281ce65b27ac63d44c8570309d1fc3fbd486eadb165e15cec285c81bb07b10c709a1f6f42 DIST cdemu-daemon-3.0.2.tar.bz2 76029 SHA256 8c9a0d292e0fd71538f123f2b795f4490ff455f68b391b97812be369c34a4f06 SHA512 eb09880dcc984c8843cf0254d45aeaa39cff8faa3a415352c574b59ea6778de9bc10a9634022c1fe5c7de8aa0493129a7bd15b859a7ca3895d5175b2bb2296e1 WHIRLPOOL 918554fead811418bd1e1b1ad8cd22342c5e5559eb7e4f3e30f1ccb1c889547bbd7f70bd7af86c19af86a7c432281f3d98a2fb5d0ef59f57dcddf3ad0fc10686 +DIST cdemu-daemon-3.0.4.tar.bz2 76121 SHA256 8101b4ad659de3cc53dcc39b14381d7d85b3dad131d780caefe9cc1c03551ecd SHA512 e5a3da9dd87e6ad6cf226e53628dbee76eb26104c51a511adb5b6b65d46e3f213a682ba0d845c8a651d939c44b853b6a9881e542e10f9f7d1dd579b8fc408154 WHIRLPOOL b92a78732f177e31b7a80288ec5253d92d5e92f796612cc288c7b976e46d5ebff3e8a2ffd9c3a0a1acb785893a0a663317ece75c3ed5c30592f69d53c01199b8 diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.0.4.ebuild index 7b2e7b8faf2e..07971177cee3 100644 --- a/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild +++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.0.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" CMAKE_MIN_VERSION="2.8.5" @@ -13,13 +13,12 @@ HOMEPAGE="http://cdemu.org" SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2" LICENSE="GPL-2+" -SLOT="0/6" # subslot = CDEMU_DAEMON_INTERFACE_VERSION in CMakeLists.txt -KEYWORDS="amd64 ~hppa x86" +SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt +KEYWORDS="~amd64 ~hppa ~x86" IUSE="" RDEPEND=">=dev-libs/glib-2.32:2 >=dev-libs/libmirage-${PV}:= - <dev-libs/libmirage-3 >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607" diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest index 9089ee8863a8..773d46590997 100644 --- a/app-cdr/cdemu/Manifest +++ b/app-cdr/cdemu/Manifest @@ -1,2 +1,2 @@ -DIST cdemu-client-2.1.1.tar.bz2 28474 SHA256 204e626994f61d36423f3b732e180e3b3b20624effdfe91aabffd439c76d3964 SHA512 d764000fadc66b639dd8f20d9bb8fbe3b91d3e20bd207d30a734dc1a9a7fae746e8aad317a3d78cd35b69d0a8acbf8e389598786cadabec6e512640ba5b21be5 WHIRLPOOL 93cb01c3bc16ee69e3fd9ce9080838f4eebc874afe8d6be71c22e44919909144980dd44595a0dbf6fe1add3574061bcd6f523b72644eb52774d974f226c100b9 DIST cdemu-client-3.0.0.tar.bz2 40300 SHA256 359310a57422d5c59c8f93be0da827a2437edb1e62f455f5614089c28e34ae88 SHA512 807fe98dc8743a227484d20587c9f9e06cac649d74d8fdd520dba9bb2a2f268ba977c922333fdcf91201baf4f08595044939f6d5bd4834ec26cf689b6a36f361 WHIRLPOOL bd7d5b0ebe75aad5629f8cdf9f1de04fbdf7ad37400163d69e1eb9bfe35a47bc2bca5b58a031bb022611689d7c7c480fcc98403f883643ccc3cc2049f98fb814 +DIST cdemu-client-3.0.1.tar.bz2 40299 SHA256 cf7b2fedf14bb64df7e318546756e133eef9e018e04218f74891f676eda9e5cd SHA512 3abbedef15f2e30fc53d9f199c7f31b838da16a763d3dcb0e4745d0dd76675c0962e951a378dec3d8b13f024c339d5f3aa978fdf1f7e664332a684ab279d788d WHIRLPOOL 32099514bdbafda3994646cd08ac0f31fa345963090ef7506185db3955d953bbc42be018b970611bb4664f494790cbd99bb577dc169c53b4295110a26f28bf4d diff --git a/app-cdr/cdemu/cdemu-2.1.1.ebuild b/app-cdr/cdemu/cdemu-3.0.1.ebuild index 86ea5fa4965c..df9195c98c62 100644 --- a/app-cdr/cdemu/cdemu-2.1.1.ebuild +++ b/app-cdr/cdemu/cdemu-3.0.1.ebuild @@ -1,14 +1,14 @@ -# 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" CMAKE_MIN_VERSION="2.8.5" PYTHON_COMPAT=( python2_7 ) -PLOCALES="de fr no pl sl sv" +PLOCALES="no sl sv" -inherit bash-completion-r1 cmake-utils eutils fdo-mime l10n python-single-r1 +inherit bash-completion-r1 cmake-utils fdo-mime l10n python-single-r1 DESCRIPTION="Command-line tool for controlling cdemu-daemon" HOMEPAGE="http://cdemu.org" @@ -16,13 +16,13 @@ SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~hppa x86" +KEYWORDS="~amd64 ~hppa ~x86" IUSE="+cdemu-daemon" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/dbus-python[${PYTHON_USEDEP}] - cdemu-daemon? ( app-cdr/cdemu-daemon:0/6 )" + cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )" DEPEND="${RDEPEND} dev-util/desktop-file-utils >=dev-util/intltool-0.21 @@ -36,13 +36,8 @@ pkg_setup() { src_prepare() { python_fix_shebang src/cdemu - epatch "${FILESDIR}/${PN}-2.1.0-bash-completion-dir.patch" - # build system doesn't respect LINGUAS :/ - l10n_find_plocales_changes po "" ".po" - rm_po() { - rm po/$1.po || die - } - l10n_for_each_disabled_locale_do rm_po + eapply -p2 "${FILESDIR}/${PN}-3.0.0-bash-completion-dir.patch" + eapply_user } src_configure() { @@ -54,6 +49,17 @@ src_configure() { cmake-utils_src_configure } +src_install() { + cmake-utils_src_install + # Build system doesn't respect LINGUAS, and changing list of installed + # translations requires error-prone editing of CMakeLists.txt + rm_po() { + rm -r "${ED}"/usr/share/locale/$1 || die + ls "${ED}"/usr/share/locale/* &> /dev/null || rmdir "${ED}"/usr/share/locale || die + } + l10n_for_each_disabled_locale_do rm_po +} + pkg_postinst() { fdo-mime_desktop_database_update } diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest index 4d297de17c2c..ed8c1098ca63 100644 --- a/app-cdr/gcdemu/Manifest +++ b/app-cdr/gcdemu/Manifest @@ -1,2 +1,2 @@ -DIST gcdemu-2.1.1.tar.bz2 40156 SHA256 cd1d59fb6dadbc05f5865c1654089563aeb28ef9ea4216da2e223f8376887c5c SHA512 1d8d9cc29a1d7a69681fbd4dc540a97172d81ac3d018bd98af469746901c8841dd5fd23ca8ae6fce68e41b43d98fb693acba1b621ed6b72c97972038cde1c47a WHIRLPOOL 0dbc04b57c5026a642a268b6bbba9d55ca27c92c1a606048a7395ebc07527e83ea05578c398725ed3782f4cf678769e0b77c686f07fe3061334875a375da3a05 DIST gcdemu-3.0.0.tar.bz2 45506 SHA256 1357a02720f05644929bae167fcc64dc58784f406aa426bcd806955cc458aad4 SHA512 c4d0d64638e0f7ecccfe11ab1a8527ba2002a5bbb382b2d4e8b58eaaa0a10140ee85b8d62ba93fe4ecdc2882301dfe62a08373dbb9e5404d5ddf7592cd5f0b7d WHIRLPOOL 18c8615ad6ae166c2111e7dd2f1c1d46b4128d99bb11a3f7e2f297c58dfff3e38ad981547703b13af940b0d1e6e3bccb7098180fde51458bfe34e3b19a66a465 +DIST gcdemu-3.0.1.tar.bz2 45508 SHA256 d9d9cd4270803a021d55205fad2c76f65b51f5b509dde21c70475bb8577896b6 SHA512 e5a1905642c08145669c5eb9e65159d5a9a2fbcd1657edd28ae091ee1d02673e56bb7007df2a9f95863cae1a1ab01916bb43b4d10fe054d52507beabd7dd532f WHIRLPOOL e4fd9e009cdbad1f79e1a579339e27225fa76e132d136c9dba5e9388551d0a3c27448bf870d9f4344e99d47f1a7b0cce3c712e26569fc77f0206671cbbef2553 diff --git a/app-cdr/gcdemu/gcdemu-2.1.1.ebuild b/app-cdr/gcdemu/gcdemu-3.0.1.ebuild index 6036f35101c2..32451d181d57 100644 --- a/app-cdr/gcdemu/gcdemu-2.1.1.ebuild +++ b/app-cdr/gcdemu/gcdemu-3.0.1.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,10 +6,10 @@ EAPI="5" CMAKE_MIN_VERSION="2.8.5" PYTHON_COMPAT=( python2_7 ) -PLOCALES="de fr no pl sl zh_CN" +PLOCALES="no sl sv" # cmake-utils after gnome2, to make sure cmake-utils is used for building -inherit gnome2 cmake-utils l10n python-single-r1 +inherit eutils gnome2 cmake-utils l10n python-single-r1 DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon" HOMEPAGE="http://cdemu.org/" @@ -17,12 +17,12 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - app-cdr/cdemu-daemon:0/6 + app-cdr/cdemu-daemon:0/7 >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection dev-python/pygobject:3[${PYTHON_USEDEP}] @@ -43,12 +43,7 @@ pkg_setup() { src_prepare() { python_fix_shebang src/gcdemu - # build system doesn't respect LINGUAS :/ - l10n_find_plocales_changes po "" ".po" - rm_po() { - rm po/$1.po || die - } - l10n_for_each_disabled_locale_do rm_po + epatch_user } src_configure() { @@ -56,3 +51,14 @@ src_configure() { local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF ) cmake-utils_src_configure } + +src_install() { + cmake-utils_src_install + # Build system doesn't respect LINGUAS, and changing list of installed + # translations requires error-prone editing of CMakeLists.txt + rm_po() { + rm -r "${ED}"/usr/share/locale/$1 || die + ls "${ED}"/usr/share/locale/* &> /dev/null || rmdir "${ED}"/usr/share/locale || die + } + l10n_for_each_disabled_locale_do rm_po +} diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest index 3da236a5088f..7703448b56ac 100644 --- a/app-emulation/rkt/Manifest +++ b/app-emulation/rkt/Manifest @@ -1,4 +1,8 @@ +DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143 +DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5 DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106 DIST rkt-1.0.0.tar.gz 2414183 SHA256 7e30b03fa51a34db095484c4b111c526e49bead4e33232e1b239090503d7ac97 SHA512 f176532486b68ebc15aae17cfcf31e0f97ce3afc96bfed1c4f918da41350ef21c170712cb071a8720f39ee757b7b9ba1e66730d6e12acb9753446b929801c4ff WHIRLPOOL b2fc3082693b474584292a6ec943a685826364632dc346b18233bf9b9d2feaf14981f4a7fcbd9e79b98c2466b2f24be9b57f6345c89aeea5d075cdbeee26aba5 +DIST rkt-1.1.0.tar.gz 2426666 SHA256 df93dffc1deff470a5bebaa2610a07df8f48e69f660c81de0a31de13d7f7bfa5 SHA512 ef444843f411cd2d1fcd02f606bf5d0971eb314d708d1d54d07af9e3d69e1d74a7812456fd7cc46372ca6e42cfd5ac6af6b7b67e22890396f58d8982c0af1373 WHIRLPOOL 0579f5efd28d473ab4a0874d7218268a2a1143118b9f3e39670a683f05c7fb3b1b952aee75f0c923d76bc457c4d933c3c9b329f99960fa0a95cde2573225288b DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9 DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba +DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879 diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml index 33d47776dd7f..7b1939a8dd31 100644 --- a/app-emulation/rkt/metadata.xml +++ b/app-emulation/rkt/metadata.xml @@ -15,6 +15,7 @@ <flag name="actool">Install the actool for ACI manipulation</flag> <flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag> <flag name="rkt_stage1_fly">Build stage1-fly.aci</flag> + <flag name="rkt_stage1_kvm">Build stage1-kvm.aci</flag> <flag name="rkt_stage1_src">Build the stage1.aci from source</flag> <flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag> </use> diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild new file mode 100644 index 000000000000..ce9a5ebb6c7e --- /dev/null +++ b/app-emulation/rkt/rkt-1.1.0.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=yes +AUTOTOOLS_IN_SOURCE_BUILD=yes + +inherit autotools-utils flag-o-matic systemd toolchain-funcs + +KEYWORDS="~amd64" + +PXE_VERSION="794.1.0" +PXE_SYSTEMD_VERSION="v222" +KVM_LINUX_VERSION="4.3.1" +KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2" +PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" +PXE_FILE="${PN}-pxe-${PXE_VERSION}.img" + +SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz +rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE ) +rkt_stage1_kvm? ( + https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz + mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz +) +rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )" + +DESCRIPTION="A CLI for running app containers, and an implementation of the App +Container Spec." +HOMEPAGE="https://github.com/coreos/rkt" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_kvm rkt_stage1_src +actool" +REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_kvm rkt_stage1_src )" + +DEPEND=">=dev-lang/go-1.4.1 + app-arch/cpio + app-crypt/trousers + sys-fs/squashfs-tools + dev-perl/Capture-Tiny" + +RDEPEND="!app-emulation/rocket" + +BUILDDIR="build-${P}" +STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci" + +src_unpack() { + local x + for x in ${A}; do + case ${x} in + *.img|linux-*) continue ;; + kvmtool-*) + mkdir kvmtool || die + pushd kvmtool >/dev/null || die + unpack ${x} + popd >/dev/null || die + ;; + *) + unpack ${x} + esac + done +} + +src_prepare() { + # disable git fetch of systemd + sed -e 's|^include makelib/git.mk$|_ := '\ +'$(shell set -ex; [ -d "$(UFS_SYSTEMD_SRCDIR)" ] \&\& exit 0; '\ +'[ ! -d "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" ] \&\& exit 0; '\ +'mkdir -p "$$( dirname "$(UFS_SYSTEMD_SRCDIR)")"; '\ +'mv "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" "$(UFS_SYSTEMD_SRCDIR)";)|' \ + -i stage1/usr_from_src/usr_from_src.mk || die + + # disable git fetch of kvmtool + sed -e 's|^include makelib/git.mk$|_ := '\ +'$(shell set -ex; [ -d "$(LKVM_SRCDIR)" ] \&\& exit 0; '\ +'[ ! -d "$${WORKDIR}/kvmtool" ] \&\& exit 0; '\ +'mkdir -p "$$( dirname "$(LKVM_SRCDIR)")"; '\ +'mv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)";)|' \ + -i stage1/usr_from_kvm/lkvm.mk || die + + # disable fetch of kernel sources + sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \ + -i stage1/usr_from_kvm/kernel.mk || die + + autotools-utils_src_prepare +} + +src_configure() { + local flavors myeconfargs=( + --with-stage1-default-images-directory="/usr/share/rkt" + --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}" + ) + + # TODO: + # - fix rkt_stage1_kvm to not download kernel sources with wget + # - fix rkt_stage1_host to not fail during launch + + # enable flavors (first is default) + use rkt_stage1_src && flavors+=",src" + use rkt_stage1_coreos && flavors+=",coreos" + use rkt_stage1_fly && flavors+=",fly" + use rkt_stage1_kvm && flavors+=",kvm" + myeconfargs+=( --with-stage1-flavors="${flavors#,}" ) + + if use rkt_stage1_coreos; then + myeconfargs+=( + --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}" + --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}" + ) + fi + + # Go's 6l linker does not support PIE, disable so cgo binaries + # which use 6l+gcc for linking can be built correctly. + if gcc-specs-pie; then + append-ldflags -nopie + fi + + export CC=$(tc-getCC) + export CGO_ENABLED=1 + export CGO_CFLAGS="${CFLAGS}" + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + export BUILDDIR + + autotools-utils_src_configure +} + +src_compile() { + local arch=${ARCH} + case ${arch} in + amd64) arch=x86_64;; + esac + ARCH=${arch} autotools-utils_src_compile +} + +src_install() { + dodoc README.md + use doc && dodoc -r Documentation + use examples && dodoc -r examples + use actool && dobin "${S}/${BUILDDIR}/bin/actool" + + dobin "${S}/${BUILDDIR}/bin/rkt" + + insinto /usr/share/rkt + doins "${S}/${BUILDDIR}/bin/"*.aci + + # create symlink for default stage1 image path + if use rkt_stage1_src; then + dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}" + elif use rkt_stage1_coreos; then + dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}" + elif use rkt_stage1_fly; then + dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}" + elif use rkt_stage1_kvm; then + dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}" + fi + + systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service + systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer + systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service + systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket +} diff --git a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild index ee91d8037cc2..8a08600d4287 100644 --- a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild +++ b/app-misc/ca-certificates/ca-certificates-20151214.3.21.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$ @@ -57,7 +57,7 @@ fi LICENSE="MPL-1.1" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="" ${PRECOMPILED} || IUSE+=" +cacert" diff --git a/app-misc/fdupes/fdupes-1.51.ebuild b/app-misc/fdupes/fdupes-1.51.ebuild index 6bff666e0637..8037f87721df 100644 --- a/app-misc/fdupes/fdupes-1.51.ebuild +++ b/app-misc/fdupes/fdupes-1.51.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$ @@ -26,7 +26,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-makefile.patch \ "${FILESDIR}"/${PN}-1.50_pre2-compare-file.patch \ - "${FILESDIR}"/${PN}-1.50_pre2-typo.patch + "${FILESDIR}"/${PN}-1.50_pre2-typo.patch \ + "${FILESDIR}"/${P}-fix-stdin-lvalue.patch append-lfs-flags } diff --git a/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch b/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch new file mode 100644 index 000000000000..65c06e3f1ddf --- /dev/null +++ b/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch @@ -0,0 +1,20 @@ +This is a combination of upstream's fe2d8334 and 03abad. See +https://bugs.gentoo.org/show_bug.cgi?id=574610. + +diff -Naur fdupes-1.51.orig/fdupes.c fdupes-1.51/fdupes.c +--- fdupes-1.51.orig/fdupes.c 2013-04-20 14:02:18.000000000 -0400 ++++ fdupes-1.51/fdupes.c 2016-02-29 02:45:36.360804360 -0500 +@@ -1164,7 +1164,12 @@ + } + else + { +- stdin = freopen("/dev/tty", "r", stdin); ++ if (freopen("/dev/tty", "r", stdin) == 0) ++ { ++ errormsg("could not open terminal for input\n"); ++ exit(1); ++ } ++ + deletefiles(files, 1, stdin); + } + } diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest index 6f56d1b133e1..76c286a36a11 100644 --- a/app-text/blogc/Manifest +++ b/app-text/blogc/Manifest @@ -1 +1 @@ -DIST blogc-0.7.5.tar.xz 265468 SHA256 22b66fd38c70ec094bc77bd7a04a0ce2bc1bb2177d3d8cb705baf4ec79283d69 SHA512 75ad54c65fff927117a9135bf606357e52eb91d2c448bf8cac2676e519ab58f919447057e031ebfa90cb033728fa49f5bafb8c94678fe142e1856082870690fb WHIRLPOOL 92f4aec3864e80d57e17ed8b2bef6bdb3e7f12c8f32fc0c42bfb653ce2fcbaf3ee6ab5aebaf9aece79cbb75515d07d28068f83f98cf847c54fd68e7ef6668a7f +DIST blogc-0.7.6.tar.xz 279444 SHA256 67799d933ef907973ae9b6333b1a22c254ef49c829e2a24b76eea04484b68de3 SHA512 092590f2249dcc71b170ebbe20bbdd975bea6bb60cbcf8f0739db0bb8318c2718d22becd4be121fd18a63be5619beae9c95b451e417909f4c4e82e53aa6d683e WHIRLPOOL bbe13eb95976d2a36872e7cd034b487550392eeeb2761ea305ff3044215c208a9b634b2af1e25cb92161e1f508b22f1f81919c97f078a250324efa29371548a6 diff --git a/app-text/blogc/blogc-0.7.5.ebuild b/app-text/blogc/blogc-0.7.6.ebuild index f50ce2b99c03..cddb4f58911f 100644 --- a/app-text/blogc/blogc-0.7.5.ebuild +++ b/app-text/blogc/blogc-0.7.6.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI=" @@ -11,8 +11,6 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 autotools fi -inherit eutils - DESCRIPTION="A blog compiler" HOMEPAGE="http://blogc.org/" @@ -21,24 +19,26 @@ KEYWORDS="~amd64 ~x86" if [[ ${PV} = *9999* ]]; then SRC_URI="" KEYWORDS="" - DEPEND="app-text/ronn" + RDEPEND="=dev-libs/squareball-9999" + DEPEND="${RDEPEND} + app-text/ronn" +else + RDEPEND=">=dev-libs/squareball-0.1" + DEPEND="${RDEPEND}" fi LICENSE="BSD" SLOT="0" IUSE="test" -RDEPEND="" - -# pkg-config is used only to find cmocka libraries DEPEND="${DEPEND} + virtual/pkgconfig test? ( - virtual/pkgconfig dev-util/cmocka )" src_prepare() { [[ ${PV} = *9999* ]] && eautoreconf - epatch_user + eapply_user default } @@ -52,5 +52,6 @@ src_configure() { econf \ $(use_enable test tests) \ --disable-valgrind \ + --with-squareball=system \ ${myconf} } diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild index f50ce2b99c03..cddb4f58911f 100644 --- a/app-text/blogc/blogc-9999.ebuild +++ b/app-text/blogc/blogc-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI=" @@ -11,8 +11,6 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 autotools fi -inherit eutils - DESCRIPTION="A blog compiler" HOMEPAGE="http://blogc.org/" @@ -21,24 +19,26 @@ KEYWORDS="~amd64 ~x86" if [[ ${PV} = *9999* ]]; then SRC_URI="" KEYWORDS="" - DEPEND="app-text/ronn" + RDEPEND="=dev-libs/squareball-9999" + DEPEND="${RDEPEND} + app-text/ronn" +else + RDEPEND=">=dev-libs/squareball-0.1" + DEPEND="${RDEPEND}" fi LICENSE="BSD" SLOT="0" IUSE="test" -RDEPEND="" - -# pkg-config is used only to find cmocka libraries DEPEND="${DEPEND} + virtual/pkgconfig test? ( - virtual/pkgconfig dev-util/cmocka )" src_prepare() { [[ ${PV} = *9999* ]] && eautoreconf - epatch_user + eapply_user default } @@ -52,5 +52,6 @@ src_configure() { econf \ $(use_enable test tests) \ --disable-valgrind \ + --with-squareball=system \ ${myconf} } diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild index 0a955313b70e..a8e6315e351c 100644 --- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild +++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.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$ @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~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="ruby" RDEPEND=">=app-text/build-docbook-catalog-1.1 diff --git a/app-vim/pathogen/Manifest b/app-vim/pathogen/Manifest index 27ed8ed83d61..f6225e91f90c 100644 --- a/app-vim/pathogen/Manifest +++ b/app-vim/pathogen/Manifest @@ -1,2 +1 @@ -DIST pathogen-2.3.tar.gz 6136 SHA256 3a2ec24f47dbb59dd4f3fea12f89cf64add951da4646dedced54b7284fdc38ac SHA512 da603a4d111dce6fba1542e3301a8e180def545d1f81339bc60782698c777625500e158d0f15c01ac0144e6a3045bb2d2d2ed19bfe661c233a0633a9aa14b749 WHIRLPOOL ab99d35d078e65eda60d5b3d96fa77f0913a97bcec19aceb2a104e493561e2fff8874c8fa3bb67f2875356ddcfe827972d84bacc5cb72ba42fd33613495a60bb DIST pathogen-2.4.tar.gz 6458 SHA256 2551a0f4ac3681cba97c265af088460c2977fba9c5152afb4ce1b56fdf3195a8 SHA512 54da8755991e5c52c5a9258c92ce5731434a15873df44d12e9491ed9bff1f9ebfe2a1c1b94a9ea3615b38aa1833d511bb03c65e85955d96373b6bffceae89fbe WHIRLPOOL 95f54f2cb1747fc92aefca54a7497155db05e89c7dd7249717fce6de34838e7a4ab57aadf46ef8eece668ae7156d4c4b5d481b7fd3dc16b248652b57334fe4b3 diff --git a/app-vim/pathogen/pathogen-2.3.ebuild b/app-vim/pathogen/pathogen-2.3.ebuild deleted file mode 100644 index 9ec64cc8c30f..000000000000 --- a/app-vim/pathogen/pathogen-2.3.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit vim-plugin - -DESCRIPTION="vim plugin: manage your runtimepath" -HOMEPAGE="https://github.com/tpope/vim-pathogen/ http://www.vim.org/scripts/script.php?script_id=2332" -SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="vim" -KEYWORDS="amd64 x86 ~x64-macos" - -S=${WORKDIR}/vim-${P} diff --git a/app-vim/pathogen/pathogen-2.4.ebuild b/app-vim/pathogen/pathogen-2.4.ebuild index 718bb0955b4c..7129b0cdf688 100644 --- a/app-vim/pathogen/pathogen-2.4.ebuild +++ b/app-vim/pathogen/pathogen-2.4.ebuild @@ -10,6 +10,6 @@ DESCRIPTION="vim plugin: manage your runtimepath" HOMEPAGE="https://github.com/tpope/vim-pathogen/ http://www.vim.org/scripts/script.php?script_id=2332" SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="vim" -KEYWORDS="~amd64 ~x86 ~x64-macos" +KEYWORDS="amd64 x86 ~x64-macos" S=${WORKDIR}/vim-${P} diff --git a/app-vim/tcomment/Manifest b/app-vim/tcomment/Manifest index ac0493a30712..093f2283a4c0 100644 --- a/app-vim/tcomment/Manifest +++ b/app-vim/tcomment/Manifest @@ -1,2 +1 @@ -DIST tcomment-3.07.tar.gz 37827 SHA256 85f33774ebe7357600472520fb7ea48bfec8998a26f74b4e00e923f8aea2b711 SHA512 e18bc85d0ad263842109f83a34b14c4a167ae31c3c29310fdc8c586eef53949525d675f54d9b5d744a1248ab64b4881064923aef73e09beebabc29ca9bbfe18d WHIRLPOOL 7645fca39f6b2fe4cca43d9df3f7be8057ad10aa18d36e24bd5313612fe93bcf3c105580655a4842b00b9c90dc670dc3aa54ea56439931b7ccbed5b038b15e18 DIST tcomment-3.08.tar.gz 38317 SHA256 4e88509c10dbbb6fdbdf93955c004fa3d44c10536a63e1c3e4348e65454e7256 SHA512 9cb582e4c82334a5752f2a0b5b3e753fc7a4bfd3db76dd8f1ca49938f3f9890b8723476a0c3400f60ff8b358d52bf32fa8497c7b1c6118afd21bb860b2ce6061 WHIRLPOOL 855a4516e0864989bde077fe476778a1f33d60423a6fda1da442c4d0e76e727931d868fdb6fad140535a0398fac15ba555fe71fd418cfefea214b275d0e87404 diff --git a/app-vim/tcomment/tcomment-3.07.ebuild b/app-vim/tcomment/tcomment-3.07.ebuild deleted file mode 100644 index e9fc49fc0826..000000000000 --- a/app-vim/tcomment/tcomment-3.07.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 - -inherit vim-plugin - -MY_PN="tcomment_vim" -DESCRIPTION="vim plugin: an extensible and universal comment toggler" -HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim" -SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -KEYWORDS="amd64 x86" - -VIM_PLUGIN_HELPFILES="${PN}.txt" - -S=${WORKDIR}/${MY_PN}-${PV} - -src_prepare() { - rm -r README spec addon* || die -} diff --git a/app-vim/tcomment/tcomment-3.08.ebuild b/app-vim/tcomment/tcomment-3.08.ebuild index 4b2666e3e2bd..e9fc49fc0826 100644 --- a/app-vim/tcomment/tcomment-3.08.ebuild +++ b/app-vim/tcomment/tcomment-3.08.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: an extensible and universal comment toggler" HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim" SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" VIM_PLUGIN_HELPFILES="${PN}.txt" diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 0300737ea976..abd735b5fe8a 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -3,6 +3,7 @@ DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d503 DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64 DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8 DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54 +DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5 DIST mariadb-5.5.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 SHA512 76359229448abec40100c916d69eab0d8e37bd480025edbacb70b7bfe965151953bfc8c9b36f6645e9c4b5ede8d970886373b6a069abf8e0026059cac1b09d76 WHIRLPOOL ce3548d2eec369be96ea373438c1cf586bdff536e8b61116b110ccc39ab412a46423353f4cddd6d816e93b43c707f40a3bb5b97349fa709fe2c86f484f54f62a DIST mariadb-5.5.48.tar.gz 45727158 SHA256 50f753e003af6bd9c50b6257cca9d0cced5c877690824eac05f8d54fb9f6b421 SHA512 e4485a17589aad77e8d375d1c72065ea0d84da5954af029099dab19ffa852b4e3541ad13a77179e5c4722afc0574f2998a4f854b2b08a0689bb1428deb7de171 WHIRLPOOL d9c15aae23d2104eb15a8003810b2e11618ee159cda923bf5e521eace635c6a2731ccb292d73425f0346fd88ff382c6dbfb686996118f84fccdcfb89504e729b diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild new file mode 100644 index 000000000000..d9112531e300 --- /dev/null +++ b/dev-db/mariadb/mariadb-10.1.12.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" +MY_EXTRAS_VER="20160131-0252Z" +# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number +WSREP_REVISION="25" +SUBSLOT="18" +MYSQL_PV_MAJOR="5.6" + +inherit toolchain-funcs mysql-multilib-r1 + +HOMEPAGE="http://mariadb.org/" +DESCRIPTION="An enhanced, drop-in replacement for MySQL" + +IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" +RESTRICT="!bindist? ( bindist )" + +REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" + +PATCHES=( + "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch + "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch + "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch + "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch + "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch +) + +COMMON_DEPEND=" + mroonga? ( app-text/groonga-normalizer-mysql ) + kerberos? ( virtual/krb5 ) + systemd? ( sys-apps/systemd:= ) + !bindist? ( >=sys-libs/readline-4.1:0= ) + server? ( + cracklib? ( sys-libs/cracklib:0= ) + extraengine? ( + odbc? ( dev-db/unixODBC:0= ) + xml? ( dev-libs/libxml2:2= ) + ) + innodb-lz4? ( app-arch/lz4 ) + innodb-lzo? ( dev-libs/lzo ) + innodb-snappy? ( app-arch/snappy ) + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) + pam? ( virtual/pam:0= ) + tokudb? ( app-arch/snappy ) + ) + >=dev-libs/libpcre-8.35:3= +" +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + ${COMMON_DEPEND}" +RDEPEND="${RDEPEND} ${COMMON_DEPEND} + galera? ( + sys-apps/iproute2 + =sys-cluster/galera-${WSREP_REVISION}* + sst-rsync? ( sys-process/lsof ) + sst-xtrabackup? ( net-misc/socat[ssl] ) + ) + perl? ( !dev-db/mytop + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes ) +" +# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed +PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" + +MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) + +src_configure(){ + # bug 508724 mariadb cannot use ld.gold + tc-ld-disable-gold + + local MYSQL_CMAKE_NATIVE_DEFINES=( + -DWITH_JEMALLOC=$(usex jemalloc system) + -DWITH_PCRE=system + -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) + ) + if use server ; then + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + MYSQL_CMAKE_NATIVE_DEFINES+=( + -DPLUGIN_FEDERATED=NO + -DPLUGIN_FEDERATEDX=NO ) + fi + + MYSQL_CMAKE_NATIVE_DEFINES+=( + -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) + -DPLUGIN_SPHINX=$(usex sphinx YES NO) + -DPLUGIN_TOKUDB=$(usex tokudb YES NO) + -DPLUGIN_AUTH_PAM=$(usex pam YES NO) + -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) + -DPLUGIN_CASSANDRA=NO + -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) + -DPLUGIN_SPIDER=$(usex extraengine YES NO) + -DPLUGIN_CONNECT=$(usex extraengine YES NO) + -DCONNECT_WITH_MYSQL=1 + -DCONNECT_WITH_LIBXML2=$(usex xml) + -DCONNECT_WITH_ODBC=$(usex odbc) + -DWITH_WSREP=$(usex galera) + -DWITH_INNODB_LZ4=$(usex innodb-lz4) + -DWITH_INNODB_LZO=$(usex innodb-lzo) + -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) + -DPLUGIN_MROONGA=$(usex mroonga YES NO) + -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) + ) + fi + mysql-multilib-r1_src_configure +} + +# Official test instructions: +# USE='embedded extraengine perl server openssl static-libs' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mariadb-X.X.XX.ebuild \ +# digest clean package +multilib_src_test() { + + if ! multilib_is_native_abi ; then + einfo "Server tests not available on non-native abi". + return 0; + fi + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + if use server ; then + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + addpredict /this-dir-does-not-exist/t9.MYI + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + # Enable parallel testing, auto will try to detect number of cores + # You may set this by hand. + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased + export MTR_PARALLEL="${MTR_PARALLEL:-auto}" + + # create directories because mysqladmin might run out of order + mkdir -p "${T}"/var-tests{,/log} + + # These are failing in MariaDB 10.0 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, + # funcs_1.is_columns_mysql main.bootstrap + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test, main.mysql_client_test_nonblock + # main.mysql_client_test_comp: + # segfaults at random under Portage only, suspect resource limits. + # + # plugins.cracklib_password_check + # Can randomly fail due to cracklib return message + + for t in main.mysql_client_test main.mysql_client_test_nonblock \ + main.mysql_client_test_comp main.bootstrap \ + binlog.binlog_statement_insert_delayed main.information_schema \ + main.mysqld--help plugins.cracklib_password_check \ + funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do + mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" + done + + # Run mysql tests + pushd "${TESTDIR}" || die + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder + + retstatus_tests=$? + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + popd || die + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + + else + einfo "Skipping server tests due to minimal build." + fi +} diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild index ff319c10f03b..21d33e74532f 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.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$ @@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 MIT" SLOT="0/20" # subslot = soname major version -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs +threads" RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] diff --git a/dev-libs/libgpg-error/libgpg-error-1.19.ebuild b/dev-libs/libgpg-error/libgpg-error-1.19.ebuild index c4e2634ac2f1..adccfc617ec6 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.19.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.19.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$ @@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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="common-lisp nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest index c2736233b7fe..65231a0cae0a 100644 --- a/dev-libs/libmirage/Manifest +++ b/dev-libs/libmirage/Manifest @@ -1,2 +1,2 @@ -DIST libmirage-2.1.1.tar.bz2 190118 SHA256 f606391095200df510b923201881bfbadb6ab032035ce9a67aa24fcae3145108 SHA512 19e34e4f4546426dfe12f1dca65a8a8221d32be7c1b60313b8a4ed2ab0729508638a8b3acc74e44a29de7080b4cbc9d1590965b3a0e5a796756ff3a7f41ea652 WHIRLPOOL c09bcf628722a0a711c0e5280a6aed931e5b860e598354a48757bd941cb264cfc6d6f9a62d2cebc7c9e3a989276634a02ad3474ad499f2c0f86e1f6153856ef8 DIST libmirage-3.0.3.tar.bz2 210568 SHA256 d65b70fe7045a4575d3bc71678d515db93e0b047bca58798b515e202497a2d0e SHA512 f2f74cef07be964516ea5a502d0b16a9631ae8973fea3d2196b5e5da7545958c6c06dcd639f8b6d10570f125fab3c2f4b4e53cedaa30528f1c8c34f33dd88a82 WHIRLPOOL 51280bd4470cd78c95b9ed9b6d1533ff36bce1ddf7d7305934c7aba0b5a379c208418db330500fb177602566a9b17677dbe72ac3d6f1606013880ec1a567a9b5 +DIST libmirage-3.0.4.tar.bz2 210624 SHA256 cc05370f0cc15348910a149207384f03b48b204a19215c1510924244996a3f3f SHA512 e892133977daf8364f3542789057029de4ae2660ceec565368ad3cf6875fabab6d89142fd8080c1786b269b0b47ebbf867a951cc2f6a8a23c3cb3f1d6574f7f2 WHIRLPOOL 81c84cf078ec793ea71028a72b64f8ab4c7e1693ead0260b2347d9f1bbb619d084352f4ff3f1eee4e3d66f73571d65dadf67f614e87a7030feaa79353b99b833 diff --git a/dev-libs/libmirage/libmirage-2.1.1.ebuild b/dev-libs/libmirage/libmirage-3.0.4.ebuild index ed40e8510262..28ce05034321 100644 --- a/dev-libs/libmirage/libmirage-2.1.1.ebuild +++ b/dev-libs/libmirage/libmirage-3.0.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" CMAKE_MIN_VERSION="2.8.5" @@ -13,13 +13,13 @@ HOMEPAGE="http://cdemu.org" SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2" LICENSE="GPL-2+" -SLOT="0/9" # subslot = libmirage soname version -KEYWORDS="amd64 ~hppa x86" +SLOT="0/10" # subslot = libmirage soname version +KEYWORDS="~amd64 ~hppa ~x86" IUSE="doc +introspection" RDEPEND=">=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= - >=dev-libs/glib-2.24:2 + >=dev-libs/glib-2.28:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= @@ -35,8 +35,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(cmake-utils_use doc GTKDOC_ENABLED) - $(cmake-utils_use introspection INTROSPECTION_ENABLED) + -DGTKDOC_ENABLED="$(usex doc)" + -DINTROSPECTION_ENABLED="$(usex introspection)" -DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304 ) cmake-utils_src_configure diff --git a/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild index 9ff6efe1ead8..c3842a1b8345 100644 --- a/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild +++ b/dev-libs/libxslt/libxslt-1.1.28-r5.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$ @@ -15,7 +15,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~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="crypt debug examples python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/mpc/mpc-1.0.2-r1.ebuild b/dev-libs/mpc/mpc-1.0.2-r1.ebuild index 7ee23176e97b..debf526072f4 100644 --- a/dev-libs/mpc/mpc-1.0.2-r1.ebuild +++ b/dev-libs/mpc/mpc-1.0.2-r1.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$ @@ -12,7 +12,7 @@ SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?] diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest index 5e7ce279bed9..4231f5ba5eb7 100644 --- a/dev-lisp/ecls/Manifest +++ b/dev-lisp/ecls/Manifest @@ -2,3 +2,4 @@ DIST ecl-12.12.1.tgz 9006697 SHA256 54e77ce8157752eab49f8640f7d0077522d493a4d4de DIST ecl-13.5.1.tgz 9401163 SHA256 f91c57ce065fe9748bc8104e191e4b2dcfe854d634315fe7800dd0a613472ca2 SHA512 a09f8b824aa78e461d700eefb1a8b68b876e15d49124a397e0b5b58ad73b80f818133a7b8e48ddb83505eea2f9c5fb024de8701b527524004e336e456eb07c84 WHIRLPOOL def6de6444430e45bfff29c0716a23869e3455ba9b1cd9bfc1f02ef5c79c83df5b2280b8bada28acb1e742cdbe5c819970273386333d7c7c7c4fb48464dc6a2b DIST ecl-15.3.7.tgz 8755180 SHA256 2dc6ffbbf1e0a7b1323d49a991ba1f005127ca3e153651d91ba9e65bdaec948f SHA512 50a28ed551e507bee526ae44a12da2524c1feedf07cf8ca99650e37ecd7b99c4e2f2758c077979b174d303ffdcd9325637b708a29d14d8c3851c7e65d4ea026c WHIRLPOOL 57b0382b0e3dc7cd601b835a371c9ec6658911b1471cb5bfeee6144d22500e8ca55268f2a001c49d446e9be1a3771ca12348f2565f68ec83f1660c4295545a06 DIST ecl-16.0.0.tgz 8009304 SHA256 343ed4c3e4906562757a6039b85ce16d33dd5e8001d74004936795983e3af033 SHA512 15e4c604901dae1037e54ab1739d45a0f5f05decf6e72ba60d8b6b53e549021e93b811b809c4a72f423a20e9f9770969910d35edd5f184757293f98f89024c3a WHIRLPOOL 1af13ce81017bdad0ad6ee235beea9cc3e79d4b09b3863911a8092fd69a8d15f9c6eb75603c62d291450001d900cc1074c8882beb4c6da011b368b2a7f8fe7b5 +DIST ecl-16.1.2.tgz 7449461 SHA256 2d482b1a0a4fbd5d881434517032279d808cb6405e22dd91ef6d733534464b99 SHA512 f204494907226a12b4ecabc39d555f27c1ce5cba515fccd187d9b7ee584d86278558d6a26b2bbec98bce582239f21ac00c2d854f594c6b1f21e1636793845926 WHIRLPOOL 1590695d82c274d06806bffdadb872fba9b870efd19e234fd265b07911cd0bdfe456ddc16e63f9fd707559750a0373739627d440f91567084ee9e0c72b640f40 diff --git a/dev-lisp/ecls/ecls-16.1.2.ebuild b/dev-lisp/ecls/ecls-16.1.2.ebuild new file mode 100644 index 000000000000..19587873c9ed --- /dev/null +++ b/dev-lisp/ecls/ecls-16.1.2.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils multilib + +# test phase only works if ecls already installed #516876 +RESTRICT="test" + +MY_P=ecl-${PV} + +DESCRIPTION="ECL is an embeddable Common Lisp implementation" +HOMEPAGE="https://common-lisp.net/project/ecl/" +SRC_URI="https://common-lisp.net/project/ecl/files/release/${PV}/${MY_P}.tgz" + +LICENSE="BSD LGPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X" + +CDEPEND="dev-libs/gmp:0 + virtual/libffi + libatomic? ( dev-libs/libatomic_ops ) + >=dev-libs/boehm-gc-7.1[threads?] + >=dev-lisp/asdf-2.33-r3:=" +DEPEND="${CDEPEND} + app-text/texi2html + emacs? ( virtual/emacs >=app-eselect/eselect-emacs-1.12 )" +RDEPEND="${CDEPEND}" + +S="${WORKDIR}"/${MY_P} + +pkg_setup () { + if use gengc || use precisegc ; then + ewarn "You have enabled the generational garbage collector or" + ewarn "the precise collection routines. These features are not very stable" + ewarn "at the moment and may cause crashes." + ewarn "Don't enable them unless you know what you're doing." + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PV}-headers-gentoo.patch + cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die +} + +src_configure() { + econf \ + --with-system-gmp \ + --enable-boehm=system \ + --enable-longdouble=yes \ + --with-dffi \ + $(use_enable gengc) \ + $(use_enable precisegc) \ + $(use_with debug debug-cflags) \ + $(use_enable libatomic libatomic system) \ + $(use_with cpu_flags_x86_sse sse) \ + $(use_enable threads) \ + $(use_with threads __thread) \ + $(use_enable unicode) \ + $(use_with unicode unicode-names) \ + $(use_with X x) \ + $(use_with X clx) +} + +src_compile() { + if use emacs; then + local ETAGS=$(eselect --brief etags list | sed -ne '/emacs/{p;q}') + [[ -n ${ETAGS} ]] || die "No etags implementation found" + pushd build > /dev/null || die + emake ETAGS=${ETAGS} TAGS + popd > /dev/null + else + touch build/TAGS + fi + + #parallel make fails + emake -j1 || die "Compilation failed" +} + +src_install () { + emake DESTDIR="${D}" install || die "Installation failed" + + dodoc README.md CHANGELOG + dodoc "${FILESDIR}"/README.Gentoo + pushd build/doc + newman ecl.man ecl.1 + newman ecl-config.man ecl-config.1 + popd +} diff --git a/dev-lisp/ecls/files/16.1.2-headers-gentoo.patch b/dev-lisp/ecls/files/16.1.2-headers-gentoo.patch new file mode 100644 index 000000000000..193822a8fae2 --- /dev/null +++ b/dev-lisp/ecls/files/16.1.2-headers-gentoo.patch @@ -0,0 +1,13 @@ +diff -r -U1 ecl-16.1.2.orig/src/h/object.h ecl-16.1.2/src/h/object.h +--- ecl-16.1.2.orig/src/h/object.h 2016-02-25 08:06:19.000000000 +0100 ++++ ecl-16.1.2/src/h/object.h 2016-02-29 12:46:56.846308964 +0100 +@@ -27,4 +27,9 @@ + ++#ifndef TRUE + #define TRUE 1 /* boolean true value */ ++#endif ++ ++#ifndef FALSE + #define FALSE 0 /* boolean false value */ ++#endif + diff --git a/dev-python/pyxattr/pyxattr-0.5.5.ebuild b/dev-python/pyxattr/pyxattr-0.5.5.ebuild index d50e5f095b68..99d6941dfe45 100644 --- a/dev-python/pyxattr/pyxattr-0.5.5.ebuild +++ b/dev-python/pyxattr/pyxattr-0.5.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$ @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="doc test" RDEPEND="sys-apps/attr" diff --git a/dev-ruby/hipchat/Manifest b/dev-ruby/hipchat/Manifest index d8157e781ff5..f4ac2f93fca6 100644 --- a/dev-ruby/hipchat/Manifest +++ b/dev-ruby/hipchat/Manifest @@ -1,3 +1 @@ -DIST hipchat-1.4.0.tar.gz 14567 SHA256 d0686c3bd87516c02c0bfcb0512f84b6151cc88150c6b15d81719bf3d07d43fa SHA512 a599c6cf0c65f1421f83e99a73ab22dfaf4da229c6ee9871fed6698e5543bca581b3168d6577d6e2103506038567a6d9b279f338a3185547f1920460b5185d6e WHIRLPOOL d1990cc6eb74c2a408e17781cbb2127f8c9dea19df022e3452f87563386182030e410370a83feb970e24238d9712388ac16e747f6a776e0ae6c8e8815486b02e -DIST hipchat-1.5.1.tar.gz 16227 SHA256 5e9ba9ac8fb339fff78c10d4ad19c1570530aac38bfed936088958426f72f97a SHA512 ae385c3fce6f09a9c9a23e44651580ed68e53a354faa588d648a3c8ea2797b86313e91ef7dd25583c2ccaf7f4033ef9a4595ea9a6495f5f234415207fa7260d3 WHIRLPOOL 62d86e371ae75742be97df60e8be13bff9678367d2544a044174796df37e18c4412daff2f235959f541ce48f09845d81ccb38e7645ee50ee71659578a9a89820 DIST hipchat-1.5.2.tar.gz 16549 SHA256 624660f5be9d16ae847c817e4dcfb4745c64ef76987533f5c1c33fd03e20f035 SHA512 98f8287d922eb141ee7eca37bd658b81b7b2b0800c82d9576aef0869b928f7b5e00cecc65ca2041b69eedadb002928ed89f0cf500c9dc5d5cad05430e9ec9932 WHIRLPOOL 7693a46d7f165b95ff8f3270d11094e13b0da6782bf010cb284ae871659cd7902217fd9d1fe6117be4d923dc975d1aa26f9411b48391cc53152a36d472a52eea diff --git a/dev-ruby/hipchat/hipchat-1.4.0.ebuild b/dev-ruby/hipchat/hipchat-1.4.0.ebuild deleted file mode 100644 index 120b3f54a1a8..000000000000 --- a/dev-ruby/hipchat/hipchat-1.4.0.ebuild +++ /dev/null @@ -1,37 +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" - -RUBY_FAKEGEM_RECIPE_TEST="rspec" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="README.textile" - -inherit ruby-fakegem - -DESCRIPTION="Ruby library to interact with HipChat" -HOMEPAGE="https://github.com/hipchat/hipchat-rb" -SRC_URI="https://github.com/hipchat/hipchat-rb/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RUBY_S="hipchat-rb-${PV}" - -ruby_add_rdepend "dev-ruby/httparty" -ruby_add_bdepend "test? ( - dev-ruby/rr - dev-ruby/rake - dev-ruby/webmock - )" - -all_ruby_prepare() { - sed -i -e '/bundler/d' Rakefile ${PN}.gemspec || die "sed failed" - sed -i -e '/git ls-files/d' ${PN}.gemspec || die "sed failed" - - sed -i -e '/coveralls/I s:^:#:' spec/spec_helper.rb || die -} diff --git a/dev-ruby/hipchat/hipchat-1.5.1.ebuild b/dev-ruby/hipchat/hipchat-1.5.1.ebuild deleted file mode 100644 index d6eff1055c49..000000000000 --- a/dev-ruby/hipchat/hipchat-1.5.1.ebuild +++ /dev/null @@ -1,37 +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" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="README.textile" - -inherit ruby-fakegem - -DESCRIPTION="Ruby library to interact with HipChat" -HOMEPAGE="https://github.com/hipchat/hipchat-rb" -SRC_URI="https://github.com/hipchat/hipchat-rb/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RUBY_S="hipchat-rb-${PV}" - -ruby_add_rdepend "dev-ruby/httparty dev-ruby/mimemagic" -ruby_add_bdepend "test? ( - dev-ruby/rr - dev-ruby/rake - dev-ruby/webmock - )" - -all_ruby_prepare() { - sed -i -e '/bundler/d' Rakefile ${PN}.gemspec || die "sed failed" - sed -i -e '/git ls-files/d' ${PN}.gemspec || die "sed failed" - - sed -i -e '/coveralls/I s:^:#:' spec/spec_helper.rb || die -} diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest index 04fb4d71ef1d..37a09b1f7447 100644 --- a/dev-ruby/spring/Manifest +++ b/dev-ruby/spring/Manifest @@ -1,4 +1,3 @@ -DIST spring-1.6.0.tar.gz 39122 SHA256 9f0917d410a24e970fc7a6082f12548be617393162bbe9c646464b2912bd445f SHA512 ce5792cd2626a9e60ee73e24bd8a221aa93d3af2e6741e7e4df81b3a18fe79da46e2004f7d29f9a3db1a788663151a7869b4a738c239f6a13b5f2374c4ba9af7 WHIRLPOOL a213e56eefc724e9c45418c7073b7410bf11c2deb5746a2740e4a168bebfb39a22aa1ddb5b216eee92c9fabf02cffe7b1e51bfcf71abc9864ce9fc226b4a37bc -DIST spring-1.6.1.tar.gz 39109 SHA256 1f7206613c5fab57e77e2f551cb8a9bd3f3f0e445b095537048431ec92216c1f SHA512 129f99217b64ef1bc3c700b8dacb53df76a9dc6c0c76e523f9477bbbe2244f8c99881f9c9e092dc2a664ed938f438a5f30155f9cb1e1782e003ca494c7cca8bc WHIRLPOOL 40919d82d76f72e5d4f0fce5fd55c480e5070dfc165a3e4f90cdf70db961390cd279ff9f7d1a1268d5a3be9877e67887c51ee7bc26b6435ee96d54a280ad4eb8 DIST spring-1.6.2.tar.gz 39206 SHA256 2e4a579b8847de39fd4ff72d9644c354115d1174809d7f6c9cf67fba774671fe SHA512 bb46cb6fcbb70b976230a32075072f1fa5a7a1d9f4819a8d9783c3793713407e7481e091400fcf9f5cce0e1b40982b76c378f7384425d2ac71c12baec2fd9adf WHIRLPOOL 85bc50cbf156ed7356b603b31e880fbeb35c4062ddd16ed92d83af96444d370d9318bd770f6714daaf8690592c267929ac8ab12f2d3981156da78661c7b148e6 DIST spring-1.6.3.tar.gz 39349 SHA256 6396158ef4479e5bedaa4383db197ead1e04c4c9781eed3300e954ec66a6ce34 SHA512 88d605cd5c9751a8dd3d9e7903beda0304f0d7b31934735c841b63ee450d5250b73b73f7c95f8a25dcffbbeb73e05028873bf54827481d19a691d345744d576d WHIRLPOOL ff8220c6ba1201765268120434903796c7a2ce3401ca88a71d3b82aaca1694471fe1fe929832559a8faf666aee8b9b517f462aee12a81940d5047893b1dbf719 +DIST spring-1.6.4.tar.gz 39370 SHA256 d7584ecb01fb980451c12d65bbb0175c7b15fb3bf8c117058145de5ecc8c349b SHA512 9dffdcef750bd25028761da8e69c44ae3eace843dff9f81d5566085d3a8c7f944f4c99b6d455078ff564b7135116ae38dcf1aaf6dcc127ac351eae85e15dc143 WHIRLPOOL b7fd0e1520b77e1dc150f270e1cb222915ab98322b9ec0f75242fbfeceec7bd6155262a2fdeee8cf8c5651e9b03e1ce441159042c877675ddc3c4e07fbb2e1cb diff --git a/dev-ruby/spring/spring-1.6.0.ebuild b/dev-ruby/spring/spring-1.6.0.ebuild deleted file mode 100644 index cd7a65f1f2c9..000000000000 --- a/dev-ruby/spring/spring-1.6.0.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 -USE_RUBY="ruby20 ruby21" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -RUBY_FAKEGEM_TASK_TEST="test:unit" - -inherit ruby-fakegem - -DESCRIPTION="Rails application preloader" -HOMEPAGE="https://github.com/rails/spring" -SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="1.1" -KEYWORDS="~amd64" - -IUSE="" - -ruby_add_rdepend ">=dev-ruby/rubygems-2.1.0" - -ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )" - -all_ruby_prepare() { - sed -i -e '/files/d' \ - -e '/bump/d' ${PN}.gemspec || die - sed -i -e '/bump/d' Rakefile || die -} diff --git a/dev-ruby/spring/spring-1.6.1.ebuild b/dev-ruby/spring/spring-1.6.4.ebuild index dfb5fc5c98d2..034b7e72e60a 100644 --- a/dev-ruby/spring/spring-1.6.1.ebuild +++ b/dev-ruby/spring/spring-1.6.4.ebuild @@ -1,9 +1,9 @@ -# 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="ruby20 ruby21" +USE_RUBY="ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.24.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.24.ebuild index 5421066fb5c5..1c46db4a2789 100644 --- a/dev-util/gtk-doc-am/gtk-doc-am-1.24.ebuild +++ b/dev-util/gtk-doc-am/gtk-doc-am-1.24.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$ @@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtk.org/gtk-doc/" LICENSE="GPL-2 FDL-1.1" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~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="" RDEPEND=">=dev-lang/perl-5.6" diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass index 1512b21d4ddb..65ebe85a2a35 100644 --- a/eclass/mysql-multilib-r1.eclass +++ b/eclass/mysql-multilib-r1.eclass @@ -38,15 +38,21 @@ MYSQL_EXTRAS="" # @DESCRIPTION: # An array of CMake arguments added to native and non-native -inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} mysql_fx versionator \ - multilib prefix toolchain-funcs user cmake-utils multilib-minimal +# Keeping eutils in EAPI=6 for emktemp in pkg_config + +inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} versionator \ + prefix toolchain-funcs user cmake-utils multilib-minimal + +if [[ "${EAPI}x" == "5x" ]]; then + inherit multilib mysql_fx +fi # # Supported EAPI versions and export functions # case "${EAPI:-0}" in - 5) ;; + 5|6) ;; *) die "Unsupported EAPI: ${EAPI}" ;; esac @@ -82,19 +88,18 @@ if [[ -z ${MYSQL_PV_MAJOR} ]] ; then MYSQL_PV_MAJOR="$(get_version_component_ran # depend on this variable. # In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803" # We also strip off upstream's trailing letter that they use to respin tarballs -MYSQL_VERSION_ID="" -tpv="${PV%[a-z]}" -tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" -for vatom in 0 1 2 3 ; do - # pad to length 2 - tpv[${vatom}]="00${tpv[${vatom}]}" - MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" -done -# strip leading "0" (otherwise it's considered an octal number by BASH) -MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} - -# This eclass should only be used with at least mysql-5.5.35 -mysql_version_is_at_least "5.5.35" || die "This eclass should only be used with >=mysql-5.5.35" +if [[ "${EAPI}x" == "5x" ]]; then + MYSQL_VERSION_ID="" + tpv="${PV%[a-z]}" + tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}" + for vatom in 0 1 2 3 ; do + # pad to length 2 + tpv[${vatom}]="00${tpv[${vatom}]}" + MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}" + done + # strip leading "0" (otherwise it's considered an octal number by BASH) + MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"} +fi # Work out the default SERVER_URI correctly if [[ -z ${SERVER_URI} ]]; then @@ -223,7 +228,7 @@ mysql-multilib-r1_pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]] ; then local GCC_MAJOR_SET=$(gcc-major-version) local GCC_MINOR_SET=$(gcc-minor-version) - if use_if_iuse tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ + if in_iuse tokudb && use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." eerror "Please use gcc-config to switch to gcc-4.7 or later version." @@ -285,14 +290,16 @@ mysql-multilib-r1_src_prepare() { if [[ ${MY_EXTRAS_VER} != none ]]; then # Apply the patches for this MySQL version - EPATCH_SUFFIX="patch" - mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" - # Clean out old items - rm -f "${EPATCH_SOURCE}"/* - # Now link in right patches - mysql_mv_patches - # And apply - epatch + if [[ "${EAPI}x" == "5x" ]]; then + EPATCH_SUFFIX="patch" + mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory" + # Clean out old items + rm -f "${EPATCH_SOURCE}"/* + # Now link in right patches + mysql_mv_patches + # And apply + epatch + fi fi # last -fPIC fixup, per bug #305873 @@ -332,7 +339,11 @@ mysql-multilib-r1_src_prepare() { rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" fi - epatch_user + if [[ "${EAPI}x" == "5x" ]] ; then + epatch_user + else + default + fi } # @FUNCTION: mysql-multilib-r1_src_configure @@ -342,7 +353,7 @@ mysql-multilib-r1_src_configure() { # Bug #114895, bug #110149 filter-flags "-O" "-O[01]" - append-cxxflags -felide-constructors -fno-rtti + append-cxxflags -felide-constructors # bug #283926, with GCC4.4, this is required to get correct behavior. append-flags -fno-strict-aliasing @@ -388,7 +399,7 @@ multilib_src_configure() { -DINSTALL_UNIX_ADDRDIR=${EPREFIX}/var/run/mysqld/mysqld.sock -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 - -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_unitdir)" + -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" ) if in_iuse systemd ; then @@ -680,7 +691,7 @@ mysql-multilib-r1_pkg_postinst() { fi done - if use_if_iuse pam ; then + if in_iuse pam && use pam; then einfo elog "This install includes the PAM authentication plugin." elog "To activate and configure the PAM plugin, please read:" @@ -708,7 +719,7 @@ mysql-multilib-r1_pkg_postinst() { einfo fi - if use_if_iuse galera ; then + if in_iuse galera && use galera ; then einfo elog "Be sure to edit the my.cnf file to activate your cluster settings." elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" @@ -1038,9 +1049,80 @@ mysql-multilib-r1_disable_test() { # and some check WITHOUT_. Also, this can easily extend to non-storage plugins. mysql-cmake_use_plugin() { [[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>" - if use_if_iuse $1 ; then + if in_iuse $1 && use $1 ; then echo "-DWITH_$2=1 -DPLUGIN_$2=YES" else echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO" fi } + +# @FUNCTION: mysql_init_vars +# @DESCRIPTION: +# void mysql_init_vars() +# Initialize global variables +# 2005-11-19 <vivo@gentoo.org> +if [[ "${EAPI}x" != "5x" ]]; then + +mysql_init_vars() { + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} + MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"} + MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"} + + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="" + if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then + MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1` + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ + | sed -e 's/.*=\s*//' \ + | tail -n1` + fi + fi + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR="${MY_LOCALSTATEDIR}" + einfo "Using default MY_DATADIR" + fi + elog "MySQL MY_DATADIR is ${MY_DATADIR}" + + if [[ -z "${PREVIOUS_DATADIR}" ]] ; then + if [[ -e "${MY_DATADIR}" ]] ; then + # If you get this and you're wondering about it, see bug #207636 + elog "MySQL datadir found in ${MY_DATADIR}" + elog "A new one will not be created." + PREVIOUS_DATADIR="yes" + else + PREVIOUS_DATADIR="no" + fi + export PREVIOUS_DATADIR + fi + else + if [[ ${EBUILD_PHASE} == "config" ]]; then + local new_MY_DATADIR + new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=||p' \ + | tail -n1` + + if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then + ewarn "MySQL MY_DATADIR has changed" + ewarn "from ${MY_DATADIR}" + ewarn "to ${new_MY_DATADIR}" + MY_DATADIR="${new_MY_DATADIR}" + fi + fi + fi + + if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then + MY_SOURCEDIR=${SERVER_URI##*/} + MY_SOURCEDIR=${MY_SOURCEDIR%.tar*} + fi + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR + export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR +} +fi diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest index 5d7d73474519..5ddc1ddfdeb8 100644 --- a/games-util/pyfa/Manifest +++ b/games-util/pyfa/Manifest @@ -1 +1 @@ -DIST pyfa-1.15.0.tar.gz 6243527 SHA256 27ec6748b5f1083050d47a364a8699e521a614c5c643a639441c82168017123c SHA512 c966e3fd7627ef575247b00eacee7392f7f2d32b14485c2a7e5aa0c6f3fe6ad99c1a536bfcbfcc6de29fa4bdc177b6a12e0a571926c1b7b755ef9fc6f76f3bad WHIRLPOOL f6ba22d7f3899c4a3fd702a5d0145b39e06e70793da2682c6bb0df0b3772c02f250b59d05a4fee23f72d87010f02d916a944c0499852dc0be845e1ae56b61904 +DIST pyfa-1.19.1.tar.gz 6688136 SHA256 f597019117b335971287fd47c1faa5be049f8a6879d4144b6c8a0039f35cea98 SHA512 b5f09ca0dde528636c5e6bc0b6987b6203dfc70ad9aa0c9238150e83de76ac138e302b5db7f40d885d6702c4c1eabae184d49af0a84e6bf3402036df24d296f6 WHIRLPOOL 8f5e42065d9945c96c7cca13301ab6ed0a286db7dc3041926af920dddf5605910ea9c259d00db1e937f2329f6156d0b4ed36330ea6d89f14bd0db9abccfca0ff diff --git a/games-util/pyfa/files/configforced.py b/games-util/pyfa/files/configforced.py deleted file mode 100644 index a8008c217eda..000000000000 --- a/games-util/pyfa/files/configforced.py +++ /dev/null @@ -1,4 +0,0 @@ -# Gentoo-specific settings -pyfaPath = u'%%SITEDIR%%/pyfa' -staticPath = u'%%EPREFIX%%/usr/share/pyfa/staticdata' -gameDB = staticPath + "/eve.db" diff --git a/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch b/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch deleted file mode 100644 index 8269080038f9..000000000000 --- a/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f301dcd0df741514e889fc234811cd4770dca6c7 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Wed, 5 Dec 2012 00:48:12 -0500 -Subject: [PATCH] Append $(python_get_sitedir)/pyfa to import path - -Ensures that pyfa's import statements continue to work for systemwide -installation. ---- - pyfa.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pyfa.py b/pyfa.py -index 6992aaf..d66cb70 100755 ---- a/pyfa.py -+++ b/pyfa.py -@@ -63,6 +63,9 @@ if __name__ == "__main__": - parser.add_option("-r", "--root", action="store_true", dest="rootsavedata", help="if you want pyfa to store its data in root folder, use this option", default=False) - (options, args) = parser.parse_args() - -+ import os -+ sys.path.append(os.path.join("%%SITEDIR%%", "pyfa")) -+ - import config - # Configure paths - if options.rootsavedata is True: --- -1.8.0 - diff --git a/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch b/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch deleted file mode 100644 index cdcc9f90d3e5..000000000000 --- a/games-util/pyfa/files/pyfa-1.1.20-staticPath.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 69660180a59d0d100097dedbc507d4af73267e8d Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Wed, 30 Nov 2011 12:50:53 -0500 -Subject: [PATCH] Make staticPath settable from configforced - ---- - config.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/config.py b/config.py -index e39e0d3..e028c36 100644 ---- a/config.py -+++ b/config.py -@@ -66,7 +66,9 @@ def defPaths(): - - # Static EVE Data from the staticdata repository, should be in the staticdata - # directory in our pyfa directory -- staticPath = os.path.join(pyfaPath, "staticdata") -+ staticPath = getattr(configforced, "staticPath", None) -+ if staticPath is None: -+ staticPath = os.path.join(pyfaPath, "staticdata") - - # The database where we store all the fits etc - saveDB = os.path.join(savePath, "saveddata.db") --- -1.8.5.3 - diff --git a/games-util/pyfa/metadata.xml b/games-util/pyfa/metadata.xml index 37773528cf6f..2c0b85a4e6ef 100644 --- a/games-util/pyfa/metadata.xml +++ b/games-util/pyfa/metadata.xml @@ -15,6 +15,6 @@ fits, etc. <flag name="graph">Enable support for graphs</flag> </use> <upstream> - <remote-id type="github">DarkFenX/Pyfa</remote-id> + <remote-id type="github">pyfa-org/Pyfa</remote-id> </upstream> </pkgmetadata> diff --git a/games-util/pyfa/pyfa-1.15.0.ebuild b/games-util/pyfa/pyfa-1.19.1.ebuild index 76dac888c189..0d2065a0b205 100644 --- a/games-util/pyfa/pyfa-1.15.0.ebuild +++ b/games-util/pyfa/pyfa-1.19.1.ebuild @@ -1,58 +1,61 @@ -# 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=( python2_7 ) PYTHON_REQ_USE="sqlite,threads" inherit eutils gnome2-utils python-r1 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" -HOMEPAGE="https://github.com/DarkFenX/Pyfa" +HOMEPAGE="https://github.com/pyfa-org/Pyfa" LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm" SLOT="0" if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git" - inherit git-2 + EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git" + inherit git-r3 KEYWORDS="" else - SRC_URI="https://github.com/DarkFenX/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz" + SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi IUSE="+graph" RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/sqlalchemy[${PYTHON_USEDEP}] - dev-python/wxpython:2.8[${PYTHON_USEDEP}] + dev-python/wxpython:3.0[${PYTHON_USEDEP}] graph? ( dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] ) ${PYTHON_DEPS}" -DEPEND="app-arch/unzip" +DEPEND="app-arch/zip" -S=${WORKDIR}/Pyfa-${PV} +[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV} src_prepare() { # get rid of CRLF line endings introduced in 1.1.10 so patches work edos2unix config.py pyfa.py service/settings.py - # make staticPath settable from configforced again - epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch" + # load gameDB and images from separate staticdata directory + eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch" # do not try to save exported html to python sitedir - epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" + eapply "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" # fix import path in the main script for systemwide installation - epatch "${FILESDIR}/${PN}-1.1.11-import-pyfa.patch" + eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch" + + eapply_user + touch __init__.py pyfa_make_configforced() { mkdir -p "${BUILD_DIR}" || die sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ -e "s:%%EPREFIX%%:${EPREFIX}:" \ - "${FILESDIR}/configforced.py" > "${BUILD_DIR}/configforced.py" + "${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ pyfa.py > "${BUILD_DIR}/pyfa" } @@ -63,7 +66,7 @@ src_install() { pyfa_py_install() { local packagedir=$(python_get_sitedir)/${PN} insinto "${packagedir}" - doins -r eos gui icons service utils config*.py __init__.py gpl.txt + doins -r eos gui service utils config*.py __init__.py [[ -e info.py ]] && doins info.py # only in zip releases doins "${BUILD_DIR}/configforced.py" python_doscript "${BUILD_DIR}/pyfa" @@ -72,12 +75,19 @@ src_install() { python_foreach_impl pyfa_py_install insinto /usr/share/${PN} - doins -r staticdata + doins eve.db + + einfo "Compressing images ..." + pushd imgs > /dev/null || die + zip -r imgs.zip * || die "zip failed" + doins imgs.zip + popd > /dev/null || die + dodoc README.md insinto /usr/share/icons/hicolor/32x32/apps - doins icons/pyfa.png + doins imgs/gui/pyfa.png insinto /usr/share/icons/hicolor/64x64/apps - newins icons/pyfa64.png pyfa.png + newins imgs/gui/pyfa64.png pyfa.png domenu "${FILESDIR}/${PN}.desktop" } diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild index 5e11d005abf5..0d2065a0b205 100644 --- a/games-util/pyfa/pyfa-9999.ebuild +++ b/games-util/pyfa/pyfa-9999.ebuild @@ -1,24 +1,24 @@ -# 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=( python2_7 ) PYTHON_REQ_USE="sqlite,threads" inherit eutils gnome2-utils python-r1 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" -HOMEPAGE="https://github.com/DarkFenX/Pyfa" +HOMEPAGE="https://github.com/pyfa-org/Pyfa" LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm" SLOT="0" if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git" + EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git" inherit git-r3 KEYWORDS="" else - SRC_URI="https://github.com/DarkFenX/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz" + SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" fi IUSE="+graph" @@ -39,13 +39,16 @@ src_prepare() { edos2unix config.py pyfa.py service/settings.py # load gameDB and images from separate staticdata directory - epatch "${FILESDIR}/${PN}-1.15.1-staticdata.patch" + eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch" # do not try to save exported html to python sitedir - epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" + eapply "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" # fix import path in the main script for systemwide installation - epatch "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch" + eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch" + + eapply_user + touch __init__.py pyfa_make_configforced() { diff --git a/licenses/IBPP-1.1 b/licenses/IBPP-1.1 deleted file mode 100644 index 99ef9e6b2581..000000000000 --- a/licenses/IBPP-1.1 +++ /dev/null @@ -1,22 +0,0 @@ -IBPP License v1.1 ------------------ - -(C) Copyright 2000-2006 T.I.P. Group S.A. and the IBPP Team (www.ibpp.org) - -Permission is hereby granted, free of charge, to any person or organization -("You") obtaining a copy of this software and associated documentation files -covered by this license (the "Software") to use the Software as part of another -work; to modify it for that purpose; to publish or distribute it, modified or -not, for that same purpose; to permit persons to whom the other work using the -Software is furnished to do so; subject to the following conditions: the above -copyright notice and this complete and unmodified permission notice shall be -included in all copies or substantial portions of the Software; You will not -misrepresent modified versions of the Software as being the original. - -The Software is provided "as is", without warranty of any kind, express or -implied, including but not limited to the warranties of merchantability, -fitness for a particular purpose and noninfringement. In no event shall -the authors or copyright holders be liable for any claim, damages or other -liability, whether in an action of contract, tort or otherwise, arising from, -out of or in connection with the software or the use of other dealings in -the Software. diff --git a/licenses/ixp4xx b/licenses/ixp4xx deleted file mode 100644 index ddb3efcc8158..000000000000 --- a/licenses/ixp4xx +++ /dev/null @@ -1,170 +0,0 @@ -http://www.intel.com/design/network/swsup/np_sla/ixp400.htm -http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm - - INTEL SOFTWARE LICENSE AGREEMENT - IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING. - - DO NOT USE OR LOAD THIS SOFTWARE OR ANY ASSOCIATED MATERIALS - (COLLECTIVELY, THE "SOFTWARE") UNTIL YOU HAVE CAREFULLY READ THE - FOLLOWING TERMS AND CONDITIONS. BY LOADING OR USING THE SOFTWARE, YOU - AS AN INDIVIDUAL AND ON BEHALF OF YOUR EMPLOYER ("YOU") AGREE TO THE - TERMS OF THIS AGREEMENT. - IF YOU DO NOT WISH TO SO AGREE, DO NOT INSTALL OR USE THE SOFTWARE. - LICENSE: Subject to the terms and conditions of this Agreement - including without limitation the restrictions below, Intel Corporation - ("Intel") grants to you the following non-exclusive, non-transferable, - non-assignable, royalty-free copyright licenses in the Software: - * "Redistributable Code" includes all Software EXCEPT for the software - contained in the subdirectory "ixp425_xscale_sw/src/adsl". Subject to - the terms and conditions of this Agreement, You may reproduce, create - derivative works of, and distribute Redistributable Code, in - executable or source form, ONLY with, or as part of, Your Product (as - defined below), subject to the restrictions set forth in this - Agreement. Distribution for any other purpose or in any other manner - is prohibited under this license. - * If you have downloaded the version of IXP400 Software with - encryption Software, all Software contained in the - ixp425AccessLibraryWithCrypto_x_y.zip (Where x and y represent the - specific version number of the software) is also Redistributable Code - EXCEPT for the software contained in the subdirectory - "ixp425_xscale_sw/src/adsl." Note that all Software in the - ixp425AccessLibraryWithCrypto_x_y.zip file is subject to the U.S. - Export Administration Regulations and other U.S. law, and You are - responsible for compliance with such laws and regulations. - * "Non-Redistributable Code" includes the Software contained in the - ixp425AccessLibrary_x_y.zip and ixp425AccessLibraryWithCrypto_x_y.zip - subdirectory "ixp425_xscale_sw/src/adsl." Subject to the terms and - conditions of this Agreement, You may reproduce and create derivative - works of Non-Redistributable Code, and distribute such derivative - works only in executable form and ONLY with, or as part of, Your - Product, subject to the restrictions set forth in this Agreement. - Redistributable Code may NOT be redistributed to third parties in - source code form, and may NOT be distributed if such distribution - would obligate You, under an open source agreement or otherwise, to - make source code available to third parties. If you desire to - redistribute the Non-Redistributable Source Code, please contact Intel - to request information. - "Your Product" must be: (1) a hardware product that includes an Intel - network processor ("Your Hardware Product"); and/or (2) software that - runs on or interfaces with an Intel network processor; and which also - includes a substantial amount of software functionality, software - modifications and/or hardware that differentiates it from the Software - as provided by Intel ("Your Software Product"). - RESTRICTIONS: - Any authorized distribution of the Software and/or derivative works - thereof is also subject to the following conditions: You: (i) enter - into a written agreement (enforceable "shrink-wrap" or "click to - accept" licenses are permissible) with the entity or person to whom - you are distributing such Software that are least as restrictive as - the terms and conditions you enter into with your licensees for - distribution of your software; (ii) are solely responsible for any - warranty, update or support obligation, or other liability that may - arise from Your distribution of Software and/or derivative works; - (iii) will not make any statement that your product is warranted, - "certified," or that its performance is guaranteed, by Intel; (iv) - will not use Intel's name or trademarks to market your product without - written permission of an authorized representative of Intel; (v) shall - prohibit disassembly and reverse engineering of any executable - Software and/or derivative works thereof; (vi) shall indemnify, hold - harmless, and defend Intel (including its officers, employees, - directors, subsidiaries, representatives, affiliates and agents) and - Intel's suppliers from and against any claims or lawsuits, including - attorney's fees and expenses, that arise or result from your - distribution of any Software or derivative works thereof, including - any liabilities arising from any permitted distribution under any open - source license. - OPEN SOURCE SOFTWARE RESTRICTIONS. Unless expressly permitted - elsewhere in this license, You may not combine or distribute the - Software with Open Source Software (as defined below) or with software - developed using Open Source Software (e.g., tools) in a manner that - subjects Intel or any portion of the Software provide by Intel - hereunder to any license obligations of such Open Source Software. - "Open Source Software" means any software licensed under terms - requiring that other software combined or distributed with such - software: (i) be disclosed or distributed in source code form; (ii) be - licensed on terms inconsistent with the terms of this Agreement. - NO SUPPORT UNDER THIS LICENSE AGREEMENT. Intel has no obligation to - support the Software under this Agreement. - EXPORT. You shall NOT export, either directly or indirectly, any - product, service or technical data or system incorporating Software - without first obtaining any required license or other approval from - the U. S. Department of Commerce or any other agency or department of - the United States Government. In the event any Software is exported - from the United States or re-exported from a foreign destination by - You, You shall ensure that the distribution and export/re-export or - import of the Software is in compliance with all laws, regulations, - orders, or other restrictions of the U.S. Export Administration - Regulations and the appropriate foreign government. You shall NOT - export/re-export any technical data, process, product, or service, - directly or indirectly, to any country for which the United States - government or any agency thereof or the foreign government from where - it is shipping requires an export license, or other governmental - approval, without first obtaining such license or approval. - OWNERSHIP OF SOFTWARE AND INTELLECTUAL PROPERTY. Title to all copies - of the Software and any intellectual property therein remains with - Intel or its suppliers. The Software is copyrighted and protected by - the laws of the United States and other countries, and by - international treaty provisions. You may not remove any copyright - notices from the Software. Intel may make changes to the Software, or - to items referenced therein, at any time without notice, but is not - obligated to support or update the Software. Except as otherwise - expressly provided, Intel grants no express or implied right under - Intel patents, copyrights, trademarks, or other intellectual property - rights. You may not transfer the Software. - DISCLAIMER OF WARRANTIES. THE SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY - EXPRESS OR IMPLIED WARRANTY OF ANY KIND INCLUDING WARRANTIES OF - MERCHANTABILITY, NONINFRINGEMENT, OR FITNESS FOR A PARTICULAR PURPOSE. - Intel does not warrant or assume responsibility for the accuracy or - completeness of any information, text, graphics, links or other items - contained within the Software. - LIMITATION OF LIABILITY. IN NO EVENT SHALL INTEL OR ITS SUPPLIERS BE - LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, LOST - PROFITS, BUSINESS INTERRUPTION, OR LOST INFORMATION) ARISING OUT OF - THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF INTEL HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS - PROHIBIT EXCLUSION OR LIMITATION OF LIABILITY FOR IMPLIED WARRANTIES - OR CONSEQUENTIAL OR INCIDENTAL DAMAGES, SO THE ABOVE LIMITATION MAY - NOT APPLY TO YOU. YOU MAY ALSO HAVE OTHER LEGAL RIGHTS THAT VARY FROM - JURISDICTION TO JURISDICTION. - TERMINATION OF THIS AGREEMENT. Intel may terminate this Agreement at - any time if you violate its terms. Upon termination, you will - immediately destroy the Software or return all copies of the Software - to Intel. - APPLICABLE LAWS. Any claims arising under or relating to this - Agreement shall be governed by the internal substantive laws of the - State of Delaware or federal courts located in Delaware, without - regard to principles of conflict of laws. Each Party hereby agrees to - jurisdiction and venue in the courts of the State of Delaware for all - disputes and litigation arising under or relating to this Agreement. - The Parties agree that the United Nations Convention on Contracts for - the International Sale of Goods is specifically excluded from - application to this Agreement. The Parties consent to the personal - jurisdiction of the above courts. In the event any proceeding or - lawsuit is brought by Intel or You in connection with this Agreement, - the prevailing Party in such proceeding shall be entitled to receive - its costs, expert witness fees and reasonable attorneys' fees, - including costs and fees on appeal. It is understood and agreed that, - notwithstanding any other provisions of this Agreement, breach of the - "License" or "Distribution" sections of this Agreement by You will - cause Intel irreparable damage for which recovery of money damages - would be inadequate, and that Intel therefore shall be entitled to - obtain timely injunctive relief to protect this Intel's rights under - this Agreement in addition to any and all remedies available at law. - GOVERNMENT RESTRICTED RIGHTS. The Software is a "commercial item" as - that term is defined in 48 C.F.R. 2.101, consisting of "commercial - computer software" and "commercial computer software documentation" as - such terms are used in 48 C.F.R. 12.212. Consistent with 48 C.F.R. - 12.212 and 48 C.F.R 227.7202-1 through 227.7202-4, You will provide - the Software to U.S. Government as an End User only pursuant to the - terms and conditions therein. You shall provide the Software to - foreign governments in an equivalent manner as described in this - Section. - REVERSE ENGINEERING. You may not reverse-assemble, reverse-compile, or - otherwise reverse-engineer any software provided solely in executable - form. - ENTIRE AGREEMENT; MODIFICATION. This Agreement constitutes the entire - agreement between You and Intel and supersedes in their entirety any - and all oral or written agreements previously existing between You and - Intel with respect to the subject matter hereof. For the avoidance of - doubt, this Agreement shall in no way supersede any terms and - conditions of any third-party software license agreement. diff --git a/licenses/truecrypt-3.0 b/licenses/truecrypt-3.0 deleted file mode 100644 index d608906b7a65..000000000000 --- a/licenses/truecrypt-3.0 +++ /dev/null @@ -1,168 +0,0 @@ -TrueCrypt License Version 3.0 - - -Software distributed under this license is distributed on an "AS IS" BASIS WITHOUT WARRANTIES OF ANY KIND. THE AUTHORS AND DISTRIBUTORS OF THE SOFTWARE DISCLAIM ANY LIABILITY. ANYONE WHO USES, COPIES, MODIFIES, OR (RE)DISTRIBUTES ANY PART OF THE SOFTWARE IS, BY SUCH ACTION(S), ACCEPTING AND AGREEING TO BE BOUND BY ALL TERMS AND CONDITIONS OF THIS LICENSE. IF YOU DO NOT ACCEPT THEM, DO NOT USE, COPY, MODIFY, NOR (RE)DISTRIBUTE THE SOFTWARE, NOR ANY PART(S) THEREOF. - - -I. Definitions - -1. "This Product" means the work (including, but not limited to, source code, graphics, texts, and accompanying files) made available under and governed by this version of this license ("License"), as may be indicated by, but is not limited to, copyright notice(s) attached to or included in the work. - -2. "You" means (and "Your" refers to) an individual or a legal entity (e.g., a non-profit organization, commercial organization, government agency, etc.) exercising permissions granted by this License. - -3. "Modification" means (and "modify" refers to) any alteration of This Product, including, but not limited to, addition to or deletion from the substance or structure of This Product, translation into another language, repackaging, alteration or removal of any file included with This Product, and addition of any new files to This Product. - -4. "Your Product" means This Product modified by You, or any work You derive from (or base on) any part of This Product. In addition, "Your Product" means any work in which You include any (modified or unmodified) portion of This Product. However, if the work in which you include it is an aggregate software distribution (such as an operating system distribution or a cover CD-ROM of a magazine) containing multiple separate products, then the term "Your Product" includes only those products (in the aggregate software distribution) that use, include, or depend on a modified or unmodified version of This Product (and the term "Your Product" does not include the whole aggregate software distribution). For the purposes of this License, a product suite consisting of two or more products is considered a single product (operating system distributions and cover media of magazines are not considered product suites). - -5. "Distribution" means (and "distribute" refers to), regardless of means or methods, conveyance, transfer, providing, or making available of This/Your Product or portions thereof to third parties (including, but not limited to, making This/Your Product, or portions thereof, available for download to third parties, whether or not any third party has downloaded the product, or any portion thereof, made available for download). - - - -II. Use, Copying, and Distribution of This Product - -1. Provided that You comply with all applicable terms and conditions of this License, You may make copies of This Product (unmodified) and distribute copies of This Product (unmodified) that are not included in another product forming Your Product (except as permitted under Chapter III). Note: For terms and conditions for copying and distribution of modified versions of This Product, see Chapter III. - -2. Provided that You comply with all applicable terms and conditions of this License, You may use This Product freely (see also Chapter III) on any number of computers/systems for non-commercial and/or commercial purposes. - - - -III. Modification, Derivation, and Inclusion in Other Products - -1. If all conditions specified in the following paragraphs in this Chapter (III) are met (for exceptions, see Section III.2) and if You comply with all other applicable terms and conditions of this License, You may modify This Product (thus forming Your Product), derive new works from This Product or portions thereof (thus forming Your Product), include This Product or portions thereof in another product (thus forming Your Product, unless defined otherwise in Chapter I), and You may use (for non-commercial and/or commercial purposes), copy, and/or distribute Your Product. - - 1. The name of Your Product (or of Your modified version of This Product) must not contain the name TrueCrypt (for example, the following names are not allowed: TrueCrypt, TrueCrypt+, TrueCrypt Professional, iTrueCrypt, etc.) nor any other names confusingly similar to the name TrueCrypt (e.g., True-Crypt, True Crypt, TruKrypt, etc.) - - Note: TrueCrypt and the TrueCrypt logo are registered trademarks. The goal is not to monetize the name or the product, but to protect the reputation of TrueCrypt, and to prevent support issues and other kinds of issues that might arise from the existence of similar products with the same or similar name. Even though TrueCrypt and the TrueCrypt logo are trademarks, TrueCrypt is and will remain open-source and free software. - - All occurrences of the name TrueCrypt that could reasonably be considered to identify Your Product must be removed from Your Product and from any associated materials. Logo(s) included in (or attached to) Your Product (and in/to associated materials) must not incorporate and must not be confusingly similar to any of the TrueCrypt logos (including, but not limited to, the non-textual logo consisting primarily of a key in stylized form) or portion(s) thereof. All graphics contained in This Product (logos, icons, etc.) must be removed from Your Product (or from Your modified version of This Product) and from any associated materials. - - 2. The following phrases must be removed from Your Product and from any associated materials, except the text of this License: "A TrueCrypt Foundation Release", "Released by TrueCrypt Foundation", "This is a TrueCrypt Foundation release." - - 3. Phrase "Based on TrueCrypt, freely available at http://www.truecrypt.org/" must be displayed by Your Product (if technically feasible) and contained in its documentation. Alternatively, if This Product or its portion You included in Your Product constitutes only a minor portion of Your Product, phrase "Portions of this product are based in part on TrueCrypt, freely available at http://www.truecrypt.org/" may be displayed instead. In each of the cases mentioned above in this paragraph, "http://www.truecrypt.org/" must be a hyperlink (if technically feasible) pointing to http://www.truecrypt.org/ and You may freely choose the location within the user interface (if there is any) of Your Product (e.g., an "About" window, etc.) and the way in which Your Product will display the respective phrase. - - Your Product (and any associated materials, e.g., the documentation, the content of the official web site of Your Product, etc.) must not present any Internet address containing the domain name truecrypt.org (or any domain name that forwards to the domain name truecrypt.org) in a manner that might suggest that it is where information about Your Product may be obtained or where bugs found in Your Product may be reported or where support for Your Product may be available or otherwise attempt to indicate that the domain name truecrypt.org is associated with Your Product. - - 4. The complete source code of Your Product must be freely and publicly available (for exceptions, see Section III.2) at least until You cease to distribute Your Product. This condition can be met in one or both of the following ways: (i) You include the complete source code of Your Product with every copy of Your Product that You make and distribute and You make all such copies of Your Product available to the general public free of charge, and/or (ii) You include information (valid and correct at least until You cease to distribute Your Product) about where the complete source code of Your Product can be obtained free of charge (e.g., an Internet address) or for a reasonable reproduction fee with every copy of Your Product that You make and distribute and, if there is a web site officially associated with Your Product, You include the aforementioned information about the source code on a freely and publicly accessible web page to which such web site links via an easily viewable hyperlink (at least until You cease to distribute Your Product). - - The source code of Your Product must not be deliberately obfuscated and it must not be in an intermediate form (e.g., the output of a preprocessor). Source code means the preferred form in which a programmer would usually modify the program. - - Portions of the source code of Your Product not contained in This Product (e.g., portions added by You in creating Your Product, whether created by You or by third parties) must be available under license(s) that (however, see also Subsection III.1.e) allow(s) anyone to modify and derive new works from the portions of the source code that are not contained in This Product and to use, copy, and redistribute such modifications and/or derivative works. The license(s) must be perpetual, non-exclusive, royalty-free, no-charge, and worldwide, and must not invalidate, weaken, restrict, interpret, amend, modify, interfere with or otherwise affect any part, term, provision, or clause of this License. The text(s) of the license(s) must be included with every copy of Your Product that You make and distribute. - - Note: If you cannot comply with the above requirements, you may contact licensing@truecrypt.org. - - 5. You must not change the license terms of This Product in any way (adding any new terms is considered changing the license terms even if the original terms are retained), which means, e.g., that no part of This Product may be put under another license. You must keep intact all the legal notices contained in the source code files. You must include the following items with every copy of Your Product that You make and distribute: a clear and conspicuous notice stating that Your Product or portion(s) thereof is/are governed by this version of the TrueCrypt License, a verbatim copy of this version of the TrueCrypt License (as contained herein), a clear and conspicuous notice containing information about where the included copy of the License can be found, and an appropriate copyright notice. - - -2. You are not obligated to comply with Subsection III.1.d if Your Product is not distributed (i.e., Your Product is available only to You). - -Note: If you cannot comply with Subsection III.1.d, you may contact licensing@truecrypt.org. - - - -IV. Disclaimer of Liability, Disclaimer of Warranty, Indemnification - -You expressly acknowledge and agree to the following: - -1. IN NO EVENT WILL ANY (CO)AUTHOR OF THIS PRODUCT, OR ANY APPLICABLE COPYRIGHT/TRADEMARK OWNER, OR ANY OTHER PARTY WHO MAY COPY AND/OR (RE)DISTRIBUTE THIS PRODUCT OR PORTIONS THEREOF, AS MAY BE PERMITTED HEREIN, BE LIABLE TO YOU OR TO ANY OTHER PARTY FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, ANY DIRECT, INDIRECT, GENERAL, SPECIAL, INCIDENTAL, PUNITIVE, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, CORRUPTION OR LOSS OF DATA, ANY LOSSES SUSTAINED BY YOU OR THIRD PARTIES, A FAILURE OF THIS PRODUCT TO OPERATE WITH ANY OTHER PRODUCT, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR BUSINESS INTERRUPTION), WHETHER IN CONTRACT, STRICT LIABILITY, TORT (INCLUDING, BUT NOT LIMITED TO, NEGLIGENCE) OR OTHERWISE, ARISING OUT OF THE USE, COPYING, MODIFICATION, OR (RE)DISTRIBUTION OF THIS PRODUCT (OR A PORTION THEREOF) OR OF YOUR PRODUCT (OR A PORTION THEREOF), OR INABILITY TO USE THIS PRODUCT (OR A PORTION THEREOF), EVEN IF SUCH DAMAGES (OR THE POSSIBILITY OF SUCH DAMAGES) ARE/WERE PREDICTABLE OR KNOWN TO ANY (CO)AUTHOR, COPYRIGHT/TRADEMARK OWNER, OR ANY OTHER PARTY. - -2. THIS PRODUCT IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THIS PRODUCT IS WITH YOU. SHOULD THIS PRODUCT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR, OR CORRECTION. - -3. THIS PRODUCT MAY INCORPORATE IMPLEMENTATIONS OF CRYPTOGRAPHIC ALGORITHMS THAT ARE REGULATED (E.G., SUBJECT TO EXPORT/IMPORT CONTROL REGULATIONS) OR ILLEGAL IN SOME COUNTRIES. IT IS SOLELY YOUR RESPONSIBILITY TO VERIFY THAT IT IS LEGAL TO IMPORT AND/OR (RE)EXPORT AND/OR USE THIS PRODUCT (OR PORTIONS THEREOF) IN COUNTRIES WHERE YOU INTEND TO USE IT AND/OR TO WHICH YOU INTEND TO IMPORT IT AND/OR FROM WHICH YOU INTEND TO EXPORT IT, AND IT IS SOLELY YOUR RESPONSIBILITY TO COMPLY WITH ANY APPLICABLE REGULATIONS, RESTRICTIONS, AND LAWS. - -4. YOU SHALL INDEMNIFY, DEFEND AND HOLD ALL (CO)AUTHORS OF THIS PRODUCT, AND APPLICABLE COPYRIGHT/TRADEMARK OWNERS, HARMLESS FROM AND AGAINST ANY AND ALL LIABILITY, DAMAGES, LOSSES, SETTLEMENTS, PENALTIES, FINES, COSTS, EXPENSES (INCLUDING REASONABLE ATTORNEYS' FEES), DEMANDS, CAUSES OF ACTION, CLAIMS, ACTIONS, PROCEEDINGS, AND SUITS, DIRECTLY RELATED TO OR ARISING OUT OF YOUR USE, INABILITY TO USE, COPYING, (RE)DISTRIBUTION, IMPORT AND/OR (RE)EXPORT OF THIS PRODUCT (OR PORTIONS THEREOF) AND/OR YOUR BREACH OF ANY TERM OF THIS LICENSE. - - - -V. Trademarks - -This License does not grant permission to use trademarks associated with (or applying to) This Product, except for fair use as defined by applicable law and except for use expressly permitted or required by this License. Any attempt otherwise to use trademarks associated with (or applying to) This Product automatically and immediately terminates Your rights under This License and may constitute trademark infringement (which may be prosecuted). - -TrueCrypt is a trademark registered with the World Intellectual Property Organization, an agency of the United Nations, (international trademark registration), in the U.S. Patent and Trademark Office, and in the trademark offices of other countries. All TrueCrypt logos are trademarks and the non-textual TrueCrypt logo consisting primarily of a key in stylized form is a trademark registered in the U.S. Patent and Trademark Office. - -Note: The goal is not to monetize the name or the product, but to protect the reputation of TrueCrypt. TrueCrypt is and will remain open-source and free software. - - - -VI. General Terms and Conditions, Miscellaneous Provisions - -1. ANYONE WHO USES AND/OR COPIES AND/OR MODIFIES AND/OR CREATES DERIVATIVE WORKS OF AND/OR (RE)DISTRIBUTES THIS PRODUCT, OR ANY PORTION(S) THEREOF, IS, BY SUCH ACTION(S), AGREEING TO BE BOUND BY AND ACCEPTING ALL TERMS AND CONDITIONS OF THIS LICENSE (AND THE RESPONSIBILITIES AND OBLIGATIONS CONTAINED IN THIS LICENSE). IF YOU DO NOT ACCEPT (AND AGREE TO BE BOUND BY) ALL TERMS AND CONDITIONS OF THIS LICENSE, DO NOT USE, COPY, MODIFY, CREATE DERIVATIVE WORKS OF, NOR (RE)DISTRIBUTE THIS PRODUCT, NOR ANY PORTION(S) THEREOF. - -2. YOU MAY NOT USE, MODIFY, COPY, CREATE DERIVATIVE WORKS OF, (RE)DISTRIBUTE, OR SUBLICENSE THIS PRODUCT, OR PORTION(S) THEREOF, EXCEPT AS EXPRESSLY PROVIDED IN THIS LICENSE (EVEN IF APPLICABLE LAW GIVES YOU MORE RIGHTS). ANY ATTEMPT (EVEN IF PERMITTED BY APPLICABLE LAW) OTHERWISE TO USE, MODIFY, COPY, CREATE DERIVATIVE WORKS OF, (RE)DISTRIBUTE, OR SUBLICENSE THIS PRODUCT, OR PORTION(S) THEREOF, AUTOMATICALLY AND IMMEDIATELY TERMINATES YOUR RIGHTS UNDER THIS LICENSE AND CAN CONSTITUTE COPYRIGHT INFRINGEMENT (WHICH MAY BE PROSECUTED). ANY CONDITIONS AND RESTRICTIONS CONTAINED IN THIS LICENSE ARE ALSO LIMITATIONS ON THE SCOPE OF THIS LICENSE AND ALSO DEFINE THE SCOPE OF YOUR RIGHTS UNDER THIS LICENSE. YOUR FAILURE TO COMPLY WITH THE TERMS AND CONDITIONS OF THIS LICENSE OR FAILURE TO PERFORM ANY APPLICABLE OBLIGATION IMPOSED BY THIS LICENSE AUTOMATICALLY AND IMMEDIATELY TERMINATES YOUR RIGHTS UNDER THIS LICENSE AND CAN CAUSE OR BE CONSIDERED COPYRIGHT INFRINGEMENT (WHICH MAY BE PROSECUTED). NOTHING IN THIS LICENSE SHALL IMPLY OR BE CONSTRUED AS A PROMISE, OBLIGATION, OR COVENANT NOT TO SUE FOR COPYRIGHT OR TRADEMARK INFRINGEMENT IF YOU DO NOT COMPLY WITH THE TERMS AND CONDITIONS OF THIS LICENSE. - -3. This License does not constitute or imply a waiver of any intellectual property rights except as may be otherwise expressly provided in this License. This License does not transfer, assign, or convey any intellectual property rights (e.g., it does not transfer ownership of copyrights or trademarks). - -4. Subject to the terms and conditions of this License, You may allow a third party to use Your copy of This Product (or a copy that You make and distribute, or Your Product) provided that the third party explicitly accepts and agrees to be bound by all terms and conditions of this License and the third party is not prohibited from using This Product (or portions thereof) by this License (see, e.g., Section VI.7) or by applicable law. However, You are not obligated to ensure that the third party accepts (and agrees to be bound by all terms of) this License if You distribute only the self-extracting package (containing This Product) that does not allow the user to install (nor extract) the files contained in the package until he or she accepts and agrees to be bound by all terms and conditions of this License. - -5. Without specific prior written permission from the authors of This Product (or from their common representative), You must not use the name of This Product, the names of the authors of This Product, or the names of the legal entities (or informal groups) of which the authors were/are members/employees, to endorse or promote Your Product or any work in which You include a modified or unmodified version of This Product, or to endorse or promote You or Your affiliates, or in a way that might suggest that Your Product (or any work in which You include a modified or unmodified version of This Product), You, or Your affiliates is/are endorsed by one or more authors of This Product, or in a way that might suggest that one or more authors of This Product is/are affiliated with You (or Your affiliates) or directly participated in the creation of Your Product or of any work in which You include a modified or unmodified version of This Product. - -6. IF YOU ARE NOT SURE WHETHER YOU UNDERSTAND ALL PARTS OF THIS LICENSE OR IF YOU ARE NOT SURE WHETHER YOU CAN COMPLY WITH ALL TERMS AND CONDITIONS OF THIS LICENSE, YOU MUST NOT USE, COPY, MODIFY, CREATE DERIVATIVE WORKS OF, NOR (RE)DISTRIBUTE THIS PRODUCT, NOR ANY PORTION(S) OF IT. YOU SHOULD CONSULT WITH A LAWYER. - -7. IF (IN RELEVANT CONTEXT) ANY PROVISION OF CHAPTER IV OF THIS LICENSE IS UNENFORCEABLE, INVALID, OR PROHIBITED UNDER APPLICABLE LAW IN YOUR JURISDICTION, YOU HAVE NO RIGHTS UNDER THIS LICENSE AND YOU MUST NOT USE, COPY, MODIFY, CREATE DERIVATIVE WORKS OF, NOR (RE)DISTRIBUTE THIS PRODUCT, NOR ANY PORTION(S) THEREOF. - -8. Except as otherwise provided in this License, if any provision of this License, or a portion thereof, is found to be invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of this License, and such invalid or unenforceable provision shall be construed to reflect the original intent of the provision and shall be enforced to the maximum extent permitted by applicable law so as to effect the original intent of the provision as closely as possible. - - -Third-Party Licenses - -This Product contains components that were created by third parties and that are governed by third-party licenses, which are contained hereinafter (separated by lines consisting of underscores). Each of the third-party licenses applies only to (portions of) the source code file(s) in which the third-party license is contained or in which it is explicitly referenced, and to compiled or otherwise processed forms of such source code. None of the third-party licenses applies to This Product as a whole, even when it uses terms such as "product", "program", or any other equivalent terms/phrases. This Product as a whole is governed by the TrueCrypt License (see above). Some of the third-party components have been modified by the authors of This Product. Unless otherwise stated, such modifications and additions are governed by the TrueCrypt License (see above). Note: Unless otherwise stated, graphics and files that are not part of the source code are governed by the TrueCrypt License. - - -License agreement for Encryption for the Masses. - -Copyright (C) 1998-2000 Paul Le Roux. All Rights Reserved. - -This product can be copied and distributed free of charge, including source code. - -You may modify this product and source code, and distribute such modifications, and you may derive new works based on this product, provided that: - -1. Any product which is simply derived from this product cannot be called E4M, or Encryption for the Masses. - -2. If you use any of the source code in your product, and your product is distributed with source code, you must include this notice with those portions of this source code that you use. - -Or, - -If your product is distributed in binary form only, you must display on any packaging, and marketing materials which reference your product, a notice which states: - -"This product uses components written by Paul Le Roux <pleroux@swprofessionals.com>" - -3. If you use any of the source code originally by Eric Young, you must in addition follow his terms and conditions. - -4. Nothing requires that you accept this License, as you have not signed it. However, nothing else grants you permission to modify or distribute the product or its derivative works. - -These actions are prohibited by law if you do not accept this License. - -5. If any of these license terms is found to be to broad in scope, and declared invalid by any court or legal process, you agree that all other terms shall not be so affected, and shall remain valid and enforceable. - -6. THIS PROGRAM IS DISTRIBUTED FREE OF CHARGE, THEREFORE THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. UNLESS OTHERWISE STATED THE PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -7. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM, INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS, EVEN IF SUCH HOLDER OR OTHER PARTY HAD PREVIOUSLY BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -Copyright (c) 1998-2008, Brian Gladman, Worcester, UK. All rights reserved. - -LICENSE TERMS - -The free distribution and use of this software is allowed (with or without changes) provided that: - - 1. source code distributions include the above copyright notice, this list of conditions and the following disclaimer; - 2. binary distributions include the above copyright notice, this list of conditions and the following disclaimer in their documentation; - 3. the name of the copyright holder is not used to endorse products built using this software without specific written permission. - -DISCLAIMER - -This software is provided 'as is' with no explicit or implied warranties in respect of its properties, including, but not limited to, correctness and/or fitness for purpose. - -Copyright (C) 2002-2004 Mark Adler, all rights reserved -version 1.8, 9 Jan 2004 - -This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - - - - diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild index 6d0496dabaa6..2ee1cc697820 100644 --- a/media-libs/allegro/allegro-5.0.11.ebuild +++ b/media-libs/allegro/allegro-5.0.11.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$ @@ -39,7 +39,7 @@ DEPEND="${RDEPEND} >=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}] >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]" -PATCHES=( "${FILESDIR}"/${PN}-5.0.4-underlink.patch ) +PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch ) MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h ) diff --git a/media-libs/allegro/files/allegro-5.0.11-multilib.patch b/media-libs/allegro/files/allegro-5.0.11-multilib.patch new file mode 100644 index 000000000000..ffb0c25fc8b6 --- /dev/null +++ b/media-libs/allegro/files/allegro-5.0.11-multilib.patch @@ -0,0 +1,10 @@ +--- CMakeLists.txt.old 2013-06-16 10:16:08.000000000 +0600 ++++ CMakeLists.txt 2016-02-25 14:32:40.350446191 +0500 +@@ -560,7 +560,6 @@ + endif(SUPPORT_X11 AND NOT SUPPORT_OPENGL) + + if(SUPPORT_X11) +- set(CMAKE_REQUIRED_LIBRARIES ${X11_LIBRARIES}) + + check_library_exists(Xcursor XcursorImageCreate "" CAN_XCURSOR) + if(CAN_XCURSOR) diff --git a/media-libs/allegro/files/allegro-5.0.4-underlink.patch b/media-libs/allegro/files/allegro-5.0.11-underlink.patch index 7702c1d2c6db..7702c1d2c6db 100644 --- a/media-libs/allegro/files/allegro-5.0.4-underlink.patch +++ b/media-libs/allegro/files/allegro-5.0.11-underlink.patch diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild index 41e02f42b698..613b00079db7 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.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="mirror://sourceforge/${PN}/${P}.tar.gz LICENSE="BSD IJG" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="java static-libs" ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml index 57a75067f29e..f6e13eadffbc 100644 --- a/net-irc/quassel/metadata.xml +++ b/net-irc/quassel/metadata.xml @@ -3,19 +3,12 @@ <pkgmetadata> <maintainer type="person"> <email>patrick@gentoo.org</email> + <name>Patrick Lauer</name> </maintainer> <maintainer type="person"> <email>johu@gentoo.org</email> <name>Johannes Huber</name> </maintainer> - <maintainer type="person"> - <email>sputnick@quassel-irc.org</email> - <description>Upstream author, please CC on bugs</description> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <use> <flag name="monolithic"> Build Standalone client with integrated core, no external diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-0.16.5.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-0.16.5.ebuild index e7ca695037a4..fd9a9a6f2593 100644 --- a/net-p2p/airdcpp-webclient/airdcpp-webclient-0.16.5.ebuild +++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-0.16.5.ebuild @@ -23,6 +23,7 @@ RDEPEND=" dev-cpp/tbb virtual/libiconv net-libs/miniupnpc + net-libs/libnatpmp dev-libs/leveldb dev-cpp/websocketpp dev-libs/boost diff --git a/profiles/license_groups b/profiles/license_groups index c8e35c352367..cc088c1a9652 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -31,7 +31,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy # separation? # BSD-4 alikes: dom4j FastCGI icu JDOM -MISC-FREE ACE Allegro alternate bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CDDL-Schily CeCILL-C CLX CMake CPL-0.5 CRACKLIB Crypt-IDEA cryptopp czyborra DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker FVWM gd gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 nap NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 PIZZA-WARE pngcrush pngnq Princeton psutils qmail-nelson rc regexp-UofT RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL tablelist tcltk tcp_wrappers_license TermReadKey TeX TeX-other-free Time-Format Time-modules tm-align totd UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX zpaq ZSH +MISC-FREE ACE Allegro alternate bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CDDL-Schily CeCILL-C CLX CMake CPL-0.5 CRACKLIB Crypt-IDEA cryptopp czyborra DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 nap NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 PIZZA-WARE pngcrush pngnq Princeton psutils qmail-nelson rc regexp-UofT RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL tablelist tcltk tcp_wrappers_license TermReadKey TeX TeX-other-free Time-Format Time-modules tm-align totd UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX zpaq ZSH # The following are NOT valid in @MISC-FREE: # arj - usage restrictions # freedist - Doesn't grant the right to do modifications. diff --git a/profiles/package.mask b/profiles/package.mask index 82314e3c66e0..ea4a3f965c84 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,11 @@ #--- END OF EXAMPLES --- +# Patrice Clement <monsieurp@gentoo.org> (29 Feb 2016) +# Duplicate of dev-libs/libedit. +# Masked for removal in 30 days. +sys-libs/libedit + # Patrick Lauer <patrick@gentoo.org> (22 Feb 2016) # Inactive upstream, build failures, obsoleted by rakudo/perl6 dev-lang/niecza diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest index 1f98ebdf1e90..e202366ad2b8 100644 --- a/sci-geosciences/josm/Manifest +++ b/sci-geosciences/josm/Manifest @@ -1,5 +1,2 @@ -DIST josm-5608.tar.xz 13873780 SHA256 8f57b6045b06a5a37a2f2c399bfc5da55074c3a3d770a9e4b234d9738d90f6ad SHA512 7d5d9a6eed50dd3d4bee490d135f4243dcd6698f1193246c74813d71e7b6d5178772ae157aa041696b2c4d3525823683c4aae201f5bf69b1574e5e8312831ee0 WHIRLPOOL 9f79c504a67f2d14afd42d22e3773348b9a65d3e8598219747bf6df0b58393781dae35b5b4d131fbede4966a2255ad9cb8a4f76880f3b8d111f582224cf134a7 -DIST josm-6060.tar.xz 13999664 SHA256 aa1f113164d5fa05c46419252d22bee59543049510855b4e4cdf46ff530d303e SHA512 bb52c254230fbbcf19a2197a2d9218a0985a73d94c7389665c0bd1943eedef1807073d2216507e8457a3091d228d08e2a62e9ac4eca8a3252e74e8c16f488a45 WHIRLPOOL 12dc5e05be4016412ebbc780d822b4a4bb3a56294e0ec1cec962b37b72be7bddf55fb07f5e10f273667c6adb5d433d999d1c310e3f5931bcb9677b1c774c4692 -DIST josm-7347.tar.gz 25495047 SHA256 8f7af0bc15ff59899b5f35de68e0a164becf820611ef46f27ce0f201b9069073 SHA512 fe338f3617e4099ed0f2745cba8ae80540c04360d5419ecdbbe165b3afd7a459b09b9bf9342b8a38388a3a8803844d1ad4af6f39395c034c68149ba8e244c3b1 WHIRLPOOL 534c04f5472e7c113a092a78e0a5fae0020f231156cd4a6db4c1fa4bc29d777a12d08132d0f90c51a0fb88b168f270f6ecf0f9d4f8ca988c6f02baa47d505d55 DIST josm-8800.tar.gz 39442264 SHA256 50859314c18118e93788b511660012eb9eefc9e90653e72be999bc6aa0e24ea3 SHA512 3a002d49508386daaad656feff9e305734f3fdedfc7da29fd3f821a623c875f25f3855e1cc0a073cee119e66e7dc05f732b4eccf23a2cb1ae0a0eda9d5fc5f86 WHIRLPOOL 2ad4397d34d15efff1233aad593042a90a552574ecd1f89c6b7953133fd9803de348de9a27f89bdc509b3b691e9ce618e6b32a8aba669ed032768873a4a23a54 DIST josm-9060.tar.gz 39757613 SHA256 a6be6ce30f48b9dde83b2a8489fa2b406394c7168763d66bc8d0f6110a3df6e6 SHA512 e5506cd38ba5dec88f66becfd7cdc33741ddebe8fc8cc31c0af20c818c2201a39936f27cad6cd6be9a5bbdbc69c52ccf0fd58f771477f537430dea68d89384bf WHIRLPOOL 13daab7bfa2f0c4b334e821a940f51ecba246c23bd4fe8f3fde3106f7048662ab94a2319117d4faa2b49c4341683ea036a9f69027b345653ae63735776268f8d diff --git a/sci-geosciences/josm/josm-5608.ebuild b/sci-geosciences/josm/josm-5608.ebuild deleted file mode 100644 index 573c66f4cfb6..000000000000 --- a/sci-geosciences/josm/josm-5608.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -JAVA_ANT_ENCODING=UTF-8 - -[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion" -ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk" -inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS} -unset SUBVERSION_ECLASS - -DESCRIPTION="Java-based editor for the OpenStreetMap project" -HOMEPAGE="http://josm.openstreetmap.de/" -[[ ${PV} == "9999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == "9999" ]] || \ -KEYWORDS="~amd64 ~x86" - -DEPEND=">=virtual/jdk-1.6" -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/${P}" - -IUSE="" - -src_prepare() { - if [[ ${PV} == "9999" ]]; then - - # create-revision needs the compile directory to be a svn directory - # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html - sed -i \ - -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \ - build.xml || die "Sed failed" - fi -} - -src_compile() { - eant dist-optimized -} - -src_install() { - java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed" - - newicon images/logo.png josm.png || die "newicon failed" - make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience" -} diff --git a/sci-geosciences/josm/josm-6060.ebuild b/sci-geosciences/josm/josm-6060.ebuild deleted file mode 100644 index bab1795ae45d..000000000000 --- a/sci-geosciences/josm/josm-6060.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -JAVA_ANT_ENCODING=UTF-8 - -[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion" -ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk" -inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS} -unset SUBVERSION_ECLASS - -DESCRIPTION="Java-based editor for the OpenStreetMap project" -HOMEPAGE="http://josm.openstreetmap.de/" -[[ ${PV} == "9999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == "9999" ]] || \ -KEYWORDS="~amd64 ~x86" - -DEPEND=">=virtual/jdk-1.7" -RDEPEND=">=virtual/jre-1.7" - -S="${WORKDIR}/${P}" - -IUSE="" - -src_prepare() { - if [[ ${PV} == "9999" ]]; then - - # create-revision needs the compile directory to be a svn directory - # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html - sed -i \ - -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \ - build.xml || die "Sed failed" - fi -} - -src_compile() { - eant dist-optimized -} - -src_install() { - java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed" - - newicon images/logo.png josm.png || die "newicon failed" - make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience" -} diff --git a/sci-geosciences/josm/josm-7347.ebuild b/sci-geosciences/josm/josm-7347.ebuild deleted file mode 100644 index e2132426a8a1..000000000000 --- a/sci-geosciences/josm/josm-7347.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -JAVA_ANT_ENCODING=UTF-8 - -[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion" -ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk" -inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS} -unset SUBVERSION_ECLASS - -DESCRIPTION="Java-based editor for the OpenStreetMap project" -HOMEPAGE="http://josm.openstreetmap.de/" -# Upstream doesn't provide versioned tarballs, so we'll have to create one on our own: -# REVISION=${PV} -# mkdir -p josm-${REVISION} -# svn co -r ${REVISION} http://josm.openstreetmap.de/svn/trunk/ josm-${REVISION} -# cd josm-${REVISION} && ant init-svn-revision-xml && cd - -# tar -cz --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION} -[[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == "9999" ]] || \ -KEYWORDS="~amd64 ~x86" - -DEPEND=">=virtual/jdk-1.7" -RDEPEND=">=virtual/jre-1.7" - -S="${WORKDIR}/${P}" - -IUSE="" - -src_prepare() { - - if [[ ${PV} == "9999" ]]; then - - # create-revision needs the compile directory to be a svn directory - # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html - sed -i \ - -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \ - build.xml || die "sed failed" - - else - - # Remove dependency on git and svn just for generating a - # revision - the tarball should already have REVISION.XML - sed -i -e 's:, *init-git-revision-xml::g' \ - -e '/<exec[ \t].*"svn"[ \t].*/,+5{d;n;}' \ - -e 's:${svn.info.result}:1:' \ - build.xml || die "sed failed" - - # Fix for josm bug #10325 - epatch "${FILESDIR}/${P}-dist-optimized-fix.patch" - - fi - -} - -src_compile() { - eant dist-optimized -} - -src_install() { - java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed" - - newicon images/logo.png josm.png || die "newicon failed" - make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience" -} diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild index c19af4dff15f..304a38592eb3 100644 --- a/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild +++ b/sys-apps/gentoo-functions/gentoo-functions-0.10.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$ @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="git://github.com/gentoo/${PN}.git" else SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi inherit toolchain-funcs flag-o-matic diff --git a/sys-apps/iproute2/iproute2-4.3.0.ebuild b/sys-apps/iproute2/iproute2-4.3.0.ebuild index 9deb8f278024..c5453bb71a6d 100644 --- a/sys-apps/iproute2/iproute2-4.3.0.ebuild +++ b/sys-apps/iproute2/iproute2-4.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$ @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-2 else SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" - 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" fi DESCRIPTION="kernel routing and traffic control utilities" diff --git a/sys-apps/kmod/kmod-21.ebuild b/sys-apps/kmod/kmod-21.ebuild index a56bead37931..93421631d3f3 100644 --- a/sys-apps/kmod/kmod-21.ebuild +++ b/sys-apps/kmod/kmod-21.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 autotools git-2 else SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - 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" inherit libtool fi diff --git a/sys-apps/less/less-481.ebuild b/sys-apps/less/less-481.ebuild index 20ee6e869c8c..b35efcde1801 100644 --- a/sys-apps/less/less-481.ebuild +++ b/sys-apps/less/less-481.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$ @@ -15,7 +15,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="pcre unicode" DEPEND=">=app-misc/editor-wrapper-3 diff --git a/sys-devel/patch/patch-2.7.5.ebuild b/sys-devel/patch/patch-2.7.5.ebuild index cae9454629ff..f83abe76dd05 100644 --- a/sys-devel/patch/patch-2.7.5.ebuild +++ b/sys-devel/patch/patch-2.7.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$ @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/patch/${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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )" diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest index d94a9ee32da4..24225b9c6238 100644 --- a/sys-fs/bindfs/Manifest +++ b/sys-fs/bindfs/Manifest @@ -1,2 +1,3 @@ DIST bindfs-1.12.6.tar.gz 351981 SHA256 a954f8fe4d6193a1ab5db423c10fb33dd0da23eabce41e4379ecee4c6cb02069 SHA512 14fd335a082bc577bb67360a892953d6d059b97b24e6fa74ddc1457ed78f3a546799f3cdea48a37da89dfc06be2ee1f5abafc203f6843269f28a79c7d18093b0 WHIRLPOOL 19582aac090d7b1498f36b305ade6a1433c4156ae9562c197726805030263a5a3b8ab94eb203183e016e61ff75c8d5b492c4356095f624c86ca86eefa137ef3b DIST bindfs-1.13.0.tar.gz 376903 SHA256 25d35524acda200bb2b8c830dc33a64de8ba38a56c9c51991b994e892de0af43 SHA512 354f3ad025e5d37afff68a871e99e11e12d203ba8f61e031a3f6076bcc41a6888cd685223880ce724fd44ae4c206728cda802be86b5599f258fbbb1284504158 WHIRLPOOL b9880b8f8a51256891fd11a7635a3c023c87fafaf7d8bd91e081d7615836e1f85b488b32cbca31d246dd4392e5ab08e6c1e3f0bf5635b843941083b9d6b736d6 +DIST bindfs-1.13.1.tar.gz 369973 SHA256 fb25f0ca6b1c2ec446b418f4ecc0cce3ba07a3a539f48398e8bddf3474e95889 SHA512 a77ae5c5f1879928e2fbe326a0931c6b5faca6e2ccdd37f01b974b62e0c8951b0f9dc7dd13488d6ebc228947ec874b91c79be97c4ea714aa703b527aa367e792 WHIRLPOOL 10a6c4be1d1e1fb08b2c29a91eb1ba65da28311fc8709a1c823d195d2843999ed4ce9459714c5c7b98a52ada814d63783f0d6b79d47cd00995d67adacb0792ac diff --git a/sys-fs/bindfs/bindfs-1.13.1.ebuild b/sys-fs/bindfs/bindfs-1.13.1.ebuild new file mode 100644 index 000000000000..15b4000a3cc2 --- /dev/null +++ b/sys-fs/bindfs/bindfs-1.13.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils autotools + +DESCRIPTION="FUSE filesystem for mounting a directory to another location and altering permissions" +HOMEPAGE="http://bindfs.org/" +SRC_URI="http://bindfs.org/downloads/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=">=sys-fs/fuse-2.6" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +RESTRICT="test" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.10.7-cflags.patch + eautoreconf +} + +src_configure() { + econf $(use_enable debug) +} diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest index c38ec0ef7001..c245db93a637 100644 --- a/sys-kernel/hardened-sources/Manifest +++ b/sys-kernel/hardened-sources/Manifest @@ -7,9 +7,11 @@ DIST deblob-check-4.4 694225 SHA256 e142bafdd5a05280d5280fbf109aadab3af9ce71152a DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6 DIST genpatches-4.3-4.base.tar.xz 75572 SHA256 c0c073f12a4f1c0adf9d3865fe5d16dc43ea0e5c95c0867868e16e57f2fd6235 SHA512 a16b75f8fcd868d6f9bc2b91318eb8b8ec4db2b622d244e750d4176c4e8225808751c543c54d768fbd88785da656e9f60d8ef8bc22672b5cb1038573c0c366e1 WHIRLPOOL 04c723b71f440035f57684088a47e83430f1c5b057951e037f128f3681f16669eca16f2f1b8d4b7be4a617420131277d1fe415503a679b83a081e06635df46e3 DIST genpatches-4.4-3.base.tar.xz 26508 SHA256 76f5685698b02b81643d6b2edcd53217e0f6fa00e068a138f2eb3bc596dec2e5 SHA512 255e2ef79c56699e5b032fa392b2748570ce96c74f1172f4a4c1b4d22f8b8b0a9462c388028a0cad92e821815d39cfa6450f171d81fed5f274dce03979c39322 WHIRLPOOL 6da9edc7936f8857b929e589b2adcb17363a76ec5d85b3406fcb8308d6cb2da924f1f9af5062f85ddf4d415ca9d9524b731e8c4e0cde756e14ccc122a6e75c74 +DIST genpatches-4.4-5.base.tar.xz 103432 SHA256 ff3ab9884b3069ab092511aef891c8300668461b768f728bff067dc98fc0dfb9 SHA512 ba36f0f9a87a66534281a17a1bd83aa3271e41f8857ef4f27692b322bff9ef705f9d88e78699ba63055410cfb2b3c2a73c2e40c8599e74b60581bfb0d85b293b WHIRLPOOL c38af636ee6bf5bf5d2b0c5d7d3132c02efa879925b3656355e3b70d51ee253b001328225a862f68cd1a5706eaa3529231bd8cb8ed5af3baba7b072da2d2a319 DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256 c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512 dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4 WHIRLPOOL 7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1 DIST hardened-patches-4.3.3-5.extras.tar.bz2 1649484 SHA256 2a62a5eb4b98f4fbeb43511a0573d58226277d3112401abec37355d85e01ae23 SHA512 09b7272af44fb1e29cba857f7c3305d97f8997881f228a2f2eb56dda909ae5402a69336c6fccdf3920f8788a7922f10b0977517f5918d44702e1a9b668c708c7 WHIRLPOOL efc152c7680b84b682f9f6857b8c6b2b66b6d505f76b311a8e3289a606f46d4944d90478ff93e3656f41c367fdbcd65dcf3043842354b26b669b462ce49f3471 DIST hardened-patches-4.4.2-1.extras.tar.bz2 1721230 SHA256 81f1417d210e0a6d9f5e180b9f828beb87ddc27571a16c40552d0fa1979982ec SHA512 599dedbef6fa26efc2a62c19e0536accedff6c60968294e9a7246c9844b26491b4414b1b40106eee9bb7540f8cd4ae74ab3720029b0730ce5541e005ba60cb9b WHIRLPOOL 84e22467a6dcc738043e47274ab2476b69f1796f1f23e3ca4ed8e244dd73a7e4998de683c1d93baccdd41eb232327d4ef1eb07d01b8a790510b8690334032f02 +DIST hardened-patches-4.4.3-1.extras.tar.bz2 1678183 SHA256 c333fc07e4a3c841a2799b906f8989f581035169c32bc955fb5c10995aec1306 SHA512 a0420168af099733ae0d761a38afa24162a07f86905384d9b086a7278b9e5e97ffa3e4253de2ca6c369c4e9f7793e6cd301315a10fa477dc8bac4a5695f2c69b WHIRLPOOL 2777088d9729e68f8fae3e099314392491d416a3461c2e4f6f1d1c710ba72d2c8a04e39e6c4ed7b5cfb382935cf16002975dc8317fc2f382be998be13d65adf0 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 diff --git a/sys-kernel/hardened-sources/hardened-sources-4.4.3.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.4.3.ebuild new file mode 100644 index 000000000000..e02b06f0882e --- /dev/null +++ b/sys-kernel/hardened-sources/hardened-sources-4.4.3.ebuild @@ -0,0 +1,45 @@ +# 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" +K_GENPATCHES_VER="5" +K_DEBLOB_AVAILABLE="1" + +inherit kernel-2 +detect_version + +HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1" +HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2" +SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2" +UNIPATCH_EXCLUDE=" + 1500_XATTR_USER_PREFIX.patch + 2900_dev-root-proc-mount-fix.patch" + +DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})" +HOMEPAGE="http://www.gentoo.org/proj/en/hardened/" +IUSE="deblob" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=">=sys-devel/gcc-4.5" + +pkg_postinst() { + kernel-2_pkg_postinst + + local GRADM_COMPAT="sys-apps/gradm-3.1*" + + ewarn + ewarn "Users of grsecurity's RBAC system must ensure they are using" + ewarn "${GRADM_COMPAT}, which is compatible with ${PF}." + ewarn "It is strongly recommended that the following command is issued" + ewarn "prior to booting a ${PF} kernel for the first time:" + ewarn + ewarn "emerge -na =${GRADM_COMPAT}" + ewarn +} diff --git a/sys-kernel/linux-headers/linux-headers-4.3.ebuild b/sys-kernel/linux-headers/linux-headers-4.3.ebuild index 3e9962fd3c01..7a44d13024dd 100644 --- a/sys-kernel/linux-headers/linux-headers-4.3.ebuild +++ b/sys-kernel/linux-headers/linux-headers-4.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$ @@ -13,7 +13,7 @@ PATCH_VER="1" SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux" DEPEND="app-arch/xz-utils dev-lang/perl" diff --git a/sys-libs/libcap/libcap-2.24-r2.ebuild b/sys-libs/libcap/libcap-2.24-r2.ebuild index 7dafa67a3ed8..666d3b0ca076 100644 --- a/sys-libs/libcap/libcap-2.24-r2.ebuild +++ b/sys-libs/libcap/libcap-2.24-r2.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="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" # it's available under either of the licenses LICENSE="|| ( GPL-2 BSD )" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux" IUSE="pam static-libs" RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] diff --git a/x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch b/x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch index da54e7a6d7db..76d2e26fbc61 100644 --- a/x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch +++ b/x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch @@ -1,6 +1,6 @@ -diff -Naur src/wmgeneral.orig/list.c src/wmgeneral/list.c ---- src/wmgeneral.orig/list.c 2016-01-04 13:03:23.206828813 +0100 -+++ src/wmgeneral/list.c 2016-01-04 13:03:32.358832037 +0100 +diff -Naur wmmsg-1.0.1/src/wmgeneral.orig/list.c wmmsg-1.0.1/src/wmgeneral/list.c +--- wmmsg-1.0.1/src/wmgeneral.orig/list.c 2016-01-04 13:03:23.206828813 +0100 ++++ wmmsg-1.0.1/src/wmgeneral/list.c 2016-01-04 13:03:32.358832037 +0100 @@ -38,7 +38,7 @@ /* Return a cons cell produced from (head . tail) */ @@ -85,9 +85,9 @@ diff -Naur src/wmgeneral.orig/list.c src/wmgeneral/list.c { while (list) { -diff -Naur src/wmgeneral.orig/list.h src/wmgeneral/list.h ---- src/wmgeneral.orig/list.h 2016-01-04 13:03:23.206828813 +0100 -+++ src/wmgeneral/list.h 2016-01-04 13:03:46.741837100 +0100 +diff -Naur wmmsg-1.0.1/src/wmgeneral.orig/list.h wmmsg-1.0.1/src/wmgeneral/list.h +--- wmmsg-1.0.1/src/wmgeneral.orig/list.h 2016-01-04 13:03:23.206828813 +0100 ++++ wmmsg-1.0.1/src/wmgeneral/list.h 2016-01-04 13:03:46.741837100 +0100 @@ -29,12 +29,6 @@ #ifndef __LIST_H_ #define __LIST_H_ diff --git a/x11-plugins/wmmsg/wmmsg-1.0.1-r2.ebuild b/x11-plugins/wmmsg/wmmsg-1.0.1-r2.ebuild new file mode 100644 index 000000000000..68eb8e3fbe86 --- /dev/null +++ b/x11-plugins/wmmsg/wmmsg-1.0.1-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools + +DESCRIPTION="universal visual notification dockapp" +HOMEPAGE="http://swapspace.net/~matt/wmmsg" +SRC_URI="http://swapspace.net/~matt/wmmsg/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="" + +RDEPEND="x11-libs/gtk+:2 + media-libs/imlib2[X] + x11-libs/libXpm + x11-libs/libXext + x11-libs/libX11" +DEPEND="${RDEPEND} + virtual/pkgconfig + x11-libs/libXt" + +DOCS=( AUTHORS ChangeLog README wmmsgrc ) +PATCHES=( + "${FILESDIR}"/${P}-use_gtk2.patch + "${FILESDIR}"/${P}-alt-desktop.patch + "${FILESDIR}"/${P}-list.patch + ) + +src_prepare() { + default + + eautoreconf +} |