diff options
257 files changed, 3822 insertions, 3655 deletions
diff --git a/app-admin/sudo/sudo-1.8.15-r1.ebuild b/app-admin/sudo/sudo-1.8.15-r1.ebuild index 47579d10121b..3f58a5e8fe29 100644 --- a/app-admin/sudo/sudo-1.8.15-r1.ebuild +++ b/app-admin/sudo/sudo-1.8.15-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz # 3-clause BSD license LICENSE="ISC BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" IUSE="ldap nls pam offensive selinux skey +sendmail" DEPEND="pam? ( virtual/pam ) diff --git a/app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild index 7b6ae92a86ab..0fb1f89d49b6 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar" LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd" CDEPEND=" diff --git a/app-emulation/qemu/qemu-2.4.0-r1.ebuild b/app-emulation/qemu/qemu-2.4.0-r1.ebuild index ba77ef86b3fc..8d50bd3e7b8f 100644 --- a/app-emulation/qemu/qemu-2.4.0-r1.ebuild +++ b/app-emulation/qemu/qemu-2.4.0-r1.ebuild @@ -275,8 +275,9 @@ check_targets() { pushd "${S}"/default-configs >/dev/null || die - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | sort -u)) + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) if [[ ${sorted} != "${detected}" ]] ; then eerror "The ebuild needs to be kept in sync." eerror "${var}: ${sorted}" diff --git a/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild index 71297679fe9a..6b53c66421f6 100644 --- a/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild +++ b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild @@ -275,8 +275,9 @@ check_targets() { pushd "${S}"/default-configs >/dev/null || die - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | sort -u)) + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) if [[ ${sorted} != "${detected}" ]] ; then eerror "The ebuild needs to be kept in sync." eerror "${var}: ${sorted}" diff --git a/app-emulation/qemu/qemu-2.4.0.1.ebuild b/app-emulation/qemu/qemu-2.4.0.1.ebuild index 306d7720b0e7..50ceedb9901e 100644 --- a/app-emulation/qemu/qemu-2.4.0.1.ebuild +++ b/app-emulation/qemu/qemu-2.4.0.1.ebuild @@ -275,8 +275,9 @@ check_targets() { pushd "${S}"/default-configs >/dev/null || die - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | sort -u)) + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) if [[ ${sorted} != "${detected}" ]] ; then eerror "The ebuild needs to be kept in sync." eerror "${var}: ${sorted}" diff --git a/app-emulation/qemu/qemu-2.4.1.ebuild b/app-emulation/qemu/qemu-2.4.1.ebuild index 3db908d92ed1..63252bea4b27 100644 --- a/app-emulation/qemu/qemu-2.4.1.ebuild +++ b/app-emulation/qemu/qemu-2.4.1.ebuild @@ -275,8 +275,9 @@ check_targets() { pushd "${S}"/default-configs >/dev/null || die - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | sort -u)) + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) if [[ ${sorted} != "${detected}" ]] ; then eerror "The ebuild needs to be kept in sync." eerror "${var}: ${sorted}" diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index a514240afe09..312371586283 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -281,8 +281,9 @@ check_targets() { pushd "${S}"/default-configs >/dev/null || die - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | sort -u)) + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) if [[ ${sorted} != "${detected}" ]] ; then eerror "The ebuild needs to be kept in sync." eerror "${var}: ${sorted}" diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest index 00812231a3a6..4c74e3c40cf5 100644 --- a/app-misc/carbon-c-relay/Manifest +++ b/app-misc/carbon-c-relay/Manifest @@ -1,3 +1,3 @@ -DIST carbon-c-relay-0.40.tar.gz 57697 SHA256 38e3b93f4a46e72f11c30f84bd0a0a77862d8d3cd1904447678eabfce89a0468 SHA512 6d77d521eba6dfa576810f3e850f091431a76282f5c7c85a72af300cff18b0dec8738dd00d9555933fbf486ce9656ea4f06332644bfccc634078c90937705aaa WHIRLPOOL ddaf8d02168a10f1e0e2dd8701cd430aefe7346164016a41e25850b2871d541f9002c93063d0836d40caf6db2ff380183d8a4e145df89324be33ef22386bec39 DIST carbon-c-relay-0.43.tar.gz 63005 SHA256 de55c2af2392910f28a28dab96faa24a394bf1038f4cc045d4db5f8a0180603e SHA512 9c81011131c242b96c198a299fb26661cceb4a6b66c387f4201fe156cc025ec5ccc9962573eec11f3f98a808ba38638a18dd6b2c535dea61c9eec009e22c0e44 WHIRLPOOL 895b31b54a0b7d28c80cfbe16b0ae0012a87adea738f49f503966c159ea0c536aeb6a6cbf424ed325811b85b1fe376a0aab969abd66d08c553dd300c6707a02c DIST carbon-c-relay-0.44.tar.gz 54533 SHA256 424f5eebdfcd8cd42f07495b97c440e9133723966013d63fe3f6d8220bd031dc SHA512 ae0ded77d189c22bab0400922831211f411d47b92bde44f9a4c4208a094a57ac875a52e04ef6297238281bb44c8869f0510b3a3b6dc1c564e02e4f22bb69e268 WHIRLPOOL b7351576d7f1bdb5c0929967faacd6861a10f8d8d3bedebcc9bf7a3f15e0b9ea2d3475ecd8e700e3f2fb190698ea343fcb4530d10522591512f1de9d787a0ab2 +DIST carbon-c-relay-0.45.tar.gz 63208 SHA256 ba76d93d0448eae64147d580c2767ed42a8a9dd4a6c0f3e15a41276793bc53df SHA512 7a5068a6a1502c80b03c642abb72639de644351edc2967736c6f40939a6e28598727ad7bec9008eb76c3211552d6583f0ec9670e7c32952c0f49f6b4cb9a6085 WHIRLPOOL 089a9a6c3fb40e1bfc680b7002bf9967c4a182ae00616933cd5b3ba9febda20853e716df69d552ade131aa272cd16dafb65d1ba84afeacb4383d87f9e028bf97 diff --git a/app-misc/carbon-c-relay/carbon-c-relay-0.40.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-0.45.ebuild index 9789bc255125..e20b1c5dec80 100644 --- a/app-misc/carbon-c-relay/carbon-c-relay-0.40.ebuild +++ b/app-misc/carbon-c-relay/carbon-c-relay-0.45.ebuild @@ -15,9 +15,8 @@ SLOT="0" KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="" -RDEPEND="dev-libs/openssl:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND="" +DEPEND="${RDEPEND}" pkg_preinst() { enewgroup carbon @@ -26,7 +25,7 @@ pkg_preinst() { src_prepare() { tc-export CC - tc-has-openmp || sed -i -e '/-fopenmp/s/^/#/' Makefile + tc-has-openmp || export OPENMP_FLAGS= } src_install() { diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest index 2dfc26fd3fd4..b8b75f7701d6 100644 --- a/app-misc/workrave/Manifest +++ b/app-misc/workrave/Manifest @@ -1,2 +1,3 @@ DIST v1_10_6.tar.gz 6444740 SHA256 f8699fbbfef7f3de2226f5f7dc4c74d98de3b59bfed4c6dac70bb231ec405760 SHA512 5c2a7dac1614751edf925eefa945e08e0b2fb318903b12fc8d4acde0b6027ecb534c90933da14796edc958f0d9a2f892815fddea9ab41ac921756fc5577acd8e WHIRLPOOL 91c47a66f0ab60f2560b103ef7ac6591088296b470d3403d6d9f511d44e361fc6841d9fda85d9c24d6c60595ea66b2a18ebb34c806d3ab4b465895a427a6d819 DIST workrave-1.10.6.tar.gz 6444740 SHA256 f8699fbbfef7f3de2226f5f7dc4c74d98de3b59bfed4c6dac70bb231ec405760 SHA512 5c2a7dac1614751edf925eefa945e08e0b2fb318903b12fc8d4acde0b6027ecb534c90933da14796edc958f0d9a2f892815fddea9ab41ac921756fc5577acd8e WHIRLPOOL 91c47a66f0ab60f2560b103ef7ac6591088296b470d3403d6d9f511d44e361fc6841d9fda85d9c24d6c60595ea66b2a18ebb34c806d3ab4b465895a427a6d819 +DIST workrave-1.10.8.tar.gz 6370506 SHA256 15e0c87c2172dc249031d97d4020ee4a47ea9073aa26dc06a4b15e91abf88479 SHA512 67c3725627b42c5b32a61eb4e62e45b4a802806217ddb311ee2b610d281f9c521f69cc4da0db5ded63c99691d9f5c272493a911ba504f335508ac64945cd7403 WHIRLPOOL 9fe2c6dbd2abacc76190dac94ed334bb8ecad1dfb714afa6fee69cbbeae3981f960113dce52b54fb6935bacb29d7ad3939b4aba6ef6323b93d05b56b166edb7e diff --git a/app-misc/workrave/workrave-1.10.8.ebuild b/app-misc/workrave/workrave-1.10.8.ebuild new file mode 100644 index 000000000000..35a50426ae3c --- /dev/null +++ b/app-misc/workrave/workrave-1.10.8.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +GCONF_DEBUG="no" # --enable-debug only messes up with FLAGS +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils gnome2 python-single-r1 versionator vcs-snapshot + +DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)" +HOMEPAGE="http://www.workrave.org/" +MY_PV=$(replace_all_version_separators '_') +SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +# dbus support looks to be used only for trying to use panel applets on gnome3! +IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce" +REQUIRED_USE="ayatana? ( introspection )" + +RDEPEND=" + >=dev-libs/glib-2.28.0:2 + >=x11-libs/gtk+-3.0:3[introspection?] + >=dev-cpp/gtkmm-3.0.0:3.0 + >=dev-cpp/glibmm-2.28.0:2 + >=dev-libs/libsigc++-2.2.4.2:2 + ayatana? ( + >=dev-libs/libdbusmenu-0.4[gtk3,introspection] + >=dev-libs/libindicator-0.4:3 ) + gnome? ( >=gnome-base/gnome-shell-3.6.2 ) + gstreamer? ( + media-libs/gstreamer:1.0[introspection?] + media-libs/gst-plugins-base:1.0[introspection?] + media-plugins/gst-plugins-meta:1.0 ) + introspection? ( dev-libs/gobject-introspection:= ) + mate? ( mate-base/mate-applets ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) + xfce? ( + >=x11-libs/gtk+-2.6.0:2[introspection?] + >=xfce-base/xfce4-panel-4.4 ) + x11-libs/libXScrnSaver + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXtst + x11-libs/libXt + x11-libs/libXmu +" +# dbus? ( +# >=sys-apps/dbus-1.2 +# dev-libs/dbus-glib ) + +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40.0 + x11-proto/xproto + x11-proto/inputproto + x11-proto/recordproto + dev-python/cheetah + virtual/pkgconfig + doc? ( + app-text/docbook-sgml-utils + app-text/xmlto ) + nls? ( >=sys-devel/gettext-0.17 ) +" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_unpack() { + vcs-snapshot_src_unpack +} + +src_prepare() { + # Fix gstreamer slot automagic dependency, bug #563584 + # http://issues.workrave.org/show_bug.cgi?id=1179 + epatch "${FILESDIR}"/${PN}-1.10.6-automagic-gstreamer.patch + eautoreconf + gnome2_src_prepare +} + +src_configure() { + # gnet ("distribution") is dead for ages and other distributions stopped + # relying on it for such time too. + gnome2_src_configure \ + --disable-dbus \ + --disable-distribution \ + --enable-exercises \ + --disable-experimental \ + --disable-gnome2 \ + --disable-static \ + --disable-xml \ + $(use_enable ayatana indicator) \ + $(use_enable doc manual) \ + $(use_enable gnome gnome3) \ + $(use_enable gstreamer) \ + $(use_enable introspection) \ + $(use_enable mate) \ + $(use_enable nls) \ + $(use_enable pulseaudio pulse) \ + $(use_enable test tests) \ + $(use_enable xfce) +} diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest index 265410132bd5..f853c2ad99f2 100644 --- a/app-portage/eix/Manifest +++ b/app-portage/eix/Manifest @@ -4,3 +4,4 @@ DIST eix-0.30.4.tar.xz 556632 SHA256 4c753a82e15ce0f8bbdd74edcebb7bc23bd3de8dfca DIST eix-0.30.7.tar.xz 558144 SHA256 ed000a8430ffb1c9087807d2ef686b10252d9b199e67c88f7bce11077a371473 SHA512 babb23176e68d47bcc5d899090abb326eae6b3ce4c587a6cf977c6216d193f4cf93dd54a647e50f08434440e022f117c8e5f800f1db2c048220bd229fd6cd4f5 WHIRLPOOL 0a27efa1c8003ae23ab96cb93672f38120828dc75cc333450e19026b7505c19ee411b42261049192c009a57b22c15c9ed5c9b7875171a039b21bbc142d220904 DIST eix-0.30.8.tar.xz 559076 SHA256 525c5d0276b8d40de012668af36042ecb674175c3b92fb9214c3f1f1b0dacaec SHA512 ee1901037507d3e527d5e37338efb4b9c38c4d42efae042918d0e24e8bd08ece0064ac2efec960fc3280bc2bb14b46d87b66d6c04aa634c8737276321f580255 WHIRLPOOL d29d6cf704ef331621cf9b6e37433de643b43cc8b079295cbaa6f25979a399ef0b5e72ddaee3de205b8dd831de946e16b96d5c1f9b63666027a5a9b8f6d24e08 DIST eix-0.31.1.tar.bz2 791116 SHA256 1402d474ee3d1dc6fcfe35508657629d4a5aef6cbe1913687fa65c8e139f3fdf SHA512 7fdd579f884f92bf58a876c89c4f397610c2af8da0c47382bf25b8d4919d1f24713fd8029ab82c73a9be382e51b1aac78476d006961620f12c0386fe864b6c22 WHIRLPOOL 3ea640ab80a6119497323312b4b527aa8060597ed09d29a43d68abf3ae20bafeb793c6df1890a2e433f5d77485b14dfa507795fc7e9e0d7e2b69dd16668c5aa8 +DIST eix-0.31.2.tar.bz2 787190 SHA256 c03226d0971067561e931c0afe75878552a6178ede7326601c3a839b289c72d9 SHA512 61a7f58ba48030000bd4ca50575aec95ba7726c12d935bd1fa7a2b28440fbc66a272fc727bc6a2b7716e285d3b93b7a888cef017c66d8682f29e9388dc89a6a1 WHIRLPOOL d67ab5ee83ab74c895f5e7345b40a7313c1ad1a1a2af184f54e5481eed9f6134920c172fe1dcae0522b2d965832e76cfbe14020181d799eff04a1afc6938af64 diff --git a/app-portage/eix/eix-0.31.2.ebuild b/app-portage/eix/eix-0.31.2.ebuild new file mode 100644 index 000000000000..6579e25c97c5 --- /dev/null +++ b/app-portage/eix/eix-0.31.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PLOCALES="de ru" +inherit bash-completion-r1 eutils l10n + +DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more" +HOMEPAGE="https://github.com/vaeth/eix/" +SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2" + +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 ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools" + +BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 ) + nls? ( virtual/libintl )" +RDEPEND="${BOTHDEPEND} + app-shells/push" +DEPEND="${BOTHDEPEND} + app-arch/xz-utils + nls? ( sys-devel/gettext )" + +pkg_setup() { + case " ${REPLACING_VERSIONS}" in + *\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*) + local eixcache="${EROOT}/var/cache/${PN}" + test -f "${eixcache}" && rm -f -- "${eixcache}";; + esac +} + +src_prepare() { + sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die + epatch_user +} + +src_configure() { + econf $(use_with sqlite) $(use_with doc extra-doc) \ + $(use_enable nls) $(use_enable tools separate-tools) \ + $(use_enable security) $(use_enable optimization) \ + $(use_enable strong-security) \ + $(use_enable strong-optimization) $(use_enable debug debugging) \ + $(use_enable swap-remote) \ + $(use_with prefix always-accept-keywords) \ + $(use_with dep dep-default) \ + --with-zsh-completion \ + --with-portage-rootpath="${ROOTPATH}" \ + --with-eprefix-default="${EPREFIX}" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" +} + +src_install() { + default + dobashcomp bash/eix + insinto "/usr/lib/tmpfiles.d" + doins tmpfiles.d/eix.conf +} + +pkg_postinst() { + test -d "${EROOT}var/cache/${PN}" || { + mkdir "${EROOT}var/cache/${PN}" + use prefix || chown portage:portage "${EROOT}var/cache/${PN}" + } + local obs="${EROOT}var/cache/eix.previous" + ! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it" +} + +pkg_postrm() { + [ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}" +} diff --git a/app-text/dvisvgm/dvisvgm-1.10.ebuild b/app-text/dvisvgm/dvisvgm-1.10.ebuild index 170317eec8fc..b9ab6ba7909b 100644 --- a/app-text/dvisvgm/dvisvgm-1.10.ebuild +++ b/app-text/dvisvgm/dvisvgm-1.10.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="test" # Tests don't work from $WORKDIR: kpathsea tries to search in relative # directories from where the binary is executed. diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest index b34edb255365..64a6ff9553da 100644 --- a/app-text/iso-codes/Manifest +++ b/app-text/iso-codes/Manifest @@ -1,3 +1,3 @@ DIST iso-codes-3.57.tar.xz 3773756 SHA256 dd6acd92843b69530fce535d3d6fd947ddb3802f0d5fc1bd214d1cb7d2bf5c47 SHA512 a58e48be152960d2391123e88b48f1c43e0bf0ac880a8d6a3ec7c8154e67fd40f264063cdf7106da9d261a5fb82f64d67545a17f69ec81141f10d1eb2d897424 WHIRLPOOL 9b6de080edc6c54071a8b7584de90af3554f91d77973dceb856570b2c1760ad89a807112903cd24697bab672024d319b72ce3141fdd0dc15405bf54bbd9b53ce -DIST iso-codes-3.59.tar.xz 3771916 SHA256 63d5ef035a96223f1fc8f36b711082f806e1666852dfc4149eeca8fd435d76ed SHA512 e1ac1c4717fd5a9daf76df109dadb24daa7dbf54b09736409e4cf4162de84038ab81ad03afecd3423d288bba306bf27f1301c03912c70a258a763a72fe8a77b4 WHIRLPOOL d56e8e81c1d6668c34d83035174aad2d393f2643ed8a4ef52f379119bb0d3a214ad9bd62d4087bfde8e3e60e427b1572eb41521dd02f081bd013278b3218bbd2 DIST iso-codes-3.61.tar.xz 3772736 SHA256 a79bf119afdc20feef12965f26f9d97868819003a76355a6f027a14a6539167d SHA512 c18f4d9f92266bc590e9eb327edfc769abc384a0ffeb80bcff120cafe664019c747e733aa1b33de4179a6beddaa904bc70e2d35971d9edb6eba51592f5d5d07d WHIRLPOOL 74c620e00bfac3e007f58edd509c3204db162b99e3aba93fb02ab27b435925ac2b2886367f25c1749f3fbaf277a37b64e39a8684d8e6faff59ef9d7739108f3c +DIST iso-codes-3.63.tar.xz 3773672 SHA256 60600e56952dc92b3a8cd8a7044348f7cfa35be528bab2491c3c18582fb5277f SHA512 31b5142611e2050a9bfb95cd12d962b8cbe01824f1202e70ca40d9cd178a5fd17557eac3fcc59dd0b94baf2656caeef09c50332cd2a8d0e1bb14c82c154e06ae WHIRLPOOL bbe3c5474ba3fc22243a9b6bea9c6b43dccd5a2230ee59b07e4484e06ccba4be977dfa1e16014b18d4cae5393a50099e3a12b13747e9970c4e605df8b4e002be diff --git a/app-text/iso-codes/iso-codes-3.59.ebuild b/app-text/iso-codes/iso-codes-3.63.ebuild index d5169d2e9133..d5169d2e9133 100644 --- a/app-text/iso-codes/iso-codes-3.59.ebuild +++ b/app-text/iso-codes/iso-codes-3.63.ebuild diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest index 78bccdf84096..7520a52458b8 100644 --- a/app-text/krop/Manifest +++ b/app-text/krop/Manifest @@ -1,2 +1,3 @@ DIST krop-0.4.7.tar.gz 34559 SHA256 fd44f83437ef6a1cb2933ab94e78385f9d7dd7b271d24549eadea700d93b84af SHA512 b38973b2084d1ac05d71e842137793d3569a1d46668e506e8a58eac4f7bd366db177d9f8af8243ed13cfe6f73885e0998ad91a1ded4c02f6d0d0102809476d10 WHIRLPOOL ecdf833981b922de9acee9ddc1467cfc056b91766ef8f4dcfc4b98b5b63fb55924f9df3d6aa3ac99a82ef86f2f8ef608ce7b2d62c52930d059a53b0121932d52 DIST krop-0.4.8.tar.gz 34948 SHA256 71668fe54820ad11dc47f8caddc56e0d2553975e768bd724f26fa5f5389b0aab SHA512 440a3dff6c13eb83dc9ccbbcf672a297d66d66fbf9508e3c6ceda3b043868102afb1df3401fcf06adbea1baea92444ad0dfa2fd8e74b2d993c9fe4903c9327a1 WHIRLPOOL 65aa1d73dca26d3522d1bdf75501f25340487529057bdbbaeb90472d0d518e6e54a31e2b9f1f08c6037636cd83c4ef128444c519cafae3346c8e80489d7564dd +DIST krop-0.4.9.tar.gz 35149 SHA256 725d42358cc367e6ca4ad82d50fd9bd0bb8ad1e24094ff68880d06f675d59b0f SHA512 39e1d269fb59bbbba45e820ead482a6ac049e47e7d06459a2c63826dc134ada12e49e77468bfb6870f31747084bc8dea1653109232fe6e6808726a8903124565 WHIRLPOOL d4fbada0020ef08381f300faf470e9b1d239c7386999e3a6688c22cbb747f2a721445f7469c6a12918dd3c7711fc45bc00a8792011369f656a44806b1eaa508c diff --git a/app-text/krop/krop-0.4.9.ebuild b/app-text/krop/krop-0.4.9.ebuild new file mode 100644 index 000000000000..fab8217f99b8 --- /dev/null +++ b/app-text/krop/krop-0.4.9.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils distutils-r1 + +DESCRIPTION="A tool to crop PDF files" +HOMEPAGE="http://arminstraub.com/software/krop" +SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}] + dev-python/pyPdf[${PYTHON_USEDEP}] + dev-python/PyQt4[${PYTHON_USEDEP}]" + +src_install() { + distutils-r1_src_install + domenu "${WORKDIR}/${P}/${PN}.desktop" +} diff --git a/dev-cpp/lucene++/Manifest b/dev-cpp/lucene++/Manifest index 611bcb35f969..7e1a6ecdf0a8 100644 --- a/dev-cpp/lucene++/Manifest +++ b/dev-cpp/lucene++/Manifest @@ -1,2 +1 @@ -DIST lucene++-3.0.6.tar.gz 1529066 SHA256 3e7092a4935e0d1ad5c6d7ac8f3c6ed2f53e51321237ce83744bbf02e0d61519 SHA512 c65aac4cdc92b4593a7d9996273047ff68cc097b755bacdd424266ffcf9143b491ef91123b8e78d9f1fba3d9ac39078a0c2c97c22a39f646f84a0fef0f2956ef WHIRLPOOL 7064b69214d62e05986c78fee2873222c85c2a7a4c892fcc29a5b47f0b1cb67e64789f3665dc3b8ca3628daf28e05c331a99cd0111062683e9323a6827e7ebf5 DIST lucene++-3.0.7.tar.gz 2013570 SHA256 6c19f203311e4b44a0ccf7b1127db77436eb47159ea1c54f7531a0b1ca585e0c SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220 WHIRLPOOL e5d18d6d0ac90f8b0ace161dc0457b2ca3546c211e96ac3c44dea4ba7d9bbd6bd9183016ceb2bccd8516261db0ca2dd4331701bb37e653e96df9453d6acbc878 diff --git a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-demos.patch b/dev-cpp/lucene++/files/lucene++-3.0.6-disable-demos.patch deleted file mode 100644 index ba5deca413c8..000000000000 --- a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-demos.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9217c21..d4e7b86 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -118,7 +118,7 @@ enable_testing() - - add_subdirectory(src/core) - add_subdirectory(src/contrib) --add_subdirectory(src/demo) -+#add_subdirectory(src/demo) - add_subdirectory(src/test) - - ################################# diff --git a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-tests.patch b/dev-cpp/lucene++/files/lucene++-3.0.6-disable-tests.patch deleted file mode 100644 index 1fae17e71d30..000000000000 --- a/dev-cpp/lucene++/files/lucene++-3.0.6-disable-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -Forwarded: https://github.com/luceneplusplus/LucenePlusPlus/pull/64 -Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Description: Disabling tests until we find a proper way for building and including gtest - In the next release this might become possible, after commit 83356d9681fb52 - https://github.com/luceneplusplus/LucenePlusPlus/commit/83356d9681fb52a4c190d2cf033279006c1bf57d -Last-Update: 2014-08-25 ---- a/CMakeExternal.txt -+++ b/CMakeExternal.txt -@@ -1,5 +1,6 @@ - # Enable ExternalProject CMake module - include(ExternalProject) -+find_package(Subversion REQUIRED) - - # main directory for external projects - set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,7 +49,6 @@ - # bootstrap - #################################### - --find_package(Subversion REQUIRED) - find_package(Threads REQUIRED) - find_package(Boost COMPONENTS - date_time -@@ -114,13 +113,13 @@ - ${CMAKE_CURRENT_BINARY_DIR}/include - ) - --include(CMakeExternal.txt) --enable_testing() -+#include(CMakeExternal.txt) -+#enable_testing() - - add_subdirectory(src/core) - add_subdirectory(src/contrib) - #add_subdirectory(src/demo) --add_subdirectory(src/test) -+#add_subdirectory(src/test) - - ################################# - # install pkg-config file diff --git a/dev-cpp/lucene++/files/lucene++-3.0.6-fix-installing-headers.patch b/dev-cpp/lucene++/files/lucene++-3.0.6-fix-installing-headers.patch deleted file mode 100644 index f9ccc84eccd3..000000000000 --- a/dev-cpp/lucene++/files/lucene++-3.0.6-fix-installing-headers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: rezso <rezso@example.com> -Date: Mon, 19 May 2014 09:20:40 +0100 -Subject: [PATCH] fix installing lucene++ headers in 3.0.6 - -Origin: upstream, https://github.com/luceneplusplus/LucenePlusPlus/commit/994f03cf736229044a168835ae7387696041658f -Description: backport upstream patch to fix missing headers install - -Index: lucene++-3.0.6/CMakeLists.txt -=================================================================== ---- lucene++-3.0.6.orig/CMakeLists.txt -+++ lucene++-3.0.6/CMakeLists.txt -@@ -139,6 +139,14 @@ if(NOT WIN32) - DESTINATION ${LIB_DESTINATION}/pkgconfig) - endif() - -+################################# -+# install Config.h -+################################# -+install( -+ FILES -+ "${CMAKE_CURRENT_BINARY_DIR}/include/Config.h" -+ DESTINATION include/lucene++) -+ - #################################### - # custom targets - #################################### -Index: lucene++-3.0.6/src/core/CMakeLists.txt -=================================================================== ---- lucene++-3.0.6.orig/src/core/CMakeLists.txt -+++ lucene++-3.0.6/src/core/CMakeLists.txt -@@ -20,7 +20,7 @@ file(GLOB_RECURSE lucene_internal_header - ) - - file(GLOB_RECURSE lucene_headers -- include/*.h -+ "${lucene++_SOURCE_DIR}/include/*.h" - ) - - add_definitions(-DLPP_BUILDING_LIB) diff --git a/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch new file mode 100644 index 000000000000..9ff33fd03005 --- /dev/null +++ b/dev-cpp/lucene++/files/lucene++-3.0.7-boost-1.58.patch @@ -0,0 +1,37 @@ +commit 1987082cf9278a639d772b4f35a8ae2d34944177 +Author: Václav Slavík <vaclav@slavik.io> +Date: Mon May 4 18:04:46 2015 +0200 + + Fix compilation with Boost 1.58 + + 1.58 introduces strict type checking in boost::get() and while that's + good in theory, the VariantUtils code makes it impractical to use. + Instead, use relaxed_get() to get the old behavior. relaxed_get() didn't + exist in older versions of Boost, so the code must check BOOST_VERSION. + + Fixes #93. + +diff --git a/include/VariantUtils.h b/include/VariantUtils.h +index 1e6c243..5a72e59 100644 +--- a/include/VariantUtils.h ++++ b/include/VariantUtils.h +@@ -8,6 +8,7 @@ + #define VARIANTUTILS_H + + #include <boost/any.hpp> ++#include <boost/version.hpp> + #include "Lucene.h" + #include "MiscUtils.h" + +@@ -22,7 +23,11 @@ public: + + template <typename TYPE, typename VAR> + static TYPE get(VAR var) { ++#if BOOST_VERSION < 105800 + return var.type() == typeid(TYPE) ? boost::get<TYPE>(var) : TYPE(); ++#else ++ return var.type() == typeid(TYPE) ? boost::relaxed_get<TYPE>(var) : TYPE(); ++#endif + } + + template <typename TYPE, typename VAR> diff --git a/dev-cpp/lucene++/lucene++-3.0.6.ebuild b/dev-cpp/lucene++/lucene++-3.0.6.ebuild deleted file mode 100644 index 702ca21bca72..000000000000 --- a/dev-cpp/lucene++/lucene++-3.0.6.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_P="LucenePlusPlus-rel_${PV}" -inherit cmake-utils multilib - -DESCRIPTION="C++ port of Java Lucene library, a high-performance, full-featured text search engine" -HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus" -SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( LGPL-3 Apache-2.0 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -DEPEND="dev-libs/boost:=" -RDEPEND="${DEPEND}" - -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -DOCS=( AUTHORS README.rst ) - -PATCHES=( - "${FILESDIR}/${P}-disable-demos.patch" - "${FILESDIR}/${P}-disable-tests.patch" - "${FILESDIR}/${P}-fix-installing-headers.patch" -) - -src_configure() { - local mycmakeargs=( - -DLIB_DESTINATION=$(get_libdir) - ) - cmake-utils_src_configure -} diff --git a/dev-cpp/lucene++/lucene++-3.0.7.ebuild b/dev-cpp/lucene++/lucene++-3.0.7.ebuild index 3bb2bb8343b1..c81426547e06 100644 --- a/dev-cpp/lucene++/lucene++-3.0.7.ebuild +++ b/dev-cpp/lucene++/lucene++-3.0.7.ebuild @@ -25,6 +25,8 @@ S="${WORKDIR}/${MY_P}" DOCS=( AUTHORS README.rst ) +PATCHES=( "${FILESDIR}/${P}-boost-1.58.patch" ) + src_configure() { local mycmakeargs=( -DENABLE_DEMO=OFF diff --git a/dev-db/mariadb/mariadb-10.0.22.ebuild b/dev-db/mariadb/mariadb-10.0.22.ebuild index 1584048e86bf..81ba69cdf457 100644 --- a/dev-db/mariadb/mariadb-10.0.22.ebuild +++ b/dev-db/mariadb/mariadb-10.0.22.ebuild @@ -11,7 +11,7 @@ inherit toolchain-funcs mysql-multilib IUSE="$IUSE" # REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~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" # When MY_EXTRAS is bumped, the index should be revised to exclude these. EPATCH_EXCLUDE='' diff --git a/dev-db/mysql/mysql-5.6.27.ebuild b/dev-db/mysql/mysql-5.6.27.ebuild index 9754e224e0e7..7ab2b4b0dcf6 100644 --- a/dev-db/mysql/mysql-5.6.27.ebuild +++ b/dev-db/mysql/mysql-5.6.27.ebuild @@ -14,7 +14,7 @@ inherit toolchain-funcs mysql-multilib IUSE="$IUSE" # REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~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" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~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" # When MY_EXTRAS is bumped, the index should be revised to exclude these. EPATCH_EXCLUDE='20018_all_mysql-5.6.25-without-clientlibs-tools.patch' diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest index 3dbbf643528c..cc3b916e5710 100644 --- a/dev-java/resin-servlet-api/Manifest +++ b/dev-java/resin-servlet-api/Manifest @@ -3,5 +3,6 @@ DIST resin-3.1.12-src.zip 13579367 SHA256 b2e5b3573a369944c243ebc1b6c6439a681d52 DIST resin-4.0.26-src.zip 17879008 SHA256 0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512 aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512 WHIRLPOOL a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c DIST resin-4.0.27-src.zip 17990178 SHA256 33f5bd76b88a1009de108cef40a522186b5a3f250de7e9856fe50a7715344665 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53 WHIRLPOOL 6ef3ea21bacf7409676d4114cebe0466aa613ca71d54612197573e899891762ada1fd14510458b3407d56ef6f61539ee99db5bf239e2b88e9a3ab033568942aa DIST resin-4.0.44-src.zip 40342346 SHA256 dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512 bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8 WHIRLPOOL bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa +DIST resin-4.0.46-src.zip 40400255 SHA256 e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f WHIRLPOOL a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035 WHIRLPOOL ea9eb10d1359d898021a781bdf947811d3500092a3489759202251713b776b5c2c20bfde112be5a108358cb470f0c3aa4cc2a4d54695c406fc2b3c3d18ad7a54 DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 SHA256 de44915936848374adb975ca3f0dca3560d75c64b385b451e95e6813a3405ffd SHA512 12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea WHIRLPOOL 43785f6d225f74626c6a769e4eedf0873aa794f02780defbe0815d77771934646d6f849302ab829a81cf4babad0acad2f7fc4458f1d80ba0c3fbdd9292a0f90b diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild new file mode 100644 index 000000000000..ad72b6b60c84 --- /dev/null +++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation" +HOMEPAGE="http://www.caucho.com/" +SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip" + +LICENSE="GPL-2" +SLOT="3.1" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + +IUSE="" + +COMMON_DEP="" + +RDEPEND=">=virtual/jre-1.6 + ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${COMMON_DEP}" + +S="${WORKDIR}/resin-${PV}" + +java_prepare() { + cd "${S}" + rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar + java-ant_bsfix_files build-common.xml || die +} + +EANT_BUILD_TARGET="servlet16" +EANT_DOC_TARGET="" + +src_install() { + java-pkg_newjar "modules/servlet16/dist/servlet-16.jar" + use source && java-pkg_dosrc "${S}"/modules/servlet16/src/* + + dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar" + java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar" + dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar" + java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar" +} diff --git a/dev-lang/php/php-5.5.30.ebuild b/dev-lang/php/php-5.5.30.ebuild index 5de5f544af2d..aeedfb4d9ba5 100644 --- a/dev-lang/php/php-5.5.30.ebuild +++ b/dev-lang/php/php-5.5.30.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.6.14.ebuild b/dev-lang/php/php-5.6.14.ebuild index 5de5f544af2d..aeedfb4d9ba5 100644 --- a/dev-lang/php/php-5.6.14.ebuild +++ b/dev-lang/php/php-5.6.14.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/python/python-2.7.10.ebuild b/dev-lang/python/python-2.7.10.ebuild index 1efdd258c3ea..393636d5cd2d 100644 --- a/dev-lang/python/python-2.7.10.ebuild +++ b/dev-lang/python/python-2.7.10.ebuild @@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="2.7" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" # Do not add a dependency on dev-lang/python to this ebuild. diff --git a/dev-libs/STLport/STLport-5.2.1-r2.ebuild b/dev-libs/STLport/STLport-5.2.1-r3.ebuild index a7ad58ae212b..0a03529b279d 100644 --- a/dev-libs/STLport/STLport-5.2.1-r2.ebuild +++ b/dev-libs/STLport/STLport-5.2.1-r3.ebuild @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="boost debug static static-libs threads" -DEPEND="boost? ( >=dev-libs/boost-1.35.0-r5 )" +DEPEND="boost? ( dev-libs/boost:= )" RDEPEND="${DEPEND}" DOCS=( README etc/ChangeLog doc/FAQ doc/README.utf8 ) @@ -45,6 +45,9 @@ src_prepare() { #define _LARGEFILE64_SOURCE EOF + # bug #562926 + epatch "${FILESDIR}/${P}-time-facets.patch" + epatch_user } diff --git a/dev-libs/STLport/files/STLport-5.2.1-time-facets.patch b/dev-libs/STLport/files/STLport-5.2.1-time-facets.patch new file mode 100644 index 000000000000..85a5a325bd5c --- /dev/null +++ b/dev-libs/STLport/files/STLport-5.2.1-time-facets.patch @@ -0,0 +1,12 @@ +diff -uNptr a/src/time_facets.cpp b/src/time_facets.cpp +--- a/src/time_facets.cpp 2008-12-10 10:56:51.000000000 +0100 ++++ b/src/time_facets.cpp 2015-10-11 12:07:55.841141984 +0100 +@@ -428,7 +428,7 @@ void _STLP_CALL __write_formatted_timeT( + break; + { + int diff; +-# if defined (__USE_BSD) || defined (__BEOS__) ++# if defined (__USE_MISC) || defined (__USE_BSD) || defined (__BEOS__) + diff = t->tm_gmtoff; + # else + diff = t->__tm_gmtoff; diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest index 193a955784fa..7f1d707df579 100644 --- a/dev-libs/geoip/Manifest +++ b/dev-libs/geoip/Manifest @@ -1,3 +1,2 @@ -DIST geoip-1.6.5.tar.gz 156441 SHA256 4a151b35e9d9db976b82645c758662a6cb778c669b2c65635d5834e4f885942e SHA512 1ed223a51d238b6bd8d247e1dcb20f6eb9e3f19d39bd262f7cbefb587ea029ed0abac540208916f3ca06bb86f9ea1e99614484fd1c32535892029e945471e702 WHIRLPOOL ca8cd55e16c9981b443fad9f788dc8f28a64dba86980740efeffaa9c4a9d5da84df8a23fb3710ef13741bb40bec0704ca80991e25d3b11fe10acd5a360c02d77 DIST geoip-1.6.6.tar.gz 156796 SHA256 db8ed5d07292c75cb3018738e6411037f15cc2a517f38ee04c1232cbe3d30b46 SHA512 4cdd308500bcb827b3dd1c6d981299ea746251758b6a5df97bf2cf098b62b0a736394d5853a06c62437eb0808cb54efb14d0579f5212284f29016e3c8cdd9846 WHIRLPOOL 518749339b094c4166ab53d8ec38020c72f1550923e8c0084f438391dfe7965a9b2f7b3e27ef5ecac85a3f62aa14299e11fbd740ea103c320eef5fad357994b2 DIST geoip-1.6.7.tar.gz 158276 SHA256 6f0ee5cd63660a2ab3a8f30df8e7246ee87b0eb33c719843d691c8d010cbabb5 SHA512 dde9ef65328297604892533ef5d5b568184eb4a29ff95839cb5e39b6652bcfbc53bf64fbcc3b55dad43cf0fca16f5611dbd96ba50f3001d8e212392304bce0b5 WHIRLPOOL 2d7e3b94317aa820c55c08be1808b9cc6d8cc38e87733cb1da3c9b3a5bf51212933e266ca105aabd765a08fe87f79f22eae5d8c6e3015a43fc923637273d6795 diff --git a/dev-libs/geoip/geoip-1.6.5.ebuild b/dev-libs/geoip/geoip-1.6.5.ebuild deleted file mode 100644 index 0b0a8ac5a5ab..000000000000 --- a/dev-libs/geoip/geoip-1.6.5.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist" -HOMEPAGE="https://github.com/maxmind/geoip-api-c" -SRC_URI=" - https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz -" - -# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db -LICENSE="LGPL-2.1 GPL-2 MaxMind2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" -IUSE="static-libs" -RESTRICT="test" - -DEPEND="net-misc/wget" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-api-c-${PV}" - -src_prepare() { - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) - sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r5.sh > geoipupdate.sh || die -} - -src_install() { - default - - dodoc AUTHORS ChangeLog NEWS.md README* - - prune_libtool_files - - keepdir /usr/share/GeoIP - - dosbin geoipupdate.sh -} - -pkg_postinst() { - ewarn "WARNING: Databases are no longer installed by this ebuild." - elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from" - elog "net-misc/geoipupdate) to populate ${ROOT}/usr/share/GeoIP/" - elog "with geo-located IP address databases." -} diff --git a/dev-libs/geoip/geoip-1.6.6.ebuild b/dev-libs/geoip/geoip-1.6.6.ebuild index 6f9eb6010b29..0b0a8ac5a5ab 100644 --- a/dev-libs/geoip/geoip-1.6.6.ebuild +++ b/dev-libs/geoip/geoip-1.6.6.ebuild @@ -14,7 +14,7 @@ SRC_URI=" # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db LICENSE="LGPL-2.1 GPL-2 MaxMind2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" IUSE="static-libs" RESTRICT="test" diff --git a/dev-libs/geoip/geoip-1.6.7.ebuild b/dev-libs/geoip/geoip-1.6.7.ebuild index f177d8da83fb..445952bd2f0a 100644 --- a/dev-libs/geoip/geoip-1.6.7.ebuild +++ b/dev-libs/geoip/geoip-1.6.7.ebuild @@ -5,7 +5,7 @@ EAPI=5 inherit autotools eutils -DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist" +DESCRIPTION="GeoIP Legacy C API" HOMEPAGE="https://github.com/maxmind/geoip-api-c" SRC_URI=" https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 44bd65087c17..d0b96d8e04c2 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,3 +1,3 @@ -DIST gjs-1.40.1.tar.xz 448204 SHA256 2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793 SHA512 c3da112bed3bc97d93913df6284e7616a5893abc6db0fd0bef79c8d0594c9ae85ada61f7c262839d20905dc7ca31a8ac3d5319863aaaff1c69c0d834629d78eb WHIRLPOOL 54da01eeb63d7955150c674394911ff38ccf216c262e89a162455bd21f69fe64a36bca50bffc288c2eb2e90c543d2e41128169f686f7f06523d9fb786166b2dd DIST gjs-1.42.0.tar.xz 449264 SHA256 0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13 SHA512 8b2b118b832710ccb790b771416c1280b9ed07ed529afb2ae76fd50fa459e1f847ab6239899d5aea3c4136d32c36ac4c639afcc7374d8a98768e8f79b1338105 WHIRLPOOL b19fe1d94a96cf624433c972c7ce42057ee4ebc5c8012bf1237c553f268ea7d6f51de7fd4dab3f3f6a33b9f6c8231da9d83f47474fbe40c10b122db1c07138b0 DIST gjs-1.43.3.tar.xz 455968 SHA256 82b54dd4590ea1622d19b2e27978bcb9c2c5b46922e1e1780ea79b6a28aa1c4e SHA512 7a97c80233203ef31ee5386558388f674f511e46884061f2cb058389cff8c1a11f629eb5f06de33b2086d8c69d9a5b39722f56d7de60b77e1a302041a0056ac9 WHIRLPOOL c3b71c5fcf10a5fce6418416b42a154d49036dce8436ad752430a3457833e247da70603b5e15c236e5709364cb7fc61aaf11dd3ce27f536081341c80e771c768 +DIST gjs-1.44.0.tar.xz 486144 SHA256 88c960f6ad47a6931d123f5d6317d13704f58572f68a4391913a254ff27dce80 SHA512 3866e124f05221fd47275951f8c2c6954ba28a9b1443cc3c01789284709e2dd69f496efa094e6ddc9fcae563b9def68441aa398c1488076701fa1e873f9b9735 WHIRLPOOL ee165353e08c6a5f69785e04fb12e582778695fb8b20f93153d6f648bd8597988a5d12349f73e70c2d52aed4d80d53484086f212c427fe2c7675eb858d41cad0 diff --git a/dev-libs/gjs/gjs-1.40.1-r1.ebuild b/dev-libs/gjs/gjs-1.44.0.ebuild index 42226a629b29..9f5171c725ae 100644 --- a/dev-libs/gjs/gjs-1.40.1-r1.ebuild +++ b/dev-libs/gjs/gjs-1.44.0.ebuild @@ -13,16 +13,16 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs" LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" SLOT="0" IUSE="+cairo examples gtk test" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" RDEPEND=" >=dev-libs/glib-2.36:2 - >=dev-libs/gobject-introspection-1.40.0-r2 + >=dev-libs/gobject-introspection-1.41.4:= sys-libs/readline:0 dev-lang/spidermonkey:24 virtual/libffi - cairo? ( x11-libs/cairo ) + cairo? ( x11-libs/cairo[X] ) gtk? ( x11-libs/gtk+:3 ) " DEPEND="${RDEPEND} @@ -32,15 +32,9 @@ DEPEND="${RDEPEND} test? ( sys-apps/dbus ) " -# Large amount of tests are broken even in master. -RESTRICT="test" - src_prepare() { - # Prevent gjs crashes, bug #523608 (from 'master') - epatch "${FILESDIR}/${PN}-1.40.1-ownership-transfer.patch" - - # Ratelimit RSS-triggered GCs (from 'master') - epatch "${FILESDIR}/${PN}-1.40.1-ratelimit-rss.patch" + # Disable broken unittests + epatch "${FILESDIR}"/${PN}-1.43.3-disable-unittest-*.patch gnome2_src_prepare } diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest index 8d2f1da1906b..394c8a54bd15 100644 --- a/dev-libs/libcroco/Manifest +++ b/dev-libs/libcroco/Manifest @@ -1 +1,2 @@ DIST libcroco-0.6.8.tar.xz 464992 SHA256 ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570 SHA512 acfbebb59e5ea1e70da41f35970fb40a58331a1258eee6c981a575fdd23b420b4cc6d8983c90ad1e6afc0a461e675cb24667e03cfc8ec1aa5e9918e606913413 WHIRLPOOL 704fd5d6df6d62c15645b9901b807e5fd8916567fd32b975f4bd0ce013126617cc16e6a14fc334d0733012cfde8403978f5a23c1254fcdfae156a0720fa266e7 +DIST libcroco-0.6.9.tar.xz 475844 SHA256 38b9a6aed1813e55b3ca07a68d1af845ad4d1f984602e9272fe692930c0be0ae SHA512 2bdb16a9004ff7304bc3cf91495925d1502c165b54dc1121d2f0fc9b627ec9c5b81e78b48e3f092855c3accc3295e5a3870eb6225ddb1b1fcd037004af78583b WHIRLPOOL 59767afbbb9a180eb87a5821ec85df50f85a16d687687de1267c86218d1bc587bf37759ba05a34bf0d109dc8e5b7b69209c5c5bdf930fd721e42533670bdb523 diff --git a/dev-libs/libcroco/libcroco-0.6.8.ebuild b/dev-libs/libcroco/libcroco-0.6.8.ebuild deleted file mode 100644 index 3443eda2a2c1..000000000000 --- a/dev-libs/libcroco/libcroco-0.6.8.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit" -HOMEPAGE="https://git.gnome.org/browse/libcroco/" - -LICENSE="LGPL-2" -SLOT="0.6" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -RDEPEND="dev-libs/glib:2 - >=dev-libs/libxml2-2.4.23" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - virtual/pkgconfig" - -src_prepare() { - DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" - G2CONF+=" --disable-static" - [[ ${CHOST} == *-darwin* ]] && G2CONF+=" --disable-Bsymbolic" - - if ! use test; then - # don't waste time building tests - sed 's/^\(SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ - || die "sed failed" - fi - - gnome2_src_prepare -} diff --git a/dev-libs/libcroco/libcroco-0.6.9.ebuild b/dev-libs/libcroco/libcroco-0.6.9.ebuild new file mode 100644 index 000000000000..74ab744bc6b5 --- /dev/null +++ b/dev-libs/libcroco/libcroco-0.6.9.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit gnome2 multilib-minimal + +DESCRIPTION="Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit" +HOMEPAGE="https://git.gnome.org/browse/libcroco/" + +LICENSE="LGPL-2" +SLOT="0.6" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="test" + +RDEPEND=" + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" + +src_prepare() { + if ! use test; then + # don't waste time building tests + sed 's/^\(SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "sed failed" + fi + + gnome2_src_prepare +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --disable-static \ + $([[ ${CHOST} == *-darwin* ]] && echo --disable-Bsymbolic) + + if multilib_is_native_abi; then + ln -s "${S}"/docs/reference/html docs/reference/html || die + fi +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" + einstalldocs +} diff --git a/dev-libs/libebml/libebml-1.3.3.ebuild b/dev-libs/libebml/libebml-1.3.3.ebuild index e3b08d9a1c63..eaa9d3701011 100644 --- a/dev-libs/libebml/libebml-1.3.3.ebuild +++ b/dev-libs/libebml/libebml-1.3.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0/4" # subslot = soname major version -KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug static-libs" src_prepare() { diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest index 18451f575cbf..2103847809bd 100644 --- a/dev-libs/libgusb/Manifest +++ b/dev-libs/libgusb/Manifest @@ -1,2 +1,2 @@ -DIST libgusb-0.2.5.tar.xz 275948 SHA256 a3ad56773548695292f49b62df1eb7fb1e87e1e0c9d3982e80f65f47095fa492 SHA512 6ac07c40faf6919991f5cbc3e5fd0523b7486b5437a6ac3d0bd1cfd05d645fe25e311366bb507d1b7af2fe913ae869523c052a7571cd8191914f8b1a81a4c22a WHIRLPOOL 3da2b781ef8df7912aababe174f83c020ac24fefc754303dd38beebd49fceaf40138cd601ffa11b02e2512e0e2ebe3727b1cdee89d0b504962d82a3898fd8c0f DIST libgusb-0.2.6.tar.xz 276608 SHA256 6f638bdbc4e77643c0a198a300e50b592ad326e56bddf359de15e04689209c06 SHA512 4b13166f4b02f1c10ee074564d1e25de0b4763a19b83f56d40b2f43b595cfeb1c7fe4ecdeceaf0b32f51f2156d1e26c42a976cab5db4ad269533b803dbc27bdb WHIRLPOOL d976567c41ef6ef11232ac999b9efd14667312112efec8bb4d4700a0e2d89f0310eabe7542ceda66df3d39bc95f92c88f1da90e6c5b563bd4fb20da2eeabadbb +DIST libgusb-0.2.7.tar.xz 275492 SHA256 0be9578f7875cecb6c163ad47eb39bc6bf497e501b08986c0d384748a054c3ee SHA512 9210ddc95458c452fa32c8e11849c6f44e24680485aafe93887a52266c8253e495e5f0584f25e3e67051bb00247d6b658cd2ff3f6a4da167a113974d8fefd5ac WHIRLPOOL 7ce8652167f3bf553d33d2b2504e1b1a8fdbdd0844b9fa8f2b54ad5d91b0db505cdedb3d1b6827212bde36bea39c28160f51f0253c921db4f33dae1e9368c07d diff --git a/dev-libs/libgusb/libgusb-0.2.5.ebuild b/dev-libs/libgusb/libgusb-0.2.7.ebuild index 8f59bd49161d..2e5cef78f761 100644 --- a/dev-libs/libgusb/libgusb-0.2.5.ebuild +++ b/dev-libs/libgusb/libgusb-0.2.7.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="+introspection static-libs vala" REQUIRED_USE="vala? ( introspection )" @@ -22,7 +22,7 @@ REQUIRED_USE="vala? ( introspection )" # Yes, we really need API from dev-libs/libusb-1.0.19, not virtual/libusb RDEPEND=" >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] - >=dev-libs/libusb-1.0.19[udev,${MULTILIB_USEDEP}] + virtual/libusb:1[udev,${MULTILIB_USEDEP}] introspection? ( >=dev-libs/gobject-introspection-1.29:= ) " DEPEND="${RDEPEND} diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest index b48395e8dec9..8a35b8354735 100644 --- a/dev-libs/libsodium/Manifest +++ b/dev-libs/libsodium/Manifest @@ -1,2 +1,3 @@ DIST libsodium-1.0.2.tar.gz 1673394 SHA256 961d8f10047f545ae658bcc73b8ab0bf2c312ac945968dd579d87c768e5baa19 SHA512 15fc47516f0e35906c1c304205fa991e74a273e4e6fc2186b6c16f0e41523de24493e149262b97ef03e4adc221232372ef1f283c4c23f96e4c5d99023d361e14 WHIRLPOOL 18509d9911c1d0ec6e8b9a8735abfeb2c1623669d31045abc6d9dd1289571fbe3a055f960f42a86779e7c03967532d71d7b9d0597ecfe457672e69b27b577e48 DIST libsodium-1.0.5.tar.gz 1787478 SHA256 bfcafc678c7dac87866c50f9b99aa821750762edcf8e56fc6d13ba0ffbef8bab SHA512 978867f7499ec07817a95213baea79fd45d3cdd48c343723490471f79a1b0df2fa0638a91c46a08717fe03a1d8b68789445cb34be969d91023ba7edc8750835c WHIRLPOOL a46f6ca3eb98151cbc230aa1fd344b4038415f717382fa912f1750c83ed73bcc778fd634cdb7ae9c81b79c94b2d3e949a63d10adaf1ec822ba4be4e4b6fd7620 +DIST libsodium-1.0.6.tar.gz 1791565 SHA256 940d03ea7d2caa7940e24564bf6d9f66d6edd1df1e0111ff8e3655f3b864fb59 SHA512 f1232bfd31f8ba60650f594af469e48797924de0d2ce1e9bd0be75614e19b77727b3bcaa9a553cd5613db92738caea79edca5f2ff77ab392b1dff570dcd6be7d WHIRLPOOL e29abdc4ee4687b0bf53f8fcc5f2f276b00d0fd3045faeac5469ba70a54611ea633e3cd9bb9347c467c05c8b0bdd4094683491b31a50d7ab664a8e903e31a529 diff --git a/dev-libs/libsodium/libsodium-1.0.6-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.6-r1.ebuild new file mode 100644 index 000000000000..54f4c493c71d --- /dev/null +++ b/dev-libs/libsodium/libsodium-1.0.6-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library" +HOMEPAGE="https://github.com/jedisct1/libsodium" +SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/17" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+asm minimal static-libs +urandom" + +src_configure() { + local myconf + + # --disable-pie needed on x86, bug #512734 + use x86 && myconf="${myconf} --disable-pie" + + econf \ + $(use_enable asm) \ + $(use_enable minimal) \ + $(use_enable !urandom blocking-random) \ + $(use_enable static-libs static) \ + ${myconf} +} + +src_install() { + default + prune_libtool_files +} diff --git a/dev-lisp/clozurecl/Manifest b/dev-lisp/clozurecl/Manifest index eff33f09149a..8e62a37a45ce 100644 --- a/dev-lisp/clozurecl/Manifest +++ b/dev-lisp/clozurecl/Manifest @@ -1,2 +1,4 @@ DIST ccl-1.10-linuxx86.tar.gz 43796090 SHA256 8ca272656214837b57746b9b84395987bc524329b38a1f42a605f45bf0282657 SHA512 10504e2569a99ba8b6fc4ac745312435c6be646c86ec3916a3750f823f79b3b8ec87fe53ba2410151feeaaed0609e1760ee3d37a77f01d815d1ec13c2394258e WHIRLPOOL 75c7516eba92ad0fc603301e958dc5ba8271b0819ab46af7f61e97edeb405098c4d84a8f8e8ed73ee85462b6ab7c4805bbcbf0a0f354fb62f077cf8cf10bffa4 +DIST ccl-1.11-linuxx86.tar.gz 42482877 SHA256 08e885e8c2bb6e4abd42b8e8e2b60f257c6929eb34b8ec87ca1ecf848fac6d70 SHA512 34008654fd3ceca55a33413a768c398395141e26b9ea09204739ca7e998fdbe94ab92507eda14cf9bcbb9f76e6c3cae3006d7f2c9f48749c66e1f1281febb409 WHIRLPOOL 4a0d1e6495be62f04f48d6923f95468ca1d1c8bafb3c00d4a5b1f705eb70fac52b7d8ed3b248b698707cd89f1eb4a0196b94d869e9bea52ea895fb8fae00bb41 DIST ccl-1.9_p1-linuxx86.tar.bz2 36344874 SHA256 ba3ef9718646cb56785bda634093876442287bb445a9b5b95e6478104d63d988 SHA512 b09a1f4f2e0a59bd95df09e431e95f619bc80459f5a1a799fc47fae575ccd3e0c266df98a0d7fc2b4878381e02e50e68dd3406a51c569bb056dd0e1fb973a989 WHIRLPOOL 9730171d8e4acdd1f54b81f4cc5984414c485672200c66e5f98cf7fe202a7c6f5b2835c2c75c06254960fdc7b0477854fabdd57d8b011abe8629bcd390e0f134 +DIST ccl.html 962003 SHA256 10fe7bf2818a2a029dcd53b274124f84713bed32b24170d09134feee470a5c6e SHA512 0cb9ee8f7eb6007e08241a0797519ff3bfc3d3adc0b5ac86e6a2e9e8b2e316fc421bea3b04159decc0a2b37ff7098147e25266946cc3c1ac367b93e4821a8b64 WHIRLPOOL ce93bb1537fd5c03050b5aa7f14414188a3cacf881ff0fcb87c532a43e51bd6139a11dd58c28397e7981ab120ce85e8303762c5f418f995b1c545f436b4d6abe diff --git a/dev-lisp/clozurecl/clozurecl-1.11.ebuild b/dev-lisp/clozurecl/clozurecl-1.11.ebuild new file mode 100644 index 000000000000..50ee67fa654f --- /dev/null +++ b/dev-lisp/clozurecl/clozurecl-1.11.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +MY_PN=ccl +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product" +HOMEPAGE="http://ccl.clozure.com/" +SRC_URI=" + x86? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz ) + amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz ) + doc? ( http://ccl.clozure.com/docs/ccl.html )" + # ppc? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz ) + # ppc64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )" + +LICENSE="LLGPL-2.1" +SLOT="0" +# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND=">=dev-lisp/asdf-2.33-r3:=" +DEPEND="${RDEPEND} + !dev-lisp/openmcl" + +S="${WORKDIR}"/${MY_PN} + +ENVD="${T}"/50ccl + +src_configure() { + if use x86; then + CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632 + elif use amd64; then + CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664 + elif use ppc; then + CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc + elif use ppc64; then + CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64 + fi +} + +src_prepare() { + cp /usr/share/common-lisp/source/asdf/build/asdf.lisp tools/ || die +} + +src_compile() { + emake -C lisp-kernel/${CCL_KERNEL} clean + emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)" + + unset CCL_DEFAULT_DIRECTORY + ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed" + + # remove non-owner write permissions on the full-image + chmod go-w ${CCL_RUNTIME}{,.image} || die + + esvn_clean +} + +src_install() { + local install_dir=/usr/$(get_libdir)/${PN} + + exeinto ${install_dir} + # install executable + doexe ${CCL_RUNTIME} + # install core image + cp ${CCL_RUNTIME}.image "${D}"/${install_dir} || die + # install optional libraries + dodir ${install_dir}/tools + cp tools/*fsl "${D}"/${install_dir}/tools || die + + # until we figure out which source files are necessary for runtime + # optional features and which aren't, we install all sources + find . -type f -name '*fsl' -delete || die + rm -f lisp-kernel/${CCL_KERNEL}/*.o || die + cp -a compiler level-0 level-1 lib library \ + lisp-kernel scripts tools xdump contrib \ + "${D}"/${install_dir} || die + cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die + + make_wrapper ccl "${install_dir}/${CCL_RUNTIME}" + + echo "CCL_DEFAULT_DIRECTORY=${install_dir}" > "${ENVD}" + doenvd "${ENVD}" + + dodoc doc/release-notes.txt + dohtml "${DISTDIR}"/ccl.html + use doc && dohtml -r examples +} diff --git a/dev-perl/Devel-Cycle/Devel-Cycle-1.110.0-r1.ebuild b/dev-perl/Devel-Cycle/Devel-Cycle-1.110.0-r1.ebuild index d0113ecbd70f..c6fcbe3a69f2 100644 --- a/dev-perl/Devel-Cycle/Devel-Cycle-1.110.0-r1.ebuild +++ b/dev-perl/Devel-Cycle/Devel-Cycle-1.110.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Find memory cycles in objects" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" SRC_TEST="do" diff --git a/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0.ebuild b/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0-r1.ebuild index 75114bba2d91..bedf740489e2 100644 --- a/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0.ebuild +++ b/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0-r1.ebuild @@ -11,13 +11,13 @@ inherit perl-module DESCRIPTION="Validate your CPAN META.yml file" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="test" RDEPEND="" DEPEND="${RDEPEND} test? ( - dev-perl/Parse-CPAN-Meta + virtual/perl-Parse-CPAN-Meta )" SRC_TEST="do" diff --git a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild index e7ceb5b7144d..1cb9c5ff60c4 100644 --- a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild +++ b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Check for memory leaks and circular memory references" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="test" RDEPEND=">=dev-perl/Devel-Cycle-1.04 diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest new file mode 100644 index 000000000000..2ea457dcd5bf --- /dev/null +++ b/dev-php/PHPMailer/Manifest @@ -0,0 +1 @@ +DIST PHPMailer-5.2.14.tar.gz 192100 SHA256 54acc99a6cdd807c5646e712e4499308d885bc76a3dc27679388fe0359bd3a93 SHA512 f3cacbdea4b008e6f0bddbc06fc08c8afebe64f74dded5fe87022a6ccf36db19bf4cf4f303399373c250afec32f87645eab6acd8adbcfbed3af349edd51f9e49 WHIRLPOOL c202ad61a6380b23f3e7460f333e396ef9be16f097a798f048a806d184a8ed2f50a32183d7420e7e1439865367177df0d352246928a67b315a89ed339534ad6c diff --git a/dev-php/PHPMailer/PHPMailer-5.2.14.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.14.ebuild new file mode 100644 index 000000000000..880f5b0c1831 --- /dev/null +++ b/dev-php/PHPMailer/PHPMailer-5.2.14.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Full-featured email creation and transfer class for PHP" +HOMEPAGE="https://github.com/PHPMailer/PHPMailer" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc +examples test" + +RDEPEND="dev-lang/php:*" +DEPEND="${RDEPEND} + doc? ( dev-php/phpDocumentor ) + test? ( dev-php/phpunit )" + +# The test suite requires network access. +RESTRICT=test + +src_compile(){ + if use doc; then + phpdoc --filename="class.*.php" \ + --target="./html" \ + --title="${PN}" \ + --sourcecode \ + --force \ + --progressbar \ + || die "failed to generate API documentation" + fi +} + +src_install(){ + insinto "/usr/share/php/${PN}" + doins -r *.php language extras + + dodoc README.md changelog.md + dodoc docs/* + use examples && dodoc -r examples + + use doc && dohtml -r html/* +} + +src_test(){ + cd test/ || die + phpunit . || die "test suite failed" +} + +pkg_postinst(){ + elog "${PN} has been installed in /usr/share/php/${PN}/." + elog "To use it in a script, require('${PN}/${PN}Autoload.php')," + elog "and then use the ${PN} class normally. Most of the examples in" + elog "the documentation should work without further modification." +} diff --git a/dev-php/PHPMailer/metadata.xml b/dev-php/PHPMailer/metadata.xml new file mode 100644 index 000000000000..b04ba661d413 --- /dev/null +++ b/dev-php/PHPMailer/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>php</herd> + <maintainer> + <email>mjo@gentoo.org</email> + <name>Michael Orlitzky</name> + </maintainer> +</pkgmetadata> diff --git a/dev-php/pecl-event/pecl-event-1.11.1-r1.ebuild b/dev-php/pecl-event/pecl-event-1.11.1-r1.ebuild index 5b8eb626f560..5fa72e81cc15 100644 --- a/dev-php/pecl-event/pecl-event-1.11.1-r1.ebuild +++ b/dev-php/pecl-event/pecl-event-1.11.1-r1.ebuild @@ -13,7 +13,7 @@ USE_PHP="php5-4 php5-5 php5-6" inherit php-ext-pecl-r2 confutils eutils -KEYWORDS="amd64 ~ia64 x86" +KEYWORDS="amd64 ia64 x86" LICENSE="PHP-3.01" DESCRIPTION="PHP wrapper for libevent2" diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.0.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2.ebuild index 23f5eb89d5b8..9cfe6f8473fa 100644 --- a/dev-python/cryptography-vectors/cryptography-vectors-1.0.2.ebuild +++ b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" LICENSE="|| ( Apache-2.0 BSD )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/cryptography/cryptography-1.0.2.ebuild b/dev-python/cryptography/cryptography-1.0.2.ebuild index 6185e5e2b730..5c1816d7ef30 100644 --- a/dev-python/cryptography/cryptography-1.0.2.ebuild +++ b/dev-python/cryptography/cryptography-1.0.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="|| ( Apache-2.0 BSD )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="libressl test" RDEPEND=" diff --git a/dev-python/envisage/envisage-4.4.0.ebuild b/dev-python/envisage/envisage-4.4.0.ebuild index 4bed58bfcd06..6356c679f95a 100644 --- a/dev-python/envisage/envisage-4.4.0.ebuild +++ b/dev-python/envisage/envisage-4.4.0.ebuild @@ -5,7 +5,7 @@ EAPI=5 # py2.6 fails testsuite horribly -PYTHON_COMPAT=python2_7 +PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 virtualx diff --git a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild index df4fa9975cc8..dfc153097695 100644 --- a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild +++ b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=python2_7 +PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 virtualx diff --git a/dev-python/idna/idna-2.0.ebuild b/dev-python/idna/idna-2.0.ebuild index d6c3760ff883..f55293c2d790 100644 --- a/dev-python/idna/idna-2.0.ebuild +++ b/dev-python/idna/idna-2.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="BSD" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/jmespath/jmespath-0.9.0.ebuild b/dev-python/jmespath/jmespath-0.9.0.ebuild index 58c2e6ef429b..1d220883158d 100644 --- a/dev-python/jmespath/jmespath-0.9.0.ebuild +++ b/dev-python/jmespath/jmespath-0.9.0.ebuild @@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86" IUSE="test" DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/nose[${PYTHON_USEDEP}] ) " RDEPEND="" diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild index a92bbbc7fd38..b4f7faa25ceb 100644 --- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild +++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild @@ -20,7 +20,7 @@ SLOT="0" # matplotlib/backends/qt4_editor: MIT # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets" PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" diff --git a/dev-python/pyasn1/pyasn1-0.1.8.ebuild b/dev-python/pyasn1/pyasn1-0.1.8.ebuild index 4c2effadb49e..78786b7e6231 100644 --- a/dev-python/pyasn1/pyasn1-0.1.8.ebuild +++ b/dev-python/pyasn1/pyasn1-0.1.8.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="doc" RDEPEND="" diff --git a/dev-python/pyfltk/files/fltk_wrap.patch b/dev-python/pyfltk/files/fltk_wrap.patch index 5a3904e697ac..e0c7ba3a4133 100644 --- a/dev-python/pyfltk/files/fltk_wrap.patch +++ b/dev-python/pyfltk/files/fltk_wrap.patch @@ -1,6 +1,5 @@ -diff -ur pyFltk-1.3.3.orig/python/fltk_wrap.cpp pyFltk-1.3.3/python/fltk_wrap.cpp ---- python/fltk_wrap.cpp 2015-01-03 18:31:21.000000000 +0800 -+++ python/fltk_wrap.cpp 2015-06-23 22:26:23.453212512 +0800 +--- a/python/fltk_wrap.cpp ++++ b/python/fltk_wrap.cpp @@ -144,7 +144,9 @@ # define _SCL_SECURE_NO_DEPRECATE #endif diff --git a/dev-python/pyfltk/files/ignore-func.patch b/dev-python/pyfltk/files/ignore-func.patch index e4e9f3b4ff20..a61f4cdcf3b9 100644 --- a/dev-python/pyfltk/files/ignore-func.patch +++ b/dev-python/pyfltk/files/ignore-func.patch @@ -1,4 +1,5 @@ http://sourceforge.net/p/pyfltk/code/506/ + --- a/swig/filename.i +++ b/swig/filename.i @@ -14,6 +14,7 @@ diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild index 586a16eec1f5..50f988d4ad60 100644 --- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild +++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild @@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${MY_PN}.tar.gz" LICENSE="LGPL-2" SLOT="1" -KEYWORDS="amd64 ~arm ppc ppc64 x86" +KEYWORDS="amd64 arm ppc ppc64 x86" IUSE="doc" DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]" diff --git a/dev-python/pygene/pygene-0.2.1-r1.ebuild b/dev-python/pygene/pygene-0.2.1-r1.ebuild index ff6101ff701c..f383632fccdf 100644 --- a/dev-python/pygene/pygene-0.2.1-r1.ebuild +++ b/dev-python/pygene/pygene-0.2.1-r1.ebuild @@ -3,6 +3,7 @@ # $Id$ EAPI=5 + PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 @@ -16,8 +17,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc examples" -DEPEND="doc? ( >=dev-python/epydoc-2.1-r2 )" -RDEPEND="examples? ( >=dev-python/pyfltk-1.1.2 )" +DEPEND="doc? ( >=dev-python/epydoc-2.1-r2[${PYTHON_USEDEP}] )" +RDEPEND="examples? ( >=dev-python/pyfltk-1.1.2:0[${PYTHON_USEDEP}] )" python_prepare_all() { if use examples; then diff --git a/dev-python/stormpath/Manifest b/dev-python/stormpath/Manifest index 7fd05427d38f..98f4ff174a72 100644 --- a/dev-python/stormpath/Manifest +++ b/dev-python/stormpath/Manifest @@ -1,3 +1,3 @@ -DIST stormpath-2.0.9.tar.gz 4325976 SHA256 ba93f1f9f6b98db2eb2671d2b3285fdd15f8b2e6d3bce899f240576018f216ae SHA512 b50fa11e8fecf4909a8a1014963c80e7e2dde4db37e1f4681c2a116933d59f5b5ea32901cfde97b24398d8074db8b04121b2a7715d86b6b2eb78eb288465114c WHIRLPOOL 6290d5844d35158cc46f1810b6f83e41c443164cff4512caeeb38e562b04f448c1ac1b608b2cda4abd348f91319e4e8fbb3b195ba31a8fb415ba80f0ed7c5937 DIST stormpath-2.1.1.tar.gz 4326557 SHA256 94600e8368f2fbe06adea5fddc8f4b7a479f7a89a0a35a46f58f7c796286e5f4 SHA512 7548aff63e5f04718d4d4887a1177f6f0cf3cc8cb9588e17f7563bae9c6dc5897a968ee2c4e189b6d9100ef16ec7e34e524c4cd3c5112845c0619876ca6d5505 WHIRLPOOL 33db1d8e52d24581a1fe7220b4329479142772939d1df76d52a46d47db6219890fde3204655dd65851d43b38e2427cd32df894392948482d85554772b9f12bbf DIST stormpath-2.1.2.tar.gz 4337164 SHA256 10f46c7ebb27274f61c4b550eb6fc58e54260fa0fb1f96a4b7fce530d789d11c SHA512 c3b3e93f4d5515df8e5ab94770c995a5e7912a53f58f05ca3a1f630c41fc0f76e39cf213dbfad8858d7bfe5f964f6d9cbfad9013de33e9a02e0484bd92a7957d WHIRLPOOL adfbf1cf071167a93989cd4d80039a4eb8c42a908075207a4db4db3a38c87e3b9470b9c1c02946e9481e52d875e836d0c77a72050de2a1f79fc78b5ed037dfe2 +DIST stormpath-2.1.4.tar.gz 4338169 SHA256 adbc595b243861be0268c2c71061de8ce6dc8f9a92d7398f92bf77a734315b2f SHA512 6834f1b8db731872208c96b9acb2ff66e5d7fcbb6ae0c1f1de541ce1597a786834f2b68c43d00c5adcb1018749c53b45444dde2a81a520fed79fd9b6f0f07ab0 WHIRLPOOL 6f50a1f6476d4486f43da55ae48c56942ef90820db4434c3b567222cb65d56aaa5649249dfc10add807f5ccba245d99b89efa031201af61bc888b902cf66b4ea diff --git a/dev-python/stormpath/stormpath-2.0.9.ebuild b/dev-python/stormpath/stormpath-2.1.4.ebuild index ac212dd5c98c..e6bdfe5b1541 100644 --- a/dev-python/stormpath/stormpath-2.0.9.ebuild +++ b/dev-python/stormpath/stormpath-2.1.4.ebuild @@ -3,13 +3,14 @@ # $Id$ EAPI=5 + PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) inherit distutils-r1 vcs-snapshot DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API." HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/stormpath/${PN}-sdk-python/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" @@ -26,6 +27,7 @@ DEPEND=" ) " RDEPEND=" + >=dev-python/isodate-0.5.4[${PYTHON_USEDEP}] >=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}] >=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}] >=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}] diff --git a/dev-python/tvdb_api/tvdb_api-1.9.ebuild b/dev-python/tvdb_api/tvdb_api-1.9.ebuild index 0f998e82e445..673194ddc47e 100644 --- a/dev-python/tvdb_api/tvdb_api-1.9.ebuild +++ b/dev-python/tvdb_api/tvdb_api-1.9.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT="python2_7" +PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 vcs-snapshot DESCRIPTION="Python interface to thetvdb.com API" diff --git a/dev-python/xlwt/xlwt-1.0.0.ebuild b/dev-python/xlwt/xlwt-1.0.0.ebuild index 5c9c8770b6f6..30aa55001f56 100644 --- a/dev-python/xlwt/xlwt-1.0.0.ebuild +++ b/dev-python/xlwt/xlwt-1.0.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples test" DEPEND=" diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest index 24131317edfb..a50879fcb863 100644 --- a/dev-ruby/daemons/Manifest +++ b/dev-ruby/daemons/Manifest @@ -1,2 +1 @@ -DIST daemons-1.1.9.gem 32768 SHA256 fee738586059ac5051ed89b40b63d02bdc9a19254f9b6e58848dea1c2f3135c8 SHA512 7f29162c7cb728ae27dbd16a9bc5191bb617b6cfacd1c698d2bbe43d335224b1ad59eea36205331abb9b3586c454e584333c6464f5afc033c48e676db6983f45 WHIRLPOOL 9335fde9642212f499449da75ae664443647f7a03622e75b8e71151b5db9d054ebb3d7c499ef734abb6b313543b5a6563a53412a7d2efdf5c2a3460703878e64 DIST daemons-1.2.3.gem 24576 SHA256 0fbf1f7ef654e98fac324b43ab690576fbe8b66941693b473f4f27ef334c032d SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277 WHIRLPOOL 9568c383912195964b0079df60f8342268a51d75c0251b50e5c747759b82463d3d79a597e593a24ee84eb8618a637bcb22cb842b7c9a43d67db1f0be41c72e5c diff --git a/dev-ruby/daemons/daemons-1.1.9-r1.ebuild b/dev-ruby/daemons/daemons-1.1.9-r1.ebuild deleted file mode 100644 index 71e9bab85f89..000000000000 --- a/dev-ruby/daemons/daemons-1.1.9-r1.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" - -RUBY_FAKEGEM_EXTRADOC="Releases README TODO" -RUBY_FAKEGEM_DOCDIR="html" - -RUBY_FAKEGEM_TASK_TEST="" - -inherit ruby-fakegem - -DESCRIPTION="Wrap existing ruby scripts to be run as a daemon" -HOMEPAGE="https://github.com/thuehlinger/daemons" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="examples" - -all_ruby_prepare() { - sed -e '/gempackagetask/ s:^:#:' \ - -e '/GemPackageTask/,/end/ s:^:#:' \ - -e 's:rake/rdoctask:rdoc/task:' \ - -i Rakefile || die -} - -all_ruby_install() { - all_fakegem_install - - use examples || return - - insinto /usr/share/doc/${PF}/ - doins -r examples -} diff --git a/dev-ruby/daemons/daemons-1.2.3.ebuild b/dev-ruby/daemons/daemons-1.2.3.ebuild index f511796573f6..0df89780387d 100644 --- a/dev-ruby/daemons/daemons-1.2.3.ebuild +++ b/dev-ruby/daemons/daemons-1.2.3.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/thuehlinger/daemons" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="examples" all_ruby_install() { diff --git a/dev-ruby/highline/highline-1.7.6.ebuild b/dev-ruby/highline/highline-1.7.6.ebuild index 25225ce66103..a4adfb05a938 100644 --- a/dev-ruby/highline/highline-1.7.6.ebuild +++ b/dev-ruby/highline/highline-1.7.6.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/JEG2/highline" IUSE="" LICENSE="|| ( GPL-2 Ruby )" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" all_ruby_prepare() { # fix up gemspec file not to call git diff --git a/dev-ruby/jsobfu/jsobfu-0.2.1-r1.ebuild b/dev-ruby/jsobfu/jsobfu-0.2.1-r1.ebuild new file mode 100644 index 000000000000..3cc76e8c0fd2 --- /dev/null +++ b/dev-ruby/jsobfu/jsobfu-0.2.1-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby19 ruby20 ruby21 ruby22" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_RECIPE_TEST="rspec" +RUBY_FAKEGEM_BINWRAP="" + +inherit ruby-fakegem + +DESCRIPTION="A Javascript code obfuscator" +HOMEPAGE="https://github.com/rapid7/jsobfu" + +LICENSE="BSD" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +ruby_add_rdepend "!dev-ruby/jsobfu:0 + >=dev-ruby/rkelly-remix-0.0.6:0" + +all_ruby_prepare() { + sed -i -e '/simplecov/ s:^:#:' \ + -e '/config.\(color\|tty\|formatter\)/ s:^:#:' \ + spec/spec_helper.rb || die + + sed -i -e '/rkelly-remix/,/name:/ s/=/~>/' ../metadata || die +} diff --git a/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild b/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild new file mode 100644 index 000000000000..a8630dacb453 --- /dev/null +++ b/dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +inherit ruby-fakegem + +DESCRIPTION="A Javascript code obfuscator" +HOMEPAGE="https://github.com/rapid7/jsobfu" + +LICENSE="BSD" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +ruby_add_rdepend "!dev-ruby/jsobfu:0 + >=dev-ruby/rkelly-remix-0.0.6:0" + +ruby_add_bdepend "test? ( dev-ruby/execjs )" + +all_ruby_prepare() { + sed -i -e '/simplecov/ s:^:#:' \ + -e '/config.\(color\|tty\|formatter\)/ s:^:#:' \ + spec/spec_helper.rb || die + + sed -i -e '/rkelly-remix/,/name:/ s/=/~>/' ../metadata || die +} diff --git a/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild b/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild index 7f7a090d1edb..82eda577e5fa 100644 --- a/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild +++ b/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild @@ -4,10 +4,9 @@ EAPI=5 USE_RUBY="ruby19 ruby20 ruby21 ruby22" - RUBY_FAKEGEM_RECIPE_DOC="rdoc" - RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_BINWRAP="" inherit ruby-fakegem diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest index 2a70295272d0..a0a5ae32c467 100644 --- a/dev-ruby/metasploit-payloads/Manifest +++ b/dev-ruby/metasploit-payloads/Manifest @@ -1,2 +1,3 @@ +DIST metasploit-payloads-1.0.15.gem 5249536 SHA256 8d186c3bcf8a4537b9a96301e8cc0d847335d3cfa87ca5b2e88a6b2980eab240 SHA512 58afa5c4bc191a05e3ec009d94d40f2d9fc5a025962088845db14aefc410340fdc7b1e30f17c75936495a43fc99576d188960bc5755dbec434d7428fbbdd495a WHIRLPOOL d136642c1de9b18e652c421ad3b9fd859b8d8850dd539d66d4c8b410e09064d7872bc06c505b01d5389d1e2ebe22ed6b3c88aa3a0f08a1578f204201c24b3438 DIST metasploit-payloads-1.0.16.gem 11805696 SHA256 e127930c2b6cf09c91f2a2d7ef2a215aae2dee00172606c6b8644886b932301f SHA512 27f51db437f49d5685007e8a8762123890e6cce46b7465b2db3c070298e23bc4c440583c37da59b841a91deb100d47aa86db2d634f07ed212fbba11134c3fe47 WHIRLPOOL de81c9bbc1350621c8d3711fe29056a9116b7ffc63205f336d3efe22655777264c86790aec95d26af6858e516c0a667e368c021713ac87d8d20ff08b65e2bfd2 DIST metasploit-payloads-1.0.9.gem 5248000 SHA256 bd9eec335158dd25e579c680856f8c48aa9ba081a5d51d87a05dbb1e511087a3 SHA512 4c08284d4b1d667f545d97e879b2581830f34d42560ba6d6ed7adf32312adc841d5fdd8b55ab4e06a196d1e313fb44fbb861ccac7790e50f88260e2def0a76ed WHIRLPOOL a398dcad94b38626d4bd3d9980d05a24ccdbc12bbd2e902dd4f78c9bcd2cf4a26c76645d989a00aec69d041d9203c5ff31e0b0f948028ac6cd06ae724d573950 diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild new file mode 100644 index 000000000000..8360c06db03f --- /dev/null +++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_TASK_DOC="" + +RUBY_FAKEGEM_EXTRAINSTALL="data" + +inherit ruby-fakegem + +DESCRIPTION="Compiled binaries for Metasploit's Meterpreter" +HOMEPAGE="https://rubygems.org/gems/metasploit-payloads" + +LICENSE="BSD" + +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +#no tests +RESTRICT="test strip" + +QA_PREBUILT=" + usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin + usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso + usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso + usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso + usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so + usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so + usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so + " + +src_install() { + ruby-ng_src_install + #tell revdep-rebuild to ignore binaries meant for the target + dodir /etc/revdep-rebuild + cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die + #These dirs contain prebuilt binaries for running on the TARGET not the HOST + SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs" + EOF +} diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest index b3e0f4f84daa..3baf068956ad 100644 --- a/dev-ruby/shoulda-matchers/Manifest +++ b/dev-ruby/shoulda-matchers/Manifest @@ -1,3 +1,2 @@ -DIST shoulda-matchers-2.6.1.gem 91648 SHA256 81554002d29e612e55daf2c45b40b617ad7a2186d8eebaec6946ea46da8672dc SHA512 16d51ed2cee688c04d2b60f666856476d067c455afdd785608311692a889284bef8fc7c12ded15784567398548523316e6b5cc4d33c220657e37224ab83073d2 WHIRLPOOL 92859b311b6fb5c4c4bea1b2d737833cd1696a6583b7cc9be0ac4d1ab3eb55f17a1e28f7cfee8e4af349cb43dcedc9c4f83ac5f11e8108293311c08d98f1bc34 -DIST shoulda-matchers-2.7.0.gem 137728 SHA256 a759c5a0d247370622203f5a452c9eb37d658c35150c0a8788c0dae2628cee89 SHA512 7e28488a2cfaae24f6a7d61f5457680a7496df56ea5a9157f8c32741956c0d2053aac9f834b109a610f53f853bc16ba459e475cef049e599e7eda8fc11e57e14 WHIRLPOOL 6af12aa9d776b160d6fa487cad75bd4604f963d3e5fa966d4f5b748e1feb01cec4a7cf501fe6df929e7547ae48c8eec56b5417bf7b78e75d1154d773baebafae DIST shoulda-matchers-2.8.0.gem 153600 SHA256 a089735b66e82d6b65fb4ac774d858a812fe16b69d97becaf0c986a919f67934 SHA512 7b40220811a11cf57cfa38457eaab612ec9f6db5b660df21bd142b3df30d3691d3b7b3b4f931eed1e186c5afe4b576eee2c86f6f8f491d46955598f1441a9027 WHIRLPOOL b4e04218aded6452884ed339cc81865e65a7927243209d678ca7e857c3f2577f10d1f8dfd7321b1b0e93b669956bbaec0215b474cefebd25cf44bf0e0bd4c028 +DIST shoulda-matchers-3.0.1.gem 177664 SHA256 4b06fb7d92165507246dbc4154440cb30742e1b6e8ac396e96358d88d65eeaa9 SHA512 f49ff413cb0e983d26ac463522dfea8a63fdf09be4feb401cd0319f7fcc0bdcb79608eddc3672d3082e47f61c87dc7e4b61d8af622f315978efc7bace160df92 WHIRLPOOL ab8e9d5028f821e807301b268218535810c083c1e3aad3b9c2d500fb1ce38844cbe27e044a318087ded8e330083a81dd0794a6ebdd7bcfeb0d81ba3e891ea178 diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-2.6.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-2.6.1.ebuild deleted file mode 100644 index b4e8fab6d811..000000000000 --- a/dev-ruby/shoulda-matchers/shoulda-matchers-2.6.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_TASK_DOC="" - -RUBY_FAKEGEM_RECIPE_TEST="" - -RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="Making tests easy on the fingers and eyes" -HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="" - -ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0" diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-2.7.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.0.1.ebuild index b4e8fab6d811..654f4b317796 100644 --- a/dev-ruby/shoulda-matchers/shoulda-matchers-2.7.0.ebuild +++ b/dev-ruby/shoulda-matchers/shoulda-matchers-3.0.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby20 ruby21" RUBY_FAKEGEM_TASK_DOC="" @@ -18,8 +18,8 @@ DESCRIPTION="Making tests easy on the fingers and eyes" HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers" LICENSE="MIT" -SLOT="0" +SLOT="3" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" IUSE="" -ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0" +ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*" diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest index 6c2efabc5ce2..3123c08f44cd 100644 --- a/dev-ruby/syntax/Manifest +++ b/dev-ruby/syntax/Manifest @@ -1,2 +1 @@ -DIST syntax-1.0.0.gem 15360 SHA256 605e2f62770bad04e849b3a1a2234e45b2904a8592f2f4dcc0bb14dce09c23fd SHA512 196c0bd125903f3579d7a02528be16b09db75dbf91f6f8efbaa4cd69229a52a2ae00841343c3b17bada86e6bda51d6cc7c0c119615a5d779332f61976af96c04 WHIRLPOOL f41df19ef0adddf0ef0424bf9e1070c2b2417bacba5f4a1d37051a5a19f82a75ada729f2ebd41f70dac7b455722b5c4d5e94dde1f7ec8235ea15116a968a4b86 DIST syntax-1.2.0.tar.gz 40797 SHA256 9cec12fac6b6dc4f3fee263f5765333880ae26d4194b9670f3de26d4674dde9b SHA512 69804ab94203e2260b4c585aacf68db6ad8e47cf2339ffeb1105ae39da5f1d456b1413eeeef29f1c450bff19780e815b9b1b966b171de3b24595f759b36e6548 WHIRLPOOL 4eb23d481dbd56878ac024643d10069f644ac182813dc744fa61ea44a418d04caa738915a7a60ca85aff5bf90c35e92187e18a1adf168cd17265c06f2b3a4e66 diff --git a/dev-ruby/syntax/syntax-1.0.0-r4.ebuild b/dev-ruby/syntax/syntax-1.0.0-r4.ebuild deleted file mode 100644 index 8b2a006324a9..000000000000 --- a/dev-ruby/syntax/syntax-1.0.0-r4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_RUBY="ruby19 ruby20" - -RUBY_FAKEGEM_TASK_TEST="" -RUBY_FAKEGEM_TASK_DOC="" - -inherit ruby-fakegem - -DESCRIPTION="Syntax highlighting for sourcecode and HTML" -HOMEPAGE="http://syntax.rubyforge.org" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -all_ruby_prepare() { - # The yaml test case hangs. Remove it so we can at least run all - # other tests instead of skipping the whole test suite. - rm test/syntax/tc_yaml.rb || die -} - -each_ruby_test() { - ${RUBY} -Ilib:test test/ALL-TESTS.rb || die "tests failed" -} diff --git a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild index cb3e4bdb2ae8..cd941b3ea446 100644 --- a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild +++ b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test doc" RUBY_PATCHES=( "${P}-require-set.patch" ) diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest index 93467a254031..de5cd05c9a58 100644 --- a/dev-ruby/vcr/Manifest +++ b/dev-ruby/vcr/Manifest @@ -1,2 +1,3 @@ DIST vcr-1.11.3.gem 87552 SHA256 6dcdd782d631b1464192d47db2a5a86d2325c80a723a4b2970f47da98f006f1d SHA512 0d62b0699e42484a4ba385a2ec653881183b44d85fd46ffc1ea693ebb746b225566cdb2799cdb60235c24adecd7575e0f20d743968326eeeb5b24fbd3232354a WHIRLPOOL f2c91385bc6dd68340f1a4960f3ec4944afd1907d33c8163ebe99d1e72c5b0f45e665463161654d4a330d2cfad25674b8a8e97a3cf2e1ae309d7ae6c4fd2be09 DIST vcr-2.9.3.gem 152576 SHA256 041361620a613e18c514b5e680bfbed3a8db69e1ffe5916957ba36966dd92190 SHA512 2d71a84439fb92393641d211372b476bb2b55c70dff8c8f17a4af9fcb3e8f9104e1da860cfeafc8ceea9499023c7f6206124dee36ee9690188cc444bab61b2a7 WHIRLPOOL 0994aab3f00da3c628fe1ad5e752bc694b6096ace92edeb1d3f5877864a80ffdd4c3d1ce69d0119ca91dae8d72a6172de1901ab4db1c27750bf83f25825c0052 +DIST vcr-3.0.0.tar.gz 149918 SHA256 7687c290a43915d4b6b0a030e389434c89662b6c92b1685c3898a23fd65a51f0 SHA512 65029b582ea5cf3f0031a5f6489232a6ef22cf0c927046a37894000fa71907a4da004e1f2f6b35443ad4738b96411135cac1d763fe7734648354f2cb18c97de9 WHIRLPOOL 72100ad4d5395355cbf75863c420b2d01c2fc6b980c920462ffddffa10e7c8797fa21f643446a447fb2da422d6fbeb23a5c11651bdd2334527fb733acc4d392c diff --git a/dev-ruby/vcr/vcr-3.0.0.ebuild b/dev-ruby/vcr/vcr-3.0.0.ebuild new file mode 100644 index 000000000000..e3b5c63d22bd --- /dev/null +++ b/dev-ruby/vcr/vcr-3.0.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby19 ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md" + +inherit ruby-fakegem + +DESCRIPTION="Records your test suite's HTTP interactions and replay them during future test runs." +HOMEPAGE="https://github.com/vcr/vcr/" +SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="MIT" + +KEYWORDS="~amd64" +SLOT="3" +IUSE="test" + +# Tests require all supported HTTP libraries to be present, and it is +# not possible to avoid some of them without very extensive patches. +RESTRICT="test" diff --git a/dev-ruby/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest index b1a8a6b38276..fe70e883880f 100644 --- a/dev-ruby/websocket-driver/Manifest +++ b/dev-ruby/websocket-driver/Manifest @@ -1,2 +1,3 @@ DIST websocket-driver-0.3.4.gem 19456 SHA256 b829ee1da54aa1374ca0cc143a83f1f5a55ea9f318021f06fec4b34a2f47b038 SHA512 c3c2c98bd5057a47e830fc31d56f88ad376ad71b473963fa20c1380de8a9c95b458cd9545b676f7adc1ed494664714648aec182b6b3681c38c87248370f1db64 WHIRLPOOL 019e6527dcd034ddfd3652c1f71bbeee01e62dfa59e7c70d1986b64bb05364122cc7d2c4bee2c2c0d4559e55724f6def40a1b20ad47e6fa153f5b7e8b3c0366d DIST websocket-driver-0.6.2.tar.gz 24186 SHA256 531b5687169e837c6c6378cac0716710143691138caa95ef67a5bb2a14a46f71 SHA512 c4a7d91a6f3c882029c50723da90cf5b1daac725bc1b4ac1bb5136b1fbb96f6206f9b304ff9d404399ab1d1995a39a9db63123fff8fd9b80241cc16709fc7200 WHIRLPOOL 64c4134ec7ebfaba790cd68863ca3989282444417a84d058a034b14814e02e8bcd11744a33739e45a7cc8009e30bbb8333990626af44f8df6b411478cd7d8120 +DIST websocket-driver-0.6.3.tar.gz 24562 SHA256 b326151fdde8a0d5c01035547b570d2e8feb1aa9c0344e034cfb954d1df21154 SHA512 ed5b22ddf7e2e592942e828076009f07c3ad4058b213aa8b44ac5bcf952d21484464a082f6f45772368dd61fe0dd9eb60732897561f757f960167d86d4e99c74 WHIRLPOOL c159ed70052edcb9cc4e5c3ddda7ea86eb160da0e3a7108ca36a26ce13437995b021e4407ab6d29cfa57fe61c72932350f360becfd44bd16b54da1ff0384f40a diff --git a/dev-ruby/websocket-driver/websocket-driver-0.6.3.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.6.3.ebuild new file mode 100644 index 000000000000..a22cd10be59d --- /dev/null +++ b/dev-ruby/websocket-driver/websocket-driver-0.6.3.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="A complete implementation of the WebSocket protocols" +HOMEPAGE="https://github.com/faye/websocket-driver-ruby" +SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz" +RUBY_S="${PN}-ruby-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0" + +all_ruby_prepare() { + sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die +} + +each_ruby_configure() { + ${RUBY} -Cext/websocket-driver extconf.rb || die +} + +each_ruby_compile() { + emake V=1 -Cext/websocket-driver + cp ext/websocket-driver/websocket_mask.so lib/ || die +} diff --git a/dev-tex/vc/Manifest b/dev-tex/vc/Manifest new file mode 100644 index 000000000000..fd09128269d9 --- /dev/null +++ b/dev-tex/vc/Manifest @@ -0,0 +1 @@ +DIST vc-0.5.zip 440260 SHA256 7f11a41f364c0aa48818b69784fee6356db726d5e55f512a3bea0299f9b1ce0a SHA512 0574bb6e6e7a0a9065cb1042726ac6ff09c4c38b7d05acdaf4fab3023439f5be35af12ec228b285a40e9cd9448f85e16e849d0dd08af743115bdba0556f3b969 WHIRLPOOL ce6f648c4ad90596147af2faffe7be30c13da0d89e7fb99430facda9048ff4d810757a8713741432d820225f34665567e056f5ccd6ef630ed864356edef35c21 diff --git a/dev-tex/vc/files/vc-0.5-git-date.patch b/dev-tex/vc/files/vc-0.5-git-date.patch new file mode 100644 index 000000000000..f05c857d1026 --- /dev/null +++ b/dev-tex/vc/files/vc-0.5-git-date.patch @@ -0,0 +1,14 @@ +Use CommitterDate instead of AuthorDate, because the latter is not +guaranteed to increase monotonously. + +--- vc-orig/git-unix/vc-git.awk ++++ vc/git-unix/vc-git.awk +@@ -39,7 +39,7 @@ + ### Standard encoding is UTF-8. + if (Encoding == "") Encoding = "UTF-8" + ### Extract relevant information from variables. +- LongDate = substr(AuthorDate, 1, 25) ++ LongDate = substr(CommitterDate, 1, 25) + DateRAW = substr(LongDate, 1, 10) + DateISO = DateRAW + DateTEX = DateISO diff --git a/dev-tex/vc/files/vc-0.5-git-status.patch b/dev-tex/vc/files/vc-0.5-git-status.patch new file mode 100644 index 000000000000..7ab998ca40c0 --- /dev/null +++ b/dev-tex/vc/files/vc-0.5-git-status.patch @@ -0,0 +1,27 @@ +Output format of "git status" has changed which broke parsing. +Use "git status --porcelain" instead which is a more stable interface, +intended for processing by scripts. + +--- vc-orig/git-unix/vc ++++ vc/git-unix/vc +@@ -20,5 +20,5 @@ + git --no-pager log -1 HEAD --pretty=format:"Hash: %H%nAbr. Hash: %h%nParent Hashes: %P%nAbr. Parent Hashes: %p%nAuthor Name: %an%nAuthor Email: %ae%nAuthor Date: %ai%nCommitter Name: %cn%nCommitter Email: %ce%nCommitter Date: %ci%n" |gawk -v script=log -v full=$full -f vc-git.awk > vc.tex + if [ "$mod" = 1 ] + then +- git status |gawk -v script=status -f vc-git.awk >> vc.tex ++ git status --porcelain |gawk -v script=status -f vc-git.awk >> vc.tex + fi +--- vc-orig/git-unix/vc-git.awk ++++ vc/git-unix/vc-git.awk +@@ -26,9 +26,9 @@ + + ### Process output of "git status". + ### Changed index? +-script=="status" && /^# Changes to be committed:/ { modified = 1 } ++script=="status" && /^[MADRC]/ { if (modified == 0) modified = 1 } + ### Unstaged modifications? +-script=="status" && /^# Changed but not updated:/ { modified = 2 } ++script=="status" && /^.[MD]/ { modified = 2 } + + + diff --git a/dev-tex/vc/metadata.xml b/dev-tex/vc/metadata.xml new file mode 100644 index 000000000000..42f266d3ea99 --- /dev/null +++ b/dev-tex/vc/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>tex</herd> +<maintainer> + <email>ulm@gentoo.org</email> +</maintainer> +<longdescription> + This is a script based approach to version control for TeX documents. + It works more reliably than keyword substitution based approaches, + since it tracks all files in a working copy, not only .tex files. + + The vc bundle works with LaTeX and plain TeX. Currently, Bazaar, Git + and Subversion are supported. +</longdescription> +</pkgmetadata> diff --git a/dev-tex/vc/vc-0.5.ebuild b/dev-tex/vc/vc-0.5.ebuild new file mode 100644 index 000000000000..8d0b9b6ebbe0 --- /dev/null +++ b/dev-tex/vc/vc-0.5.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit latex-package + +DESCRIPTION="The vc (version control) bundle" +HOMEPAGE="https://www.ctan.org/pkg/vc" +# Taken from http://mirrors.ctan.org/support/vc.zip +SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.zip" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="app-arch/unzip" + +S="${WORKDIR}/${PN}" +PATCHES=( + "${FILESDIR}"/${P}-git-date.patch + "${FILESDIR}"/${P}-git-status.patch +) + +src_compile() { :; } + +src_install() { + insinto ${TEXMF}/scripts/${PN} + doins -r bzr-unix git-unix svn-unix + latex-package_src_doinstall pdf + dodoc CHANGES README +} diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest index ed0647bc120a..da95257d998b 100644 --- a/dev-util/gtk-update-icon-cache/Manifest +++ b/dev-util/gtk-update-icon-cache/Manifest @@ -1,4 +1,3 @@ -DIST gtk-update-icon-cache-2.24.27.tar.xz 285228 SHA256 ae01d2c6aaededa1ddd7aac3ff1e6a7619a8854961ecf2297b72ab0bb36736e4 SHA512 71deed19785244a1af08c71bbbff54436762b95eddecd530ded06190127dff7e1e72dcf764377737bfcbc125528b434be76939cae33e79755fe23da8e503297c WHIRLPOOL 4aa6d8a98972bfe5a99cacf82dccb5e1224a74a198b89a3c33c232b6d08bab547c9dc5748a3c308dd0f38ff2cfa7f908b2e906c212a1e82deea32c91cc92a309 DIST gtk-update-icon-cache-3.14.13.tar.xz 306376 SHA256 1e054574afc7c954c3d0d231007698a2ec6fd1655dc388572343376157f01f35 SHA512 eb6994a6a7a738e9b50a2c812fa0fb88b3c7516662059190ddeb6d61abdec5f00efcc44fc278bd42b8fca2c171c0746e8412b4b7294b65b75d41fa4289dff175 WHIRLPOOL cf10ae3e8abb6db3eb040d04c2d39a9909fa45935084d6d2591a96e1f4dd58c000d4d1b6af766e9d8402f6409d626f4817bda76d36aaf1a620c49f1738b78355 -DIST gtk-update-icon-cache-3.16.4.tar.xz 316704 SHA256 583d03906f8138756c47e682cc4afe255f24c0ac673605d48b7c542205000ec8 SHA512 b2071a39b16176f20e84b0ca73b28d46daba2a6428f57e917f58df2b084698ba20570f2fa9fbecd448936e5af1f528b014275b33c0bf86d1a4559a76f0b56082 WHIRLPOOL 91cc77b09c6c363ff0a70b5614f9f43ca0c1a1dab8610b58b1464e92129a9d600231ad8bd93d65ba61447d6af9c6da1499d24915e2811df0b67cd27cb623b3be DIST gtk-update-icon-cache-3.16.5.tar.xz 316720 SHA256 05d3182244a935c3e9c288f59dc2ef9470de5cd7186be5d6c694999cc0bfd51a SHA512 b04ef86301c0b7d7c6204d51da2e5282008ab1d70c3296b60a7ebab8e7ae57cc3ea344659705f8fa5942d2e0a7bab9936cc6bc15bed9e0cc4e1856c7aee913e3 WHIRLPOOL 43f92b5e82c38cd021a8107489a99fd3a414c6eb97462be7929b8fb02f69f13a10b164efbed3a71cce19ab2990ea547dd114328d276131791635b48b008fa74c +DIST gtk-update-icon-cache-3.16.7.tar.xz 315484 SHA256 dd8f8c7358fd182fad40e3935404909fd35c401cf3117f6517d5146e51d213a4 SHA512 bf07d29d10d2ed75a04b0ac17ef7486352c60fcc2895676201203f821785500600acbcbdbaf2ec90146ad6b55ec52cbee22a49a0b3d55fbe2df14b73ca578442 WHIRLPOOL eb72146c110a94d29ae0efa0ed8baf4de491463728edd8a8ea1f156535ed9fb5e7b0832d2085ebc388e74b00a7fe72ef8b1d04e5dbe6e629077024593c96b273 diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild deleted file mode 100644 index e4566e848383..000000000000 --- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="GTK update icon cache" -HOMEPAGE="http://www.gtk.org/" -SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2+" -SLOT="0" -IUSE="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.28:2 - >=x11-libs/gdk-pixbuf-2.21:2 - !<x11-libs/gtk+-2.24.28-r1:2 -" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.50.1 - virtual/pkgconfig -" diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.4.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.7.ebuild index 7ef89ff178b0..7ef89ff178b0 100644 --- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.4.ebuild +++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.7.ebuild diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest index e794699e64ac..921077ff0e5d 100644 --- a/dev-util/jenkins-bin/Manifest +++ b/dev-util/jenkins-bin/Manifest @@ -1,3 +1,3 @@ DIST jenkins-bin-1.625.1.war 62885582 SHA256 e5134146d398f00712c19c69bc84a594509505eec2ba6930f8df41689debfbcb SHA512 b05710ffe195476fa22ca2dd226148755310ee17527c0294a0251414bbb085860fd40ec485ce53a4446d36bfaa908f3a4b828e1772d590433120ec3668c239d9 WHIRLPOOL df9dcfa58c2f166929e0c0e22f6daab95d4f42549509943459fbcad70349c9885673db27ee8262421989b69f0503f8e9805d9a889181ab71c6a98f0de5e44245 -DIST jenkins-bin-1.634.war 63310617 SHA256 47f9bd9dd3ee400c62905173a9d65605653a10a339e1d593f0b2e0f7456b1d9a SHA512 b736f04cd211b4a3cf56bc5dbd504997319e6d05b4cd6d5629710f69ac6080409923b733109d241debc6737ad4780026e4a67a673aae561ddb40900205da9c56 WHIRLPOOL 396239893cd511b9f21dc6d5f2b17a9dc6bfd7a708401d649a3eb0cadbd34334e726146caf02cb3963caaaf2dbc3aee6277d26b570c835195cb84fd2252a896d DIST jenkins-bin-1.635.war 63529765 SHA256 6ec3487a56cbb319a8c47cb5986adef5fa2748ebd2ef5752159f47057c4c048f SHA512 b2200c30715c254a87ef7628835eaf6f1b606c8a9da1e15d6264b84d848ff7f7b4de1dcfb0a5b5a905c6c34e1483f393e53c31f00fe76860c5855651ceb05182 WHIRLPOOL 0e5e6769c3712be772ff20af5f0f861dc2ffb665352bff7514c8ab6bd3a97b084a8716c43fa00b2ba0e9f72d09658704852a00b87087555fa4c3f01f6b5773d5 +DIST jenkins-bin-1.636.war 63531046 SHA256 7374cfecf603a9403affe2644c6fe9bc6b157fa67e38dfcb9bf6e9776df9dcc8 SHA512 7ef5a7e72d0da79542ecf4ea6160d21ce256bf153aa8246fd8ea6658adff520f23c93a20977086a5729df634e008907bd52af352dc3cde9589ebcc6a2e11902c WHIRLPOOL 08f040d7906a3667796c0c3292125d056df8a78ea19a406d3ca499447904b1a20ab0ca0acb3448dc33c926736ab27a88804b536482524db061949adbf7b6e740 diff --git a/dev-util/jenkins-bin/jenkins-bin-1.634.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.636.ebuild index 37fc08477727..37fc08477727 100644 --- a/dev-util/jenkins-bin/jenkins-bin-1.634.ebuild +++ b/dev-util/jenkins-bin/jenkins-bin-1.636.ebuild diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest index 9838b748f725..21abdbf124ea 100644 --- a/dev-util/pkgconf/Manifest +++ b/dev-util/pkgconf/Manifest @@ -1,4 +1 @@ DIST pkgconf-0.9.11.tar.bz2 86489 SHA256 3bdae1b2672133943dc0dda694ed57074f8b03c3fea10efb215d76d3cabe2c3b SHA512 21313ef29afcaa7c49a8cb512ecd3a821693945c22fb1a670ada74f41bca320e1b9ffb64e79adc2c33cb86822b74ddc850fadb16ddcde7eb805b81a50096992f WHIRLPOOL 7442a456af7e959c86f318ee74ec89883cc4e2ad16c9708f98d8ab30cdcf71ea7ef13f7e0f9bf945717b1dea8a317ffc5322878f88a5084c2dcbdc2aeafaf4d2 -DIST pkgconf-0.9.3.tar.bz2 82334 SHA256 00033a1080a81dfff7cd7ef98d2b054e4cf627376df92a67b98f2e0c243e7f11 SHA512 5b57dcb78f1e5d5bec2db9456b1e784057d6faeb24a5599c29c439672545dcea01b19b8388952c4259f4028a4e6e70b049c1736532d4d7b2239d450698cbc24a WHIRLPOOL 96a07c04a4785fe62bff16cda8aaf8025afe8c3db0e41863af34c42593fe39f0d42b67b60858d9536d5fcde8bb018f61949c364c1651ff50edf145ffef64918f -DIST pkgconf-0.9.6.tar.bz2 84005 SHA256 c40a77543fe5c7259b813f70ddaf229c2760a250d1cf2ccef60b81fb1d3fc299 SHA512 3eb997637c85a2babf14e8dcc6ac401c9a12d927cbf29524d0b34246944ec3b3929d079b68c28b83b4cc9b277f49759c213c2458c0143c06963753f1f56b956c WHIRLPOOL 1a4cf46c9e52630869b2c4bfd2c5abf3aa6f5de1a67fb2988bdbd85a2e9f2f52e66207ee8f2e737a53fed3a1846cea7beb5d9d77f76be57b05feb65a4df90606 -DIST pkgconf-0.9.8.tar.bz2 85104 SHA256 29289fe5c775974c0403cfba8999d18591ca3deee56b455950eb1dc0b488805f SHA512 652b32c29a95cd889ed8a9f3a5a00aaa3df199e7c05e1701ac78fa7b04dfff7fb983b5d92763db2c1556b9722c8a48384887741b055985c458f1a97a2de1c0ee WHIRLPOOL 8ba3e61fd756bd07928d4ca4ad9e29b778e2afcb02d0bac955de359c319e47390251e29ebed4204e09a58c1bbb1220391dc1690313b96eddce676e100f04ab1a diff --git a/dev-util/pkgconf/pkgconf-0.9.11.ebuild b/dev-util/pkgconf/pkgconf-0.9.11.ebuild index 1294e1be8040..7ee43dedb5d2 100644 --- a/dev-util/pkgconf/pkgconf-0.9.11.ebuild +++ b/dev-util/pkgconf/pkgconf-0.9.11.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else inherit eutils multilib-minimal SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" fi DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" diff --git a/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild b/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild deleted file mode 100644 index 268038598cf7..000000000000 --- a/dev-util/pkgconf/pkgconf-0.9.3-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git" - inherit autotools git-2 multilib-minimal -else - inherit eutils multilib-minimal - SRC_URI="http://tortois.es/~nenolod/distfiles/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" -fi - -DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" -HOMEPAGE="https://github.com/pkgconf/pkgconf" - -LICENSE="BSD-1" -SLOT="0" -IUSE="+pkg-config strict" - -DEPEND="" -RDEPEND="${DEPEND} - pkg-config? ( - !dev-util/pkgconfig - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config] - )" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pkgconf -) - -src_prepare() { - [[ -e configure ]] || eautoreconf - - if use pkg-config; then - MULTILIB_CHOST_TOOLS+=( - /usr/bin/pkg-config - ) - fi -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf $(use_enable strict) -} - -multilib_src_install() { - default - use pkg-config \ - && dosym pkgconf /usr/bin/pkg-config \ - || rm "${ED}"/usr/share/aclocal/pkg.m4 \ - || die -} diff --git a/dev-util/pkgconf/pkgconf-0.9.6.ebuild b/dev-util/pkgconf/pkgconf-0.9.6.ebuild deleted file mode 100644 index 40ca7a96854a..000000000000 --- a/dev-util/pkgconf/pkgconf-0.9.6.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git" - inherit autotools git-2 multilib-minimal -else - inherit eutils multilib-minimal - SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" -fi - -DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" -HOMEPAGE="https://github.com/pkgconf/pkgconf" - -LICENSE="BSD-1" -SLOT="0" -IUSE="+pkg-config strict" - -DEPEND="" -RDEPEND="${DEPEND} - pkg-config? ( - !dev-util/pkgconfig - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config] - )" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pkgconf -) - -src_prepare() { - [[ -e configure ]] || eautoreconf - - if use pkg-config; then - MULTILIB_CHOST_TOOLS+=( - /usr/bin/pkg-config - ) - fi -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf $(use_enable strict) -} - -multilib_src_install() { - default - use pkg-config \ - && dosym pkgconf /usr/bin/pkg-config \ - || rm "${ED}"/usr/share/aclocal/pkg.m4 \ - || die -} diff --git a/dev-util/pkgconf/pkgconf-0.9.8.ebuild b/dev-util/pkgconf/pkgconf-0.9.8.ebuild deleted file mode 100644 index 1bced6969de4..000000000000 --- a/dev-util/pkgconf/pkgconf-0.9.8.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git" - inherit autotools git-2 multilib-minimal -else - inherit eutils multilib-minimal - SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" -fi - -DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" -HOMEPAGE="https://github.com/pkgconf/pkgconf" - -LICENSE="BSD-1" -SLOT="0" -IUSE="+pkg-config strict" - -DEPEND="" -RDEPEND="${DEPEND} - pkg-config? ( - !dev-util/pkgconfig - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config] - )" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pkgconf -) - -src_prepare() { - [[ -e configure ]] || eautoreconf - - if use pkg-config; then - MULTILIB_CHOST_TOOLS+=( - /usr/bin/pkg-config - ) - fi -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf $(use_enable strict) -} - -multilib_src_install() { - default - use pkg-config \ - && dosym pkgconf /usr/bin/pkg-config \ - || rm "${ED}"/usr/share/aclocal/pkg.m4 \ - || die -} diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest index ceaa04214437..a86d96416706 100644 --- a/dev-util/pycharm-professional/Manifest +++ b/dev-util/pycharm-professional/Manifest @@ -3,3 +3,4 @@ DIST pycharm-professional-4.0.6.tar.gz 155933406 SHA256 b914f55dab1bff6e8707ca64 DIST pycharm-professional-4.5.2.tar.gz 160339662 SHA256 a736a1d648ff7ae742b86ff278b2eeb53c61c875037d44f863b1abc78ffdf7b5 SHA512 3c79ee632554499b13b5d3096a3e60d3c578ef29ae985f7daef0555f217650686f6cd0d700a3a6f8fec809fc11a12c476365a594b167aa76f4720a9dabce66d7 WHIRLPOOL fb69b0cada495ba88872b2c0a38b4b272501a022338d600fc8ccb3cb7ea70c374bf898882e4e35eff2bd199da8ba15e721e765e156e3ee86edb9e3bf019d3c76 DIST pycharm-professional-4.5.3.tar.gz 160688951 SHA256 5ac0ff2ad0e5a61d93182637ff308c30227f1c2f7e396149a9720782bc336601 SHA512 ea21e30d98bd5f83438fb3c51c366828dc1ab62540b7c22c3164afdd93f338ec677795dc43177e698efc86b72d2337fc3546abb1d78bc388697312afa4f7c018 WHIRLPOOL d89217d63086b5b0213b267eabb301900e0f4fb8b16a69260ba50a153fb7568f5dfbe6dec89f6c64083fd51d9fa089fced55a324a2837cfffd2c1abebffd8db6 DIST pycharm-professional-4.5.4.tar.gz 160665389 SHA256 0d3a0a627901a1519ee77a0f2b34bc9cd7ba9a20c1276862ed5324187d25c6b7 SHA512 2f0fc1018128984bc1763c263e185763e9f2af03306d61bdc30f229dfd54bf7094e46a3758eeaacd34c9c47bb0522d52f17206ce3da283d52be685a4a34da90e WHIRLPOOL d76ec00b68642fd716bfca94e9465de1855fd4e60dc15a49ae683abc48a172d57dde166b3a13d178680bbe25b54fa863494b01bfdff575d7b0f75ddfb124d39b +DIST pycharm-professional-5.0.tar.gz 183117515 SHA256 066ca91c7d810765a96e82673d4241de855b82cd0d46dc88e46f00da00789c9a SHA512 183597e004604cc49dfff674f8fb9c05fa73d1a3e01dc66368f0b49ea2ada653fe28a64181697449d9adeecfda3e8d8e7105bd75aa82f9ccd9331d783146e18a WHIRLPOOL 94b5030d3131ae92c83596ff6c9f547068022048d3bf9cff9d21d3c8664664b4bf9805098bd677fe7f48ad7160f9a6d6923fe930edb99612f6718a4cd1294122 diff --git a/dev-util/pycharm-professional/pycharm-professional-5.0.ebuild b/dev-util/pycharm-professional/pycharm-professional-5.0.ebuild new file mode 100644 index 000000000000..dfb1dc5e49a8 --- /dev/null +++ b/dev-util/pycharm-professional/pycharm-professional-5.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils readme.gentoo + +DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis" +HOMEPAGE="http://www.jetbrains.com/pycharm/" +SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz" + +LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=virtual/jre-1.6 + dev-python/pip" +DEPEND="" + +RESTRICT="mirror strip" +QA_PREBUILT="opt/${PN}/bin/fsnotifier + opt/${PN}/bin/fsnotifier64 + opt/${PN}/bin/libyjpagent-linux.so + opt/${PN}/bin/libyjpagent-linux64.so" + +MY_PN=${PN/-professional/} +S="${WORKDIR}/${MY_PN}-${PV}" + +src_install() { + insinto /opt/${PN} + doins -r * + + fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh} + + dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN} + newicon "bin/${MY_PN}.png" ${PN}.png + make_desktop_entry ${PN} "${PN}" "${PN}" + + readme.gentoo_src_install +} diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index 0f641a8a6443..c00cc3a3e09a 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -75,6 +75,9 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then if ! declare -p PYTHON_COMPAT &>/dev/null; then die 'PYTHON_COMPAT not declared.' fi +if [[ $(declare -p PYTHON_COMPAT) != "declare -a"* ]]; then + die 'PYTHON_COMPAT must be an array.' +fi # @ECLASS-VARIABLE: PYTHON_REQ_USE # @DEFAULT_UNSET diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 7113cfa95d16..d3b4f1d500f7 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -84,6 +84,9 @@ inherit multibuild python-utils-r1 if ! declare -p PYTHON_COMPAT &>/dev/null; then die 'PYTHON_COMPAT not declared.' fi +if [[ $(declare -p PYTHON_COMPAT) != "declare -a"* ]]; then + die 'PYTHON_COMPAT must be an array.' +fi # @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE # @INTERNAL diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 132d40753b37..1c2728514bea 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -98,6 +98,9 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then if ! declare -p PYTHON_COMPAT &>/dev/null; then die 'PYTHON_COMPAT not declared.' fi +if [[ $(declare -p PYTHON_COMPAT) != "declare -a"* ]]; then + die 'PYTHON_COMPAT must be an array.' +fi # @ECLASS-VARIABLE: PYTHON_REQ_USE # @DEFAULT_UNSET diff --git a/games-board/four-in-a-row/Manifest b/games-board/four-in-a-row/Manifest index 773c4d4c86f2..d9f7df2c6b9c 100644 --- a/games-board/four-in-a-row/Manifest +++ b/games-board/four-in-a-row/Manifest @@ -1,2 +1 @@ -DIST four-in-a-row-3.14.2.tar.xz 1964984 SHA256 32138122d807657b5adb58cf093129587ad1ea057242946acb2168eb797fcb99 SHA512 f19901d866c16fa961dff174a5393b882bbcf6612b39df5501c3153f8e428e6b934cc5f24d7d8902bb0b2a7c86699e7e42fda3c1d39366a7ef932eb6f768c407 WHIRLPOOL 2a3cdd899e6f745c1498197d6542e511715cfd24f517d71920d83ac1f7126181f84460ad9255b847ccdc6f04117c3e118fd7590ec046532b625fb96e6292f3f8 DIST four-in-a-row-3.16.2.tar.xz 1933500 SHA256 bf42edfed65c5d9614cdf54dac40d17d3b100b0f56bc047b7812f0bb3564a5ae SHA512 bbeda27f372e9466e46196141d4784124d2ca92628a459d5959b5463c9be55c305e968eb25376ceaa883252fef96ef7466aa20b87f838806c1a7d9c6c2881c7a WHIRLPOOL ae4eddd70a1584e3f9a0f194f515beea75356550444b05e0966b230b96f81bf9362083d6f389cb92d06a8a1c0bfa329cfba987b1748c43ac95eb91e892c3292d diff --git a/games-board/four-in-a-row/four-in-a-row-3.14.2.ebuild b/games-board/four-in-a-row/four-in-a-row-3.14.2.ebuild deleted file mode 100644 index 61e2271e0b68..000000000000 --- a/games-board/four-in-a-row/four-in-a-row-3.14.2.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" -GCONF_DEBUG="no" - -inherit gnome-games - -DESCRIPTION="Make lines of the same color to win" -HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -RDEPEND=" - dev-libs/glib:2 - >=gnome-base/librsvg-2.32 - >=media-libs/libcanberra-0.26[gtk3] - >=x11-libs/gtk+-3.13.2:3 -" -DEPEND="${RDEPEND} - app-text/yelp-tools - dev-util/appdata-tools - >=dev-util/intltool-0.50 - virtual/pkgconfig -" - -src_configure() { - gnome-games_src_configure APPDATA_VALIDATE=$(type -P true) -} diff --git a/games-board/openyahtzee/Manifest b/games-board/openyahtzee/Manifest index 1a1267e26f1b..717069734e36 100644 --- a/games-board/openyahtzee/Manifest +++ b/games-board/openyahtzee/Manifest @@ -1 +1,2 @@ DIST openyahtzee-1.9.1.tar.bz2 159149 SHA256 aa553a248d30ba259abb8dee735d5728bfdbb8d4705805bc716453245f1cb0a0 SHA512 2833a7085bb03d157b58a5e3a95c03b8a51cc8b527aec204188c8f773c492f4822655ec15dbedd4330c25bc4382132694ae7d3935dfb27756e859149ab66ef59 WHIRLPOOL 8c9986f163576d2d5ab31ea4083139645513c6d3e1a171cba9cb7030186a2f022984e8a9925f7524e2b25b9c7ad3a989eb39bb76b13642cef848e66daabfa86d +DIST openyahtzee-1.9.2.tar.bz2 194053 SHA256 a56c2c16fc6ec3f4eba5a85afcf19467b364ec38f4374724673a0360fc3f83cd SHA512 012b7081eafafb28ada3d15f82d42b0a7fe5fe2e4c728dfbd1e3c688ef0e00bd22a55b1450e267c6e1d9d3cc2a8cf76dbec336c744a239df7dd46a473038b141 WHIRLPOOL 9013b7006fe4da86f69127c9a5a11544bd1022e31a4f0197d4fce58d75113b0246d5b76e1adf6a7e4d73ddd4beff0ce2a1a53a0e853366c59effbb3dfd406e80 diff --git a/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch b/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch new file mode 100644 index 000000000000..485a14c9ceeb --- /dev/null +++ b/games-board/openyahtzee/files/openyahtzee-1.9.2-wx3.0.patch @@ -0,0 +1,67 @@ +From: Guy Rutenberg <guyrutenberg@gmail.com> +Date: Sat, 25 Oct 2014 15:33:42 +0200 +Subject: wxstrtol + +Fixes a FTBFS with recent versions of wx3.0. +--- + src/MainFrame.cpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/MainFrame.cpp b/src/MainFrame.cpp +index 2128376..8e29d6d 100644 +--- a/src/MainFrame.cpp ++++ b/src/MainFrame.cpp +@@ -510,7 +510,7 @@ void MainFrame::OnUndo(wxCommandEvent& event) + wxString tempstr; + + tempstr = ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> GetValue(); +- tempstr.Printf(wxT("%li"), wxStrtol(tempstr, NULL, 10) - 100); ++ tempstr.Printf(wxT("%li"), strtol(tempstr.mb_str(), NULL, 10) - 100); + ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> SetValue(tempstr); + } + +@@ -936,7 +936,7 @@ void MainFrame::YahtzeeBonus() + return; + if (m_score_dice.IsYahtzee()) { + tempstr = ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> GetValue(); +- tempstr.Printf(wxT("%li"), wxStrtol(tempstr, NULL, 10) + 100); ++ tempstr.Printf(wxT("%li"), strtol(tempstr.mb_str(), NULL, 10) + 100); + ((wxTextCtrl*) FindWindow(ID_YAHTZEEBONUSTEXT)) -> SetValue(tempstr); + m_yahtzeebonus = true; + } +@@ -973,7 +973,7 @@ void MainFrame::EndofGame() + + for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){ + tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue(); +- upperscore += wxStrtol(tempstr, NULL, 10); ++ upperscore += strtol(tempstr.mb_str(), NULL, 10); + } + + tempstr.Printf(wxT("%li"),upperscore); +@@ -992,7 +992,7 @@ void MainFrame::EndofGame() + //calculate total on lower section + for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) { + tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue(); +- lowerscore += wxStrtol(tempstr, NULL, 10); ++ lowerscore += strtol(tempstr.mb_str(), NULL, 10); + } + + tempstr.Printf(wxT("%li"),lowerscore); +@@ -1091,7 +1091,7 @@ void MainFrame::CalculateSubTotal() + + for (int i = ID_ACESTEXT; i<=ID_SIXESTEXT; i++){ + tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue(); +- upperscore += wxStrtol(tempstr, NULL, 10); ++ upperscore += strtol(tempstr.mb_str(), NULL, 10); + } + + tempstr.Printf(wxT("%li"),upperscore); +@@ -1105,7 +1105,7 @@ void MainFrame::CalculateSubTotal() + + for (int i = ID_THREEOFAKINDTEXT; i<=ID_YAHTZEEBONUSTEXT; i++) { + tempstr = ((wxTextCtrl*) FindWindow(i)) -> GetValue(); +- lowerscore += wxStrtol(tempstr, NULL, 10); ++ lowerscore += strtol(tempstr.mb_str(), NULL, 10); + } + + tempstr.Printf(wxT("%li"),lowerscore); diff --git a/games-board/openyahtzee/openyahtzee-1.9.2.ebuild b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild new file mode 100644 index 000000000000..8458d300d93c --- /dev/null +++ b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER="3.0" +inherit eutils wxwidgets toolchain-funcs versionator games + +DESCRIPTION="A full-featured wxWidgets version of the classic dice game Yahtzee" +HOMEPAGE="http://openyahtzee.sourceforge.net/" +SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]" +DEPEND="${RDEPEND} + >=sys-devel/gcc-4.6 + dev-libs/boost" + +pkg_pretend() { + local ver=4.6 + local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support." + if ! version_is_at_least ${ver} $(gcc-version); then + eerror ${msg} + die ${msg} + fi +} + +src_prepare() { + # Debian patch that was upstreamed and accepted + # This can be dropped on next version then + epatch "${FILESDIR}"/${P}-wx3.0.patch +} + +src_configure() { + need-wxwidgets unicode + egamesconf --datadir=/usr/share +} + +src_install() { + default + prepgamesdirs +} diff --git a/games-misc/sound-of-sorting/Manifest b/games-misc/sound-of-sorting/Manifest index 58e6cdd0a8ff..79bead1858f7 100644 --- a/games-misc/sound-of-sorting/Manifest +++ b/games-misc/sound-of-sorting/Manifest @@ -1,2 +1,3 @@ DIST sound-of-sorting-0.6.3.tar.bz2 135529 SHA256 1a81398391e322c2b9939153d27e638f11f2472fbd50b4def83ae58a68bc17af SHA512 b8b2cf628ccf8092e8a8e37caea2d4a865ffdebc0d140ad42db67dbead923921538bd530a08f339baeaace03f2ec426454f2907689d486332699b805adfafdcd WHIRLPOOL 54dfbf6c70612a85c40769e5c72404f3c9208af28cef3fe4ad35228d84583d88d61008b533e0deef69aca9459b5aa86ad9a8e50c4f2981374b0ee4f4bd1e75ca DIST sound-of-sorting-0.6.5.tar.bz2 144446 SHA256 937c9f9b53289cf80283cfc64afd96a4b9a146b142e36eba5dfdaf0a63ef4ada SHA512 c0dc8761ac8c110d4c516e47dd2dc472714ed9b5d09d1401f11db019abd8933dd5172c540fdb1afc8b3f3b87f0c8d0fa33ffdd4eab6ed1044ed05b704412e34f WHIRLPOOL a29693e9b87b845dceb6cfe77974af204b921df43eb76a5fdf6166eedc069daee9507265de825838b5f89f033edb7af41b23e8741cd14081753896439afdf25e +DIST sound-of-sorting-0.6.6_pre20151107.tar.gz 179044 SHA256 91a13ab8a69b4e7623b3c763613c18c5ef317e5e93f4b68e68b82200f158c85e SHA512 530caeefe4a37fed401ce56803900806a86efc1e4c0ff083c52e4bfc1cf78f8158539ca3c22f5cdf5cd176c8d6953089d14ca855643ce353457419a4f931a125 WHIRLPOOL a4e42827875d394f41dbb1791034dca81d2ebf2c2dadf349087609df7cbf6d07d218f6cd8720200c086919f3f37f3b97995f12b4d017c9b831fb85006df7eccb diff --git a/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107.ebuild b/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107.ebuild new file mode 100644 index 000000000000..df6aa03e6a51 --- /dev/null +++ b/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER="3.0" + +inherit games vcs-snapshot wxwidgets + +DESCRIPTION="Visualization and Audibilization of Sorting Algorithms" +HOMEPAGE="http://panthema.net/2013/sound-of-sorting/ https://github.com/bingmann/sound-of-sorting" +#SRC_URI="http://panthema.net/2013/sound-of-sorting/${P}.tar.bz2" +COMMIT="05db428c796a7006d63efdbe314f976e0aa881d6" +SRC_URI="https://github.com/bingmann/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + media-libs/libsdl + x11-libs/wxGTK:${WX_GTK_VER} +" +DEPEND="${RDEPEND}" + +src_unpack() { + vcs-snapshot_src_unpack + need-wxwidgets unicode +} diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest index de7ea36c3d21..eb44bda8dda7 100644 --- a/gnome-extra/cjs/Manifest +++ b/gnome-extra/cjs/Manifest @@ -1,3 +1 @@ -DIST cjs-2.4.2.tar.gz 324509 SHA256 1310a2bfdebd6a50a09718abf3627daab097233781757509121257445e0423e3 SHA512 95c46808120392f4c9d74d5d94ee030be1b3a8a36ddabbd12560ea0ed16ac6bdeb78016a09eec315536ee094109c6f6fe07ee624300bd1eae88fdbdefbed0565 WHIRLPOOL e0dca618e2d166ee29ebc303d162dd7cd37c8d5381d68fd1c5824aba173cd651ab9825437f2096aede2be667bcd9633a21acd3bdee9002fee1d2f350cc454730 -DIST cjs-2.6.1.tar.gz 324886 SHA256 1b431ccacfc6dac5f393ff6807dac69751eb943488422b7e26554f164a0e4309 SHA512 1c382a590def70f2d0ed554c5a345f3094d06ae4999aeb6b836d2867f947aeb5f60b222e4c139d89bdba0e855e6e844f80f4d0b08e3921e84c2e214e9d371a61 WHIRLPOOL 1cded0ba6da3baba6484785080cff9e08db5529e3f2a5c0a740e5f1a06b0c1e89b299f686c931724412ebdb0eb9dee509e517da5fad403eab5c4c043afabec84 DIST cjs-2.6.2.tar.gz 324978 SHA256 742e5a98281c3aff3127113352e920151468fd3c55214aa9c9ed09704efa70a0 SHA512 cd8954027ffa538e6bbf8e48e574ab9721c514a9d975e24e9915a3f23dc61b4faacc5e1a3302d8a08ea9a515189b40299c80c43a065c14560d206256a1984d29 WHIRLPOOL 0d566df0c80c4548b9521ca430f8a2a35892383b922faade4f77510ed9f1811fcac7b9dd8c166a4bff8148280c5b5b448bb584be9576edd005fd9b4a0b4085c2 diff --git a/gnome-extra/cjs/cjs-2.4.2.ebuild b/gnome-extra/cjs/cjs-2.4.2.ebuild deleted file mode 100644 index b492980b7963..000000000000 --- a/gnome-extra/cjs/cjs-2.4.2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit autotools eutils gnome2 pax-utils virtualx - -DESCRIPTION="Linux Mint's fork of gjs for Cinnamon" -HOMEPAGE="http://cinnamon.linuxmint.com/" -SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples gtk test" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-lang/spidermonkey:24 - >=dev-libs/glib-2.36:2 - >=dev-libs/gobject-introspection-1.38:= - sys-libs/readline:0 - virtual/libffi - cairo? ( x11-libs/cairo[X,glib] ) - gtk? ( x11-libs/gtk+:3 ) -" -DEPEND="${RDEPEND} - gnome-base/gnome-common - sys-devel/gettext - virtual/pkgconfig - test? ( sys-apps/dbus ) -" -# Cinnamon 2.2 does not work with this release. -RDEPEND="${RDEPEND} - !<gnome-extra/cinnamon-2.4 -" - -src_prepare() { - # Disable broken unittests - epatch "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch - - epatch_user - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # FIXME: add systemtap/dtrace support, like in glib:2 - # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason - # XXX: Do NOT enable coverage, completely useless for portage installs - gnome2_src_configure \ - --disable-systemtap \ - --disable-dtrace \ - --disable-coverage \ - $(use_with cairo) \ - $(use_with gtk) -} - -src_test() { - Xemake check -} - -src_install() { - # installation sometimes fails in parallel - gnome2_src_install -j1 - - if use examples; then - insinto /usr/share/doc/"${PF}"/examples - doins "${S}"/examples/* - fi - - # Required for cjs-console to run correctly on PaX systems - pax-mark mr "${ED}/usr/bin/cjs-console" -} diff --git a/gnome-extra/cjs/cjs-2.6.1.ebuild b/gnome-extra/cjs/cjs-2.6.1.ebuild deleted file mode 100644 index 7f766c8bd95c..000000000000 --- a/gnome-extra/cjs/cjs-2.6.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit autotools eutils gnome2 pax-utils virtualx - -DESCRIPTION="Linux Mint's fork of gjs for Cinnamon" -HOMEPAGE="http://cinnamon.linuxmint.com/" -SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples gtk test" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-lang/spidermonkey:24 - >=dev-libs/glib-2.37.3:2 - >=dev-libs/gobject-introspection-1.38:= - sys-libs/readline:0 - virtual/libffi - cairo? ( x11-libs/cairo[X,glib] ) - gtk? ( x11-libs/gtk+:3 ) -" -DEPEND="${RDEPEND} - gnome-base/gnome-common - sys-devel/gettext - virtual/pkgconfig - test? ( sys-apps/dbus ) -" -# Cinnamon 2.2 does not work with this release. -RDEPEND="${RDEPEND} - !<gnome-extra/cinnamon-2.4 -" - -src_prepare() { - # Disable broken unittests - epatch "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch - - epatch_user - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # FIXME: add systemtap/dtrace support, like in glib:2 - # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason - # XXX: Do NOT enable coverage, completely useless for portage installs - gnome2_src_configure \ - --disable-systemtap \ - --disable-dtrace \ - --disable-coverage \ - $(use_with cairo) \ - $(use_with gtk) -} - -src_test() { - Xemake check -} - -src_install() { - # installation sometimes fails in parallel - gnome2_src_install -j1 - - if use examples; then - insinto /usr/share/doc/"${PF}"/examples - doins "${S}"/examples/* - fi - - # Required for cjs-console to run correctly on PaX systems - pax-mark mr "${ED}/usr/bin/cjs-console" -} diff --git a/gnome-extra/cjs/cjs-2.6.2.ebuild b/gnome-extra/cjs/cjs-2.6.2.ebuild index 7602027620a6..b7c2cade7bfb 100644 --- a/gnome-extra/cjs/cjs-2.6.2.ebuild +++ b/gnome-extra/cjs/cjs-2.6.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" SLOT="0" IUSE="+cairo examples gtk test" -KEYWORDS="alpha ~amd64 x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-lang/spidermonkey:24 diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest index 4c6496b686cd..bb4a50381809 100644 --- a/gnome-extra/eiciel/Manifest +++ b/gnome-extra/eiciel/Manifest @@ -1,3 +1,2 @@ DIST eiciel-0.9.10.tar.bz2 647578 SHA256 27adf2b0c777836401d8a5e6195c30e4cadef893fdc2a2bd64356bde309ed688 SHA512 7801753edfb07b566f4979067c91031dcb8f3010a7cc96e12b05847706d81e10eb6c5e6df224c98cf9d2ad8cb5d9b7848dd610e1c6c3c8a2331c1d4ca3cc61fe WHIRLPOOL 2bd1935268b3a42fbfc788387263812d73ad06e4fd291f79117821c3b5fb9a5b24b7aa405e4df6e0d6fb5bfebfcaf12713a27924bbdc94bd6e72a78b0e9bc66e -DIST eiciel-0.9.8.2.tar.bz2 648067 SHA256 fd99837a57adf83767765a4f096ae81c0af7e33f81df24c55c304b3b649c2079 SHA512 b50479f10d7516ecee2880a03d49ba0d5b13914b3c417f34f960fe7e28aefd0779650915326473180ec19d4c7b6a5998da603c9ccd90a05558521465f99aa9cb WHIRLPOOL 3cd792ca0fed6799a811a92205f32f2b208d684c4a8840cdc5baa8f4825ff55e29885999c0206fbb05ff4e02941f2b71ed2ccce959e1a9a81f7de810b928c229 -DIST eiciel-0.9.9.tar.bz2 647313 SHA256 c87635f15b381ae912d8d015badf9c0d1428c9a766383399c1351eb02e5b479b SHA512 d2031cdc479851ce207000251dcef9121501f8447b60d37fad9f0fe940bfde0e775443f6988f058e565920089cfacf007461f3c8b5a4146f779f9a22396ac7e9 WHIRLPOOL 4eebbab5a5847fd9f3ec6f937dae7a09a000b1b7d232cd366cf9dba6a7f479b16265bf0ba5ce8f5c5d6f36636007f33e3a5bef4a459523b737e83151a33a4fed +DIST eiciel-0.9.11.tar.bz2 680384 SHA256 13f9025e449d1b7f3a21fdb9454e8ba03849cb03d6390943c00a21dc3a0aebf2 SHA512 914b8b888e502a31f6c70bcc7d391ea8b79dde07e13b9a6ebb3b52a20b793fafd7a7a7f8ff7177c0150a223a74cae1b06fca0a274bc27545bb89223b4b8fd2aa WHIRLPOOL 140dfdb1c6e9308a5eced321775a0e337b78fa3798535f86be9f4dbade5c690c5fce9109d00f762439c4b893a6f19f48a3097f0cee7db8d6b3b8ee4a20f6cd01 diff --git a/gnome-extra/eiciel/eiciel-0.9.8.2.ebuild b/gnome-extra/eiciel/eiciel-0.9.11.ebuild index 56c1bd7e19b7..d287dfd9990d 100644 --- a/gnome-extra/eiciel/eiciel-0.9.8.2.ebuild +++ b/gnome-extra/eiciel/eiciel-0.9.11.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="xattr" RDEPEND=" diff --git a/gnome-extra/eiciel/eiciel-0.9.9.ebuild b/gnome-extra/eiciel/eiciel-0.9.9.ebuild deleted file mode 100644 index 56c1bd7e19b7..000000000000 --- a/gnome-extra/eiciel/eiciel-0.9.9.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="ACL editor for GNOME, with Nautilus extension" -HOMEPAGE="http://rofi.roger-ferrer.org/eiciel/" -SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="xattr" - -RDEPEND=" - >=sys-apps/acl-2.2.32 - >=dev-cpp/gtkmm-3:3.0 - >=gnome-base/nautilus-3 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/gettext-0.18.1 -" - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --with-gnome-version=3 \ - $(use_enable xattr user-attributes) -} diff --git a/gnome-extra/gnome-shell-extensions-topicons/Manifest b/gnome-extra/gnome-shell-extensions-topicons/Manifest index b2cc98c66a9d..8e2d433a5c90 100644 --- a/gnome-extra/gnome-shell-extensions-topicons/Manifest +++ b/gnome-extra/gnome-shell-extensions-topicons/Manifest @@ -1 +1,2 @@ +DIST gnome-shell-extensions-topicons-28.tar.xz 2116 SHA256 d73f2c57e6b22088a981a101cc1c4960acc6612e81b365ac6f54031e068a0c41 SHA512 666c47bc342021db98f11d7bf2a77a805d34f98f940c4facf46e9eb7255e3d8ee0384cb88eb007390bfd0595a9bf8974a3aecfe0ef5661940d00dfaf7df81c62 WHIRLPOOL be794587c62e973aa9dfd0d7e17126564b5fafbd2982eecda3b51c659d96f5e5453b2c8a0d2f7472b66442855bf4f27957860d42a2a58dcce638bd3064c6066d DIST topicons-26.tar.xz 2112 SHA256 e8c937d9029f59717b3b67cb6f44f065f4d01622a71a38bdc16f1886ad537a32 SHA512 82974c444c1ceb23f6d290b3ec2d99b0505b38d39f90033ec8efece7ba5820e578ca53af6413bfa448ea1593522ff1a1aad46e5feafc5e8a8daebbf8873275e4 WHIRLPOOL bcdc3d4dbe074d7f07753cba1341160441161decb58e76934a338a1bf3ae0febf7b9eae4d156a78491e0b2fcfaa7f1cb455155a010872a60e8a7f8f90c0606cf diff --git a/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.ebuild b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.ebuild new file mode 100644 index 000000000000..f9a863c221f1 --- /dev/null +++ b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +inherit vcs-snapshot + +DESCRIPTION="Shows legacy tray icons on top" +HOMEPAGE="https://extensions.gnome.org/extension/495/topicons/" +SRC_URI="http://94.247.144.115/repo/topicons/snapshot/topicons-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + app-eselect/eselect-gnome-shell-extensions + >=gnome-base/gnome-shell-3.10 +" +DEPEND="app-arch/xz-utils" + +src_install() { + local uuid='topIcons@adel.gadllah@gmail.com' + insinto "/usr/share/gnome-shell/extensions/${uuid}" + doins * +} + +pkg_postinst() { + ebegin "Updating list of installed extensions" + eselect gnome-shell-extensions update + eend $? +} diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest index 70697aba9d5f..7fcd7ca48da1 100644 --- a/mail-client/evolution/Manifest +++ b/mail-client/evolution/Manifest @@ -1,3 +1,2 @@ DIST evolution-3.12.11.tar.xz 11360812 SHA256 f9ec78ae7b9aadb7efc76777c4c93a98f7c61be2a4cfaaf351dd051604e981f5 SHA512 aef832fbfd6d7449f234e9cb0fdfabc2b75373220e37f5bc58379a2e91a3eacc39e6f8f37078c46adc11d5aa8f2d466974b8dcdcf88a68e68e7ad4a5f659a49c WHIRLPOOL 34a83a6a9be6c2e65fad3732fd86a523282fb8a1cb876da33595cec92c6c16fb8144ad6188381be9c58a301cc4e52fce04e577fd663ebfe31b0f96678126edbc -DIST evolution-3.16.4.tar.xz 11946404 SHA256 60d90c4f36cc05f925f50dc7e8dcc4f83edd6d9b5476f14e75c1d10ce7fbd67f SHA512 d985cfdf5729e7442a9df4f69f486e617e98f59b7781ffb18dbf0424d5843e3046508b0bde0fbc083648b0b995cd0e534e68b9cc1e11cf21bca58791665480da WHIRLPOOL bce88813f90bbb1aec904ed6ee9163881a5a643b8bb2838f9dce47ac18ee457d9c930966bb12f0642d02177cbff1b98ef1a352297e3b5be0d633a7fadf89ce6b DIST evolution-3.16.5.tar.xz 11962476 SHA256 fef4e8d0a81dc4562f984dddc5ccfee885506a2e030692b5ac6cd50e32efce37 SHA512 6f99982c42d462cc449eb8c56e22cde1ff628111b52e12fd6c8cbcbf86dbc047431aea2507c7026589bfe54b020443f3a647190de72cc235ce45f72f8d55b222 WHIRLPOOL 462e71bd51a0d5be9d5f6d9f965ae3121612ebd56066de43d328dd003cd61ab155af0c48b58868bf220e6956eee01844cbe923ea64fb30a9b88ba10d1e4c74e3 diff --git a/mail-client/evolution/evolution-3.16.4.ebuild b/mail-client/evolution/evolution-3.16.4.ebuild deleted file mode 100644 index 718861d2ae83..000000000000 --- a/mail-client/evolution/evolution-3.16.4.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils flag-o-matic readme.gentoo gnome2 - -DESCRIPTION="Integrated mail, addressbook and calendaring functionality" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP" -SLOT="2.0" -IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" - -# We need a graphical pinentry frontend to be able to ask for the GPG -# password from inside evolution, bug 160302 -PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )" - -# glade-3 support is for maintainers only per configure.ac -# pst is not mature enough and changes API/ABI frequently -# dconf explicitely needed for backup plugin -# google tasks requires >=libgdata-0.15.1 -# gnome-desktop support is optional with --enable-gnome-desktop -# gnome-autoar (currently disabled because no release has been made) -COMMON_DEPEND=" - >=app-crypt/gcr-3.4 - >=app-text/enchant-1.1.7 - >=dev-libs/glib-2.40:2[dbus] - >=dev-libs/libgdata-0.10:= - >=dev-libs/libxml2-2.7.3:2 - >=gnome-base/gnome-desktop-2.91.3:3= - >=gnome-base/gsettings-desktop-schemas-2.91.92 - >=gnome-extra/evolution-data-server-3.16:=[gtk,weather?] - >=media-libs/libcanberra-0.25[gtk3] - >=net-libs/libsoup-2.42:2.4 - >=net-libs/webkit-gtk-2.2:3 - >=x11-libs/cairo-1.9.15:=[glib] - >=x11-libs/gdk-pixbuf-2.24:2 - >=x11-libs/gtk+-3.10:3 - >=x11-libs/libnotify-0.7:= - >=x11-misc/shared-mime-info-0.22 - - >=app-text/iso-codes-0.49 - dev-libs/atk - gnome-base/dconf - dev-libs/libical:= - x11-libs/libSM - x11-libs/libICE - - crypt? ( - >=app-crypt/gnupg-1.4 - ${PINENTRY_DEPEND} - x11-libs/libcryptui ) - map? ( - >=media-libs/libchamplain-0.12:0.12[gtk] - >=media-libs/clutter-1.0.0:1.0 - >=media-libs/clutter-gtk-0.90:1.0 - >=sci-geosciences/geocode-glib-3.10.0 - x11-libs/mx:1.0 ) - spell? ( app-text/gtkspell:3 ) - ldap? ( >=net-nds/openldap-2:= ) - ssl? ( - >=dev-libs/nspr-4.6.1:= - >=dev-libs/nss-3.11:= ) - weather? ( >=dev-libs/libgweather-3.8:2= ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gtk-doc-am - >=dev-util/intltool-0.40.0 - dev-util/itstool - virtual/pkgconfig -" -# eautoreconf needs: -# app-text/yelp-tools -# >=gnome-base/gnome-common-2.12 -RDEPEND="${COMMON_DEPEND} - bogofilter? ( mail-filter/bogofilter ) - highlight? ( app-text/highlight ) - spamassassin? ( mail-filter/spamassassin ) - !gnome-extra/evolution-exchange -" - -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools - doc? ( >=dev-util/gtk-doc-1.14 )" -fi - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="To change the default browser if you are not using GNOME, edit -~/.local/share/applications/mimeapps.list so it includes the -following content: - -[Default Applications] -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop - -(replace firefox.desktop with the name of the appropriate .desktop -file from /usr/share/applications if you use a different browser)." - -src_prepare() { - # Fix relink issues in src_install - ELTCONF="--reverse-deps" - - # Do not create Contacts source for GMail accounts (from 3.16 branch) - epatch "${FILESDIR}"/${P}-contacts-gmail.patch - - gnome2_src_prepare - -} - -src_configure() { - # Use NSS/NSPR only if 'ssl' is enabled. - gnome2_src_configure \ - --without-glade-catalog \ - --disable-autoar \ - --disable-code-coverage \ - --disable-installed-tests \ - --disable-pst-import \ - --enable-canberra \ - $(use_enable crypt libcryptui) \ - $(use_enable highlight text-highlight) \ - $(use_enable map contact-maps) \ - $(use_enable spell gtkspell) \ - $(use_enable ssl nss) \ - $(use_enable ssl smime) \ - $(use_with bogofilter) \ - $(use_with ldap openldap) \ - $(use_with spamassassin) \ - $(usex ssl --enable-nss=yes "--without-nspr-libs - --without-nspr-includes - --without-nss-libs - --without-nss-includes") \ - $(use_enable weather) -} - -src_install() { - DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" - - gnome2_src_install - - # Problems with prelink: - # https://bugzilla.gnome.org/show_bug.cgi?id=731680 - # https://bugzilla.gnome.org/show_bug.cgi?id=732148 - # https://bugzilla.redhat.com/show_bug.cgi?id=1114538 - echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN} - doenvd "${T}"/99${PN} - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - readme.gentoo_print_elog -} diff --git a/mail-client/evolution/evolution-3.16.5.ebuild b/mail-client/evolution/evolution-3.16.5.ebuild index 8feb4c8d9ccf..aa358f6269c1 100644 --- a/mail-client/evolution/evolution-3.16.5.ebuild +++ b/mail-client/evolution/evolution-3.16.5.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP" SLOT="2.0" IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather" -KEYWORDS="~alpha amd64 x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~ia64 x86 ~x86-fbsd" # We need a graphical pinentry frontend to be able to ask for the GPG # password from inside evolution, bug 160302 diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest index 4456d76b5795..1eb8c6ba398e 100644 --- a/media-fonts/cantarell/Manifest +++ b/media-fonts/cantarell/Manifest @@ -1,3 +1,3 @@ DIST cantarell-fonts-0.0.16.tar.xz 291968 SHA256 15bf87555321556750bc68ace360f3df420359a8ab257e15c44fb69710152f1c SHA512 12936e56d1dd3eac3db5a02b854769ba7c8bd06bf4942c505d81ea20529ee450e07f0f347e3861a49212ef7291452716537c05375f74877246f49d186ad681b0 WHIRLPOOL ca79340c66cf4e4ed52e57f599ffa579bd207414b7e51507d4fb9c59b333b88b7d6b60783aff829ddc00686d0851f27c65c96452486951a1a997d4ad43e6f759 DIST cantarell-fonts-0.0.17.2.tar.xz 264920 SHA256 b5cf061c1cb37881c34c5bd5a6cad495236e50bef2386072800322f0ef5abf36 SHA512 72d52b8e22df1508283f324792fec6f96cfeeca07ee240ce0b3a603532727e3b95446a10af838471c7e8b32ea2734b0d4d20dcc2f10bbd47f54e149069a8614a WHIRLPOOL 2cfa35bd903c80b96ac6cd3d49cb1a13aeac8262be56b064c5c77957fbaff07ed68928ace08b5a1283497d00e0340ee706c1052a0dfb6b8ff4eb8f49526ca313 -DIST cantarell-fonts-0.0.17.tar.xz 266128 SHA256 96b36778b0a02854d832e8afa8439989d09b6f4c3e6d5f3a663f8418b82ba04f SHA512 9773b6e116df9c3ecd33183f011efa162bbac75b302fe91fba4d4b548cf8ceb0eafdcd576088b9291c855713c0dde1dcff2bde1525ae9b4835f7ea7fbe24d32b WHIRLPOOL f0b8812d67c3233685e7e0db7b25a4075d75809dccd7436f8279e0e3cf2b8950a26e2b2b24e5c37635da6bd9e8445a10e8ed3f6a9d35cb68b01f5e17513389f4 +DIST cantarell-fonts-0.0.18.tar.xz 290472 SHA256 f84df2ca44fa9266fdffd2b8de1adeff60eb7e7c9ec8e338a229b3126aabb977 SHA512 284c4675e0cdea9b1dc89f9c92c4fd09c371d8440619ebfc31a8269c7b6513410af1ca806c3cdda28a523dba4d8142886308903f39c5a6a92307a70fce72b60c WHIRLPOOL 81d38a7d00681517092f4b5f2f2bffee5160b0e6340f7f4723752501b81bfea29170ff62e25db82165b42a848734a4279e8945fa5f09695504fef5345e052f4b diff --git a/media-fonts/cantarell/cantarell-0.0.17.ebuild b/media-fonts/cantarell/cantarell-0.0.18.ebuild index ef8eba89faf7..ef8eba89faf7 100644 --- a/media-fonts/cantarell/cantarell-0.0.17.ebuild +++ b/media-fonts/cantarell/cantarell-0.0.18.ebuild diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest index 626181e28e97..4441e69631e1 100644 --- a/media-gfx/gnome-photos/Manifest +++ b/media-gfx/gnome-photos/Manifest @@ -1,3 +1,2 @@ -DIST gnome-photos-3.14.2.tar.xz 756784 SHA256 1bce84bd0467647decf26f81e03535940ab65a7774f44e1395a2b87d88c0be96 SHA512 6c55844f40197f1e3d8f0779bac1fdf0ba5e32bd639a8878adb109444c816ffcdc8acf3d6023d8c75ce298d61e4b6f9fa76ef81a2ec1592fb6e0633ef1e6cc23 WHIRLPOOL bf4e2157fd544f2aa0e74dc9742cf58977c7fa89fb23dda9f037d60a2fa2124f64e6f350bee0bc1e1a094075110f84d5ec9827bb5a4a5e1599b272502b1ee2ea -DIST gnome-photos-3.14.3.tar.xz 759244 SHA256 7cce615869f98ec038fb308ee6cec725e72a2c2cf67aaf44d4d01e2303d878b0 SHA512 595322d9f01c886c4184ce9c95c17f4c745e7faf148c4c1d051e76606c1067f4a27a20b34629d445ce1d7938d85813097b8a2e479e48563be9176210361f397b WHIRLPOOL 105ab02c84aaef8c5f80ffd5c5d42187da3d04ee83f43c8fdc15a8053679f44920755a8ced630933ab7032e85c987f48e3305363259e5076addd51274da04c05 DIST gnome-photos-3.16.2.tar.xz 762760 SHA256 9eb6a08a1d198f174f006b1c4e60a7db4f2e05cce7776e3f989470638cda2e20 SHA512 0c54789ac69541000d6fc67f3dc32af7b60041aaa7a580e38b91a2abc6d114216bd37573a185386dc6a8598c58844ed21a18af760aa59690c056c4da2b7736d6 WHIRLPOOL ac09949c35ab6266f15136a1dac35103fdb5f6f333710d110564af84906a095474cc218476c6eda08bd38f3d49526fd6f17412e58c202de576e24eafc07fb608 +DIST gnome-photos-3.16.3.tar.xz 762584 SHA256 fb5a0232083369b80c95b700b41e9a3425b5bedd389ee08fed690d3f0989e129 SHA512 cefc899d260638511e0c2ce794043264c762b0bb0559cafee456853adc2cc2682ab8f535ffdf089417cb3668f609d34357e76436c8a0ed1206b86e068fb5bf92 WHIRLPOOL 3fd43e619e098d5fff352bd185721af0759a36838b37beca05a63da35e6ee73c8a6d9bca3a2029a8d697496e2665cec432a4923a772dab71f29813f338c4c724 diff --git a/media-gfx/gnome-photos/gnome-photos-3.14.3.ebuild b/media-gfx/gnome-photos/gnome-photos-3.14.3.ebuild deleted file mode 100644 index 1fb282433ba3..000000000000 --- a/media-gfx/gnome-photos/gnome-photos-3.14.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Access, organize and share your photos on GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Photos" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - >=app-misc/tracker-1:= - >=dev-libs/glib-2.39.3:2 - dev-libs/libxml2 - gnome-base/gnome-desktop:3= - >=gnome-base/librsvg-2.26.0 - >=dev-libs/libgdata-0.15.2 - media-libs/babl - >=media-libs/gegl-0.2:0 - >=media-libs/grilo-0.2.6:0.2 - >=media-plugins/grilo-plugins-0.2.6:0.2[upnp-av] - >=media-libs/exempi-1.99.5 - media-libs/lcms:2 - >=media-libs/libexif-0.6.14 - >=net-libs/gnome-online-accounts-3.8 - >=net-libs/libgfbgraph-0.2.1:0.2 - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.13.2:3 -" -DEPEND="${RDEPEND} - dev-util/desktop-file-utils - >=dev-util/intltool-0.50.1 - virtual/pkgconfig -" - -# Requires dogtail -RESTRICT="test" diff --git a/media-gfx/gnome-photos/gnome-photos-3.14.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.16.3.ebuild index 02f877599d58..41d7a68e55f0 100644 --- a/media-gfx/gnome-photos/gnome-photos-3.14.2.ebuild +++ b/media-gfx/gnome-photos/gnome-photos-3.16.3.ebuild @@ -5,24 +5,24 @@ EAPI="5" GCONF_DEBUG="no" -inherit gnome2 +inherit gnome2 virtualx DESCRIPTION="Access, organize and share your photos on GNOME" HOMEPAGE="https://wiki.gnome.org/Apps/Photos" LICENSE="GPL-2+ LGPL-2+" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" +KEYWORDS="~amd64 ~x86" +IUSE="test" RDEPEND=" >=app-misc/tracker-1:= >=dev-libs/glib-2.39.3:2 gnome-base/gnome-desktop:3= >=gnome-base/librsvg-2.26.0 - >=dev-libs/libgdata-0.15.2 + >=dev-libs/libgdata-0.15.2:0= media-libs/babl - >=media-libs/gegl-0.2:0 + >=media-libs/gegl-0.3:0.3 >=media-libs/grilo-0.2.6:0.2 >=media-plugins/grilo-plugins-0.2.6:0.2[upnp-av] >=media-libs/exempi-1.99.5 @@ -30,19 +30,25 @@ RDEPEND=" >=media-libs/libexif-0.6.14 >=net-libs/gnome-online-accounts-3.8 >=net-libs/libgfbgraph-0.2.1:0.2 - x11-libs/cairo + >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.13.2:3 + >=x11-libs/gtk+-3.15.5:3 " DEPEND="${RDEPEND} dev-util/desktop-file-utils >=dev-util/intltool-0.50.1 + dev-util/itstool virtual/pkgconfig + test? ( dev-util/dogtail ) " - -# Requires dogtail -RESTRICT="test" +# eautoreconf +# app-text/yelp-tools src_configure() { - gnome2_src_configure ITSTOOL=$(type -P true) + gnome2_src_configure \ + $(use_enable test dogtail) +} + +src_test() { + Xemake check } diff --git a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild index 5d2ed4dcd6f0..753318c8ece6 100644 --- a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild +++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz" LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD" # Requires ksh diff --git a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild index 3306723392d3..e44a64b3a972 100644 --- a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild +++ b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild @@ -7,7 +7,7 @@ EAPI=5 WX_GTK_VER="3.0" PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -inherit base python-single-r1 wxwidgets versionator cmake-utils +inherit python-single-r1 wxwidgets versionator cmake-utils DESCRIPTION="GUI for the creation & processing of panoramic images" HOMEPAGE="http://hugin.sf.net" diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild index ae044a4ee1e9..061cae176d89 100644 --- a/media-gfx/hugin/hugin-9999.ebuild +++ b/media-gfx/hugin/hugin-9999.ebuild @@ -7,7 +7,7 @@ EAPI=5 WX_GTK_VER="3.0" PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -inherit base mercurial python-single-r1 wxwidgets versionator cmake-utils +inherit mercurial python-single-r1 wxwidgets versionator cmake-utils DESCRIPTION="GUI for the creation & processing of panoramic images" HOMEPAGE="http://hugin.sf.net" diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest index 4a4f82aa045f..5a47348f2dd1 100644 --- a/media-libs/gsound/Manifest +++ b/media-libs/gsound/Manifest @@ -1 +1,2 @@ DIST gsound-1.0.1.tar.xz 256804 SHA256 ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29 SHA512 0c4db73f5e9a620c53598b439cfa001482b86d58bcd77986b43d83bee42a905dadc1b7c44c78dfcd9b5c361b5275508c7320569358423bc7a82ee1a1f2995529 WHIRLPOOL a8355c9fc45b94aa46252f2beabe458d3f0cc6031993f6811d70940ec497dc08b264f021eb083d5ec1b888464abb0b41c517e5af3ef9d7bbbf586e141032c51a +DIST gsound-1.0.2.tar.xz 282068 SHA256 bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53 SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0 WHIRLPOOL 19ec0f6cf72bd312e8a13f1544322fe8655be6d2178524257ee92364e585ef98a9a332960be123544768cb23ad105e43d814ca99f4acf82382c4d50301f03449 diff --git a/media-libs/gsound/gsound-1.0.2.ebuild b/media-libs/gsound/gsound-1.0.2.ebuild new file mode 100644 index 000000000000..27738ac02c5d --- /dev/null +++ b/media-libs/gsound/gsound-1.0.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="no" +VALA_USE_DEPEND="vapigen" + +inherit gnome2 vala + +DESCRIPTION="Thin GObject wrapper around the libcanberra sound event library" +HOMEPAGE="https://wiki.gnome.org/Projects/GSound" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+introspection" + +# vala setup required for vapigen check +RDEPEND=" + >=dev-libs/glib-2.36:2 + media-libs/libcanberra + introspection? ( >=dev-libs/gobject-introspection-1.2.9:= ) +" +DEPEND="${RDEPEND} + $(vala_depend) + >=dev-util/gtk-doc-am-1.20 + virtual/pkgconfig +" + +src_prepare() { + vala_src_prepare + gnome2_src_prepare +} + +src_configure () { + gnome2_src_configure \ + --disable-static \ + $(use_enable introspection) +} diff --git a/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild b/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild index 361bc7c3f9ca..7a38cf91c8e6 100644 --- a/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild +++ b/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/agl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 x86 ~ppc-macos" IUSE="gif jpeg png static-libs tiff webp" diff --git a/media-libs/leptonica/leptonica-1.72-r2.ebuild b/media-libs/leptonica/leptonica-1.72-r2.ebuild index 6ffb07e435d5..5860c757a439 100644 --- a/media-libs/leptonica/leptonica-1.72-r2.ebuild +++ b/media-libs/leptonica/leptonica-1.72-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.leptonica.com/source/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib" # N.B. Tests need some features enabled: diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest index 5fad57fc6f7a..419d052a3ef6 100644 --- a/media-libs/libbluray/Manifest +++ b/media-libs/libbluray/Manifest @@ -1,3 +1,4 @@ DIST libbluray-0.6.2.tar.bz2 582227 SHA256 8ca410c8a4a1e2e8344014a67e2c908182cff3e04ece4e3b9ef196cf6bca5cd0 SHA512 20fbc5f34d7d025efaac1b6398c18b94b603a52bfb6dd0f021059d3bd4c3cf785e715698cd09e5d1c97a7ed11bbd146b29aa363650620eef1efca08053fc033a WHIRLPOOL 5e69fe4042d709677635fdc6569a2b14a34ff93ef672b3138bffde3a492ca5b38d960ed3bec814444b5dc4b4491f108ed50d64c2c8d956164dfedd0a43b8f506 DIST libbluray-0.8.1.tar.bz2 623402 SHA256 cdbec680c5bbc2251de6ccd109cf5f798ea51db6fcb938df39283be1799efb8f SHA512 6618e01a567f0dc5d21302fc771d4155589c81703028b76f6090a2d12ef1c7e9d08d9c79312a7c8b2ca0d6c63ce980195f0866509a4f8f05f64ed6650c7f78dc WHIRLPOOL 899ffe320997d245ed76987993d7d7e1697fcea61474ad7fb664c0c519d2c6578344986e22a9fe7d23d7c458525f6effff68718619334916fbe42cccb6c5c801 DIST libbluray-0.9.0.tar.bz2 624614 SHA256 84b61da9202fa724a76ac885af69df16a5583eb11d43e940dc201833bbfd694d SHA512 12db8b9ace0629158c1ce0e5447fc154609e9f78c55ff7d830c7ee38ccafa9824bfcdbe622d7e13e8c6d74205ae648ccf2e7c7b756692acc27e48fe9e2cc95ec WHIRLPOOL 7b8191bf0adcd1c612662a9bf66d2f94ba43bda1bd5a23425aee85b486aced4c0edf0f720a17361640f7982e5794bd531bfc9efa45e883495be4acd9ae42b8cc +DIST libbluray-0.9.1.tar.bz2 703068 SHA256 d9647fa55802907b33d85e9ffcc6d97e3133490f3721afd649d9b361c42f3940 SHA512 78a768d26454067f904e0c15717e81bbce624f8e13d1e8a8e84611a4fc29191860640b86633ad9611cc461d9ee84472d3388fc2429d302d87908e3900898c5a1 WHIRLPOOL 788f5714689cf08798149860a450a17b0b6abb717bfb6e0fce805c90592e01ffbb15da621c6ee2317dde88379619bb678a930ebb1c2234ac139b08fc7be0ab73 diff --git a/media-libs/libbluray/libbluray-0.9.1.ebuild b/media-libs/libbluray/libbluray-0.9.1.ebuild new file mode 100644 index 000000000000..805d248c84dc --- /dev/null +++ b/media-libs/libbluray/libbluray-0.9.1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal + +DESCRIPTION="Blu-ray playback libraries" +HOMEPAGE="http://www.videolan.org/developers/libbluray.html" +SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml" + +COMMON_DEPEND=" + xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] ) + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${COMMON_DEPEND} + aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] ) + bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jre-1.6 ) +" +DEPEND=" + ${COMMON_DEPEND} + java? ( + >=virtual/jdk-1.6 + dev-java/ant-core + ) + virtual/pkgconfig +" + +DOCS=( ChangeLog README.txt ) + +src_prepare() { + if use java ; then + export JDK_HOME="$(java-config -g JAVA_HOME)" + + # don't install a duplicate jar file + sed -i '/^jar_DATA/d' Makefile.am || die + + java-pkg-opt-2_src_prepare + fi + + eautoreconf +} + +multilib_src_configure() { + local myconf + if multilib_is_native_abi && use java; then + export JAVACFLAGS="$(java-pkg_javac-args)" + append-cflags "$(java-pkg_get-jni-cflags)" + myconf="--enable-bdjava" + else + myconf="--disable-bdjava" + fi + + ECONF_SOURCE="${S}" econf \ + --disable-optimizations \ + $(multilib_native_use_enable utils examples) \ + $(use_with fontconfig) \ + $(use_with truetype freetype) \ + $(use_enable static-libs static) \ + $(use_with xml libxml2) \ + ${myconf} +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use utils; then + dobin index_dump mobj_dump mpls_dump + cd .libs/ + dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump + if use java; then + dobin bdj_test + fi + fi + + if multilib_is_native_abi && use java; then + java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-${PV}.jar + doenvd "${FILESDIR}"/90${PN} + fi +} + +multilib_src_install_all() { + einstalldocs + prune_libtool_files +} diff --git a/media-libs/libpng/libpng-1.6.18.ebuild b/media-libs/libpng/libpng-1.6.18.ebuild index 9cebda830dc5..8818a93e8c5d 100644 --- a/media-libs/libpng/libpng-1.6.18.ebuild +++ b/media-libs/libpng/libpng-1.6.18.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz LICENSE="libpng" SLOT="0/16" -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 ~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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="apng neon static-libs" RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild index c5fbd7e4ee02..6d64bd1e306a 100644 --- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild +++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" # WARNING: # If you turn on the custom-cflags use flag in USE and something breaks, # you pick up the pieces. Be prepared for bug reports to be marked INVALID. diff --git a/media-libs/x265/x265-1.5.ebuild b/media-libs/x265/x265-1.5.ebuild index f185fa02182c..34048b728fc6 100644 --- a/media-libs/x265/x265-1.5.ebuild +++ b/media-libs/x265/x265-1.5.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" else SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2" - KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86" + KEYWORDS="amd64 arm hppa ~ppc ppc64 x86" fi DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest index 4d7676c133b9..3570bf716a36 100644 --- a/media-plugins/live/Manifest +++ b/media-plugins/live/Manifest @@ -3,3 +3,4 @@ DIST live.2012.09.13.tar.gz 560899 SHA256 d5667373aed8766c0a983a71b37c208976e93f DIST live.2013.02.11.tar.gz 570837 SHA256 2cd619e61b9293a094a2cbb8dd7a7505f8e74e6197b80989093425ac78a86d83 SHA512 c0f2efbf2af06d5e5f2bc58955ca37942022a439e3c48bec06a49b636e08d4d31855e884586448c698b0c90d35ef24f282570d0026c4454c9e58855ff36713be WHIRLPOOL 121fb4815c44db793a3c225faa5c16e68a8f975e45e8c4d492886aa82a57dd1571ad14076375767524cb848336b702cccc9ab17af79787ac489b6eb789fd9bd9 DIST live.2015.08.07.tar.gz 616595 SHA256 1a27410aea9723e9e0c60850c57b52a08eed32a4ecfa88942026d2b9c0ac3fdc SHA512 afcd5552c4696a6a3a8e95759a908e8166611ec563728649e5d428b77dba9fbdd1db882a65359498bc5763d71ef2ccc442ec6d36ad672fa6709ae1203eaf8a3c WHIRLPOOL 34c2c4c3fdac6a105ec0a23f09ffdb6900d36fc180694d7b74fb6312463c1fc733637d9f244ee40aee8935752d0da86423a5e584f3efb33fae07a6696cf2b26b DIST live.2015.10.12.tar.gz 627366 SHA256 4402a2a803ee31ab1a0a79c85ddee107c8c458295388ea091d9da80689e61c17 SHA512 a282b1f7d8170e8edf13b4d4e632fe26ad74e1efc28a9c4b568c2da28aa72d3a0a7029b3e045f744ba217320fd67182658581d96018969b81bdeffe78c1a89f5 WHIRLPOOL 17cfe5784cfe1227dd12e05112273bdcebea9078d2d699a37be6d172db085efd27860831f46b33f9a65b539b068f438edf0f5b5b2f81a5d3087fe8c17dbe8c52 +DIST live.2015.10.29.tar.gz 627327 SHA256 05bb03b58c9a758a735a2c5bb0b993c5e157d7a60b08df49cc29619d02fbc962 SHA512 03d10881e62b12676898e5cd889169d1d7de3640024198f8908c820375233535b9706bd309abbf26f7ad6e957338bf7371b1443f65b2d245d1b06345b5922e75 WHIRLPOOL 14998fe3da4854ab26063a88486e6e81e020c097f59c9a32e17e18184f085c92d8a85e52dbbca0a7fbf1643e657f54c0691e6ca6398ec33ba0e0a6337e733245 diff --git a/media-plugins/live/live-2015.10.29.ebuild b/media-plugins/live/live-2015.10.29.ebuild new file mode 100644 index 000000000000..a787b3130fd0 --- /dev/null +++ b/media-plugins/live/live-2015.10.29.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal + +DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming" +HOMEPAGE="http://www.live555.com/" +SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz + mirror://gentoo/${P/-/.}.tar.gz" + +LICENSE="LGPL-2.1" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="examples static-libs" +DOCS=( "live-shared/README" ) + +# Alexis Ballier <aballier@gentoo.org> +# Be careful, bump this everytime you bump the package and the ABI has changed. +# If you don't know, ask someone. +LIVE_ABI_VERSION=7 +SLOT="0/${LIVE_ABI_VERSION}" + +src_unpack() { + unpack ${A} + mkdir -p "${S}" + mv "${WORKDIR}/live" "${S}/" || die +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-recursive2.patch" + + if use static-libs ; then + cp -pPR live live-shared + mv live live-static + else + mv live live-shared + fi + + use static-libs && cp "${FILESDIR}/config.gentoo" live-static + cp "${FILESDIR}/config.gentoo-so-r1" live-shared + + case ${CHOST} in + *-solaris*) + use static-libs && { sed -i \ + -e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \ + -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \ + live-static/config.gentoo \ + || die ; } + sed -i \ + -e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \ + -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \ + live-shared/config.gentoo-so-r1 \ + || die + ;; + *-darwin*) + use static-libs && { sed -i \ + -e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \ + -e '/^LINK /s/$/ /' \ + -e '/^LIBRARY_LINK /s/$/ /' \ + -e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \ + live-static/config.gentoo \ + || die static ; } + sed -i \ + -e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \ + -e '/^LINK /s/$/ /' \ + -e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \ + -e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \ + -e '/^LIB_SUFFIX /s/so/dylib/' \ + live-shared/config.gentoo-so-r1 \ + || die shared + ;; + esac + multilib_copy_sources +} + +src_configure() { :; } + +multilib_src_compile() { + tc-export CC CXX LD + + if use static-libs ; then + cd "${BUILD_DIR}/live-static" + + einfo "Beginning static library build" + ./genMakefiles gentoo + emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries" + fi + + cd "${BUILD_DIR}/live-shared" + einfo "Beginning shared library build" + ./genMakefiles gentoo-so-r1 + local suffix=$(get_libname ${LIVE_ABI_VERSION}) + emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries" + + for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do + pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null + ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die + popd > /dev/null + done + + if multilib_is_native_abi; then + einfo "Beginning programs build" + for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do + cd "${BUILD_DIR}/live-shared/${i}" + emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs" + done + fi +} + +multilib_src_install() { + for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do + use static-libs && dolib.a live-static/${library}/lib${library}.a + dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION}) + dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname) + + insinto /usr/include/${library} + doins live-shared/${library}/include/*h + done + + if multilib_is_native_abi; then + # Should we really install these? + use examples && find live-shared/testProgs -type f -perm 755 -print0 | \ + xargs -0 dobin + + dobin live-shared/mediaServer/live555MediaServer + dobin live-shared/proxyServer/live555ProxyServer + fi +} diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild index f8fd650ad225..e0caa2bc6ca3 100644 --- a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild +++ b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86" +KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86" IUSE="clock curl outputs taglib unicode visualizer" RDEPEND=" diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 5ee483305dd5..20c0187489bd 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -2,3 +2,5 @@ DIST kodi-14.1-generated-addons.tar.xz 71072 SHA256 0666eae88a3214f7577544975524 DIST kodi-14.1.tar.gz 70832109 SHA256 a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 SHA512 05dccad279073fc804faf2f179ba370f612d53c823dd333fdd151e05de37eb8202cc981ba48afff695d475bafde9c8f05f562fe09883593a70299a2f098a9849 WHIRLPOOL 464ff2673c9e65466dff73d3c91b8754ee68d64b4a18ebb0b0c6e8efa2da1cc32ab22686530a8469a105bf7a089d8928db64c5c61d272462c13485006875b506 DIST kodi-15.1-generated-addons.tar.xz 73988 SHA256 97f0236542044a909d982cbf9a031f76395a59a1d4a79187c1102845579ed8f2 SHA512 559c188471c84503840b8b2010b73f15cf083367a1e1d0d5cfe7c144e36821a07c6fff1ff379ad8e8b254bc0cc2555c0a17ae998003adf86b051febde97bf2f1 WHIRLPOOL 01b76391d6aa7c624ad23329c962416cdf4662b96e99724bb566d7ed20b08b1525acd4f12671eef04ac10e5255d097f7c2452d2bfd87f7dfd3f4c1cd621fe2a6 DIST kodi-15.1.tar.gz 61477835 SHA256 72b2610d8fbff807128d74429f25bf6716ba880c27c2c5d9fad012ec7fc70705 SHA512 b597253aa51d3d446ecb85ffe163362b5e55717d6fee16eab81725b9cdf0a5a9e4a2291aa526b9e63fbb34ef206100df30c9368684e2ddedc49e35f140d604f0 WHIRLPOOL 3596c00f9d25193e1e84cdfbf7fe5a6e6bdcce37caa710b8dd2b0b7aaa043164410459009dc793991373886abed8755298ee8803edf7b90227509d0c3578b8b9 +DIST kodi-15.2-generated-addons.tar.xz 73912 SHA256 8c604be6188e03569209632dca96a9e333fa898e41651ac81f7fad2a45163610 SHA512 094ac1373a80d08371daad8fb1ee4422b8c16f77430fcd4a2b78ed0dc1883027086081e5788e07333c345121a20fda89b0bd5bcb2c8922b79573aca6e4726b9a WHIRLPOOL 560b8de1fa506ea1a73b5a0c539563649159dbb83b9996dc550e706037c5ff15dc657f382e55b2812797c1eee596b2b3b84a0061b6c74b2a5179a126a1841583 +DIST kodi-15.2.tar.gz 61484128 SHA256 dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 SHA512 870f67b83aaa96b1a4111f34824eb47c24616d067adf930f4456ca8f1ac57052c41aa73915304ea85b1d10390865b88d88c85e6cd425b42ec5a504908adf4b67 WHIRLPOOL 5d484ff8eb8b48de643bf6dbff0ca824d528143d2f6f78f124bae19a0f67db72271c865786520672ef716cedba4ad4ad11c59fe857c8b34ec9331724f09046c2 diff --git a/media-tv/kodi/kodi-15.2.ebuild b/media-tv/kodi/kodi-15.2.ebuild new file mode 100644 index 000000000000..bd1626871b46 --- /dev/null +++ b/media-tv/kodi/kodi-15.2.ebuild @@ -0,0 +1,284 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +# Does not work with py3 here +# It might work with py:2.5 but I didn't test that +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs + +CODENAME="Isengard" +case ${PV} in +9999) + EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" + inherit git-r3 + ;; +*|*_p*) + MY_PV=${PV/_p/_r} + MY_P="${PN}-${MY_PV}" + SRC_URI="http://mirrors.kodi.tv/releases/source/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz + https://github.com/xbmc/xbmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz + !java? ( http://mirrors.kodi.tv/releases/source/${MY_P}-generated-addons.tar.xz )" + KEYWORDS="~amd64 ~x86" + + S=${WORKDIR}/xbmc-${PV}-${CODENAME} + ;; +esac + +DESCRIPTION="Kodi is a free and open source media-player and entertainment hub" +HOMEPAGE="http://kodi.tv/ http://kodi.wiki/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X" +REQUIRED_USE=" + rsxs? ( X ) + udisks? ( dbus ) + upower? ( dbus ) +" + +COMMON_DEPEND="${PYTHON_DEPS} + app-arch/bzip2 + app-arch/unzip + app-arch/zip + app-i18n/enca + airplay? ( app-pda/libplist ) + dev-libs/boost + dev-libs/expat + dev-libs/fribidi + dev-libs/libcdio[-minimal] + cec? ( >=dev-libs/libcec-3.0 ) + dev-libs/libpcre[cxx] + dev-libs/libxml2 + dev-libs/libxslt + >=dev-libs/lzo-2.04 + dev-libs/tinyxml[stl] + dev-libs/yajl + dev-python/simplejson[${PYTHON_USEDEP}] + media-fonts/corefonts + media-fonts/roboto + alsa? ( media-libs/alsa-lib ) + media-libs/flac + media-libs/fontconfig + media-libs/freetype + media-libs/jasper + media-libs/jbigkit + >=media-libs/libass-0.9.7 + bluray? ( media-libs/libbluray ) + css? ( media-libs/libdvdcss ) + media-libs/libmad + media-libs/libmodplug + media-libs/libmpeg2 + media-libs/libogg + media-libs/libpng:0= + projectm? ( media-libs/libprojectm ) + media-libs/libsamplerate + joystick? ( media-libs/libsdl2 ) + >=media-libs/taglib-1.8 + media-libs/libvorbis + media-libs/tiff:0= + pulseaudio? ( media-sound/pulseaudio ) + media-sound/wavpack + >=media-video/ffmpeg-2.6:=[encode] + rtmp? ( media-video/rtmpdump ) + avahi? ( net-dns/avahi ) + nfs? ( net-fs/libnfs:= ) + webserver? ( net-libs/libmicrohttpd[messages] ) + sftp? ( net-libs/libssh[sftp] ) + net-misc/curl + samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) + bluetooth? ( net-wireless/bluez ) + dbus? ( sys-apps/dbus ) + caps? ( sys-libs/libcap ) + sys-libs/zlib + virtual/jpeg:0= + usb? ( virtual/libusb:1 ) + mysql? ( virtual/mysql ) + opengl? ( + virtual/glu + virtual/opengl + >=media-libs/glew-1.5.6 + ) + gles? ( + media-libs/mesa[gles2] + ) + vaapi? ( x11-libs/libva[opengl] ) + vdpau? ( + || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) + media-video/ffmpeg[vdpau] + ) + X? ( + x11-apps/xdpyinfo + x11-apps/mesa-progs + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + )" +RDEPEND="${COMMON_DEPEND} + !media-tv/xbmc + udisks? ( sys-fs/udisks:0 ) + upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + dev-lang/swig + dev-util/gperf + texturepacker? ( media-libs/giflib ) + X? ( x11-proto/xineramaproto ) + dev-util/cmake + x86? ( dev-lang/nasm ) + java? ( virtual/jre ) + test? ( dev-cpp/gtest )" +# Force java for latest git version to avoid having to hand maintain the +# generated addons package. #488118 +[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" + +CONFIG_CHECK="~IP_MULTICAST" +ERROR_IP_MULTICAST=" +In some cases Kodi needs to access multicast addresses. +Please consider enabling IP_MULTICAST under Networking options. +" + +pkg_setup() { + check_extra_config + python-single-r1_pkg_setup +} + +src_unpack() { + [[ ${PV} == "9999" ]] && git-r3_src_unpack || default +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617 + epatch "${FILESDIR}"/${PN}-15.1-texturepacker.patch + epatch_user #293109 + + # some dirs ship generated autotools, some dont + multijob_init + local d dirs=( + tools/depends/native/TexturePacker/src/configure + $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) + ) + for d in "${dirs[@]}" ; do + [[ -e ${d} ]] && continue + pushd ${d/%configure/.} >/dev/null || die + AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \ + multijob_child_init eautoreconf + popd >/dev/null + done + multijob_finish + elibtoolize + + if [[ ${PV} == "9999" ]] || use java ; then #558798 + tc-env_build emake -f codegenerator.mk + fi + + # Disable internal func checks as our USE/DEPEND + # stuff handles this just fine already #408395 + export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes + + # Fix the final version string showing as "exported" + # instead of the SVN revision number. + export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported} + + # avoid long delays when powerkit isn't running #348580 + sed -i \ + -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ + xbmc/linux/*.cpp || die + + # Tweak autotool timestamps to avoid regeneration + find . -type f -exec touch -r configure {} + +} + +src_configure() { + # Disable documentation generation + export ac_cv_path_LATEX=no + # Avoid help2man + export HELP2MAN=$(type -P help2man || echo true) + # No configure flage for this #403561 + export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) + # Requiring java is asine #434662 + [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) + + econf \ + --docdir=/usr/share/doc/${PF} \ + --disable-ccache \ + --disable-optimizations \ + --with-ffmpeg=shared \ + $(use_enable alsa) \ + $(use_enable airplay) \ + $(use_enable avahi) \ + $(use_enable bluray libbluray) \ + $(use_enable caps libcap) \ + $(use_enable cec libcec) \ + $(use_enable css dvdcss) \ + $(use_enable dbus) \ + $(use_enable debug) \ + $(use_enable fishbmc) \ + $(use_enable gles) \ + $(use_enable goom) \ + $(use_enable joystick) \ + $(use_enable midi mid) \ + $(use_enable mysql) \ + $(use_enable nfs) \ + $(use_enable opengl gl) \ + $(use_enable profile profiling) \ + $(use_enable projectm) \ + $(use_enable pulseaudio pulse) \ + $(use_enable rsxs) \ + $(use_enable rtmp) \ + $(use_enable samba) \ + $(use_enable sftp ssh) \ + $(use_enable spectrum) \ + $(use_enable usb libusb) \ + $(use_enable test gtest) \ + $(use_enable texturepacker) \ + $(use_enable upnp) \ + $(use_enable vaapi) \ + $(use_enable vdpau) \ + $(use_enable waveform) \ + $(use_enable webserver) \ + $(use_enable X x11) +} + +src_compile() { + emake V=1 +} + +src_install() { + default + rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* + + domenu tools/Linux/kodi.desktop + newicon media/icon48x48.png kodi.png + + # Remove optional addons (platform specific). + local disabled_addons=( + repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org + visualization.dxspectrum + visualization.vortex + ) + rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}" + + # Remove fonconfig settings that are used only on MacOSX. + # Can't be patched upstream because they just find all files and install + # them into same structure like they have in git. + rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc + + # Replace bundled fonts with system ones + # teletext.ttf: unknown + # bold-caps.ttf: unknown + # roboto: roboto-bold, roboto-regular + # arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514 + rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* + dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ + /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf + dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ + /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf + + python_domodule tools/EventClients/lib/python/xbmcclient.py + python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send +} diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index bf985284ef28..ae769d2b5c4b 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -74,19 +74,19 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/libmodplug media-libs/libmpeg2 media-libs/libogg - media-libs/libpng + media-libs/libpng:0= projectm? ( media-libs/libprojectm ) media-libs/libsamplerate joystick? ( media-libs/libsdl2 ) >=media-libs/taglib-1.8 media-libs/libvorbis - media-libs/tiff + media-libs/tiff:0= pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack >=media-video/ffmpeg-2.6:=[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) - nfs? ( net-fs/libnfs ) + nfs? ( net-fs/libnfs:= ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh[sftp] ) net-misc/curl @@ -95,8 +95,8 @@ COMMON_DEPEND="${PYTHON_DEPS} dbus? ( sys-apps/dbus ) caps? ( sys-libs/libcap ) sys-libs/zlib - virtual/jpeg - usb? ( virtual/libusb ) + virtual/jpeg:0= + usb? ( virtual/libusb:1 ) mysql? ( virtual/mysql ) opengl? ( virtual/glu diff --git a/media-tv/tvnamer/tvnamer-2.3.ebuild b/media-tv/tvnamer/tvnamer-2.3.ebuild index e2940840ada7..959e59311476 100644 --- a/media-tv/tvnamer/tvnamer-2.3.ebuild +++ b/media-tv/tvnamer/tvnamer-2.3.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT="python2_7" +PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com" diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 5529f41f07e4..9b201cd169ca 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -4,3 +4,4 @@ DIST mkvtoolnix-8.3.0.tar.xz 5863384 SHA256 87bd82222995d35c310a426ed43e0b27cbfe DIST mkvtoolnix-8.4.0.tar.xz 3234284 SHA256 f6a5506d14a0b16abb3765d6f78cded0267e01096926b30e8f72df9d30aaf878 SHA512 ab9ab49baf06a8ef713872a09c58fdb1560628dbe3b2b661d809972f56a36c751a390a78ae260624510963b92e177d090088030bb96f9ab9e96e1a372772d22f WHIRLPOOL 811a0466413bdba84959c5ae84d637aba4371018ee3deed70d65f24472c0bf6a714003574efb4e4dcdc3bfb1b3c48595a347ab0bcdd935a9b49e2f1ab4c36c58 DIST mkvtoolnix-8.5.0.tar.xz 3280556 SHA256 ec3f4566dbc324c3bda7314c70d87046136664d72888945f9fdb8d129e1e05a3 SHA512 18f1bac6ba46d3ec3235d4b8ec8fc9bd0b5993344205172f254d3ca8aa7afdb399d81d9e7d8b24fe004661c83757e82b4874865acaa231e7721b1d8382adfdd3 WHIRLPOOL 453a55adf80fca61be3b102c39ccd48aa057983e8e3d4aea563ffe67ad86ded6889f0e1926e600556d43c4fccacdc79facd6438b8dccb9591a6e86de2919e8b1 DIST mkvtoolnix-8.5.1.tar.xz 3288800 SHA256 db9ae151ef236afac190c0137d8d4df4e43c105dbd298e3913b5afae1fdd5b43 SHA512 cf2d254df0851f4450a59b187ec9c4d293c1128d062ab12d098bc77ea4c2213a2d5b78989ee170789aa2bac9c23a531ed7b87f6d7206f03ee73a0821c021fffa WHIRLPOOL 7a7858fd6f22c9bf812cb28528f7612a3fb7a7056889534e24a45fe1bc88e69c9c6220088cd45e66f2072150b876af7eeaa417b2f7f02dff19c1ea4d03853ba9 +DIST mkvtoolnix-8.5.2.tar.xz 3304356 SHA256 efaae6d5e3d0963e2f53ae9c45f151be28561a6c6a28fad46e6220baf9862bbc SHA512 14a2d3d20499ccc2cfd0b1cfbbaa66def6ba512df0624f3e79d317670c4c17bf6552b9e62daed225b369fbab2fad3ce98877ccb7583096cd61da4c91ffed54ef WHIRLPOOL 536bbf36ac76e46d0205f5b2db58d986065ba38acd513129e0604154130cdf8861f3d8a52cb341980161b302f2853199c031b9908665ff13d2bb7db193a56a66 diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild index bc8adc24775b..4d202519138f 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild @@ -3,7 +3,6 @@ # $Id$ EAPI=5 -WX_GTK_VER="3.0" inherit eutils multilib toolchain-funcs versionator multiprocessing autotools DESCRIPTION="Tools to create, alter, and inspect Matroska files" diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild new file mode 100644 index 000000000000..4d202519138f --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils multilib toolchain-funcs versionator multiprocessing autotools + +DESCRIPTION="Tools to create, alter, and inspect Matroska files" +HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix" +SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="curl debug pch test qt5" + +ruby_atom() { + local ruby_slot=${1/ruby/} + ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}" + echo "dev-lang/ruby:${ruby_slot}" +} + +# hacks to avoid using the ruby eclasses since this requires something similar +# to the python-any-r1 eclass for ruby which currently doesn't exist +RUBY_IMPLS=( ruby22 ruby21 ruby20 ) +RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do + echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)" + +RDEPEND=" + >=dev-libs/boost-1.46.0:= + >=dev-libs/libebml-1.3.3:= + dev-libs/pugixml + media-libs/flac + >=media-libs/libmatroska-1.4.4:= + media-libs/libogg + media-libs/libvorbis + sys-apps/file + sys-libs/zlib + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND} + || ( ${RUBY_BDEPS} ) + sys-devel/gettext + virtual/pkgconfig + test? ( dev-cpp/gtest ) +" + +pkg_pretend() { + # https://bugs.gentoo.org/419257 + local ver=4.6 + local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support." + if ! version_is_at_least ${ver} $(gcc-version); then + eerror ${msg} + die ${msg} + fi +} + +src_prepare() { + local ruby_impl + for ruby_impl in "${RUBY_IMPLS[@]}"; do + if has_version "$(ruby_atom ${ruby_impl})"; then + export RUBY=${ruby_impl} + break + fi + done + [[ -z ${RUBY} ]] && die "No available ruby implementations to build with" + + epatch_user + eautoreconf +} + +src_configure() { + local myconf + + if use qt5 ; then + # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600 + myconf+=( + --with-moc=/usr/$(get_libdir)/qt5/bin/moc + --with-uic=/usr/$(get_libdir)/qt5/bin/uic + --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc + ) + fi + + econf \ + $(use_enable debug) \ + $(use_enable qt5 qt) \ + $(use_with curl) \ + $(usex pch "" --disable-precompiled-headers) \ + "${myconf[@]}" \ + --disable-optimization \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-boost="${EPREFIX}"/usr \ + --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) +} + +src_compile() { + "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die +} + +src_test() { + "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die + "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die +} + +src_install() { + DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die + + dodoc AUTHORS ChangeLog README.md + doman doc/man/*.1 +} diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild index 466b1fb59e9f..1fc0ced23ec4 100644 --- a/media-video/vlc/vlc-2.2.1-r1.ebuild +++ b/media-video/vlc/vlc-2.2.1-r1.ebuild @@ -35,9 +35,9 @@ LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-8" # vlc - vlccore if [ "${PV%9999}" = "${PV}" ] ; then - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd" + KEYWORDS="~amd64 ~arm ~ppc ppc64 -sparc ~x86 ~x86-fbsd" else - KEYWORDS="" + KEYWORDS="ppc64" fi IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest index d2acafb1f9f9..a9e8035f09e4 100644 --- a/net-analyzer/metasploit/Manifest +++ b/net-analyzer/metasploit/Manifest @@ -1 +1,2 @@ DIST metasploit-4.11.4_p2015090201.tar.gz 35211994 SHA256 1254dbb3e8cf33c7a6c8c701a0be13f78bbd2234503e636f1afacf88676aeea2 SHA512 b96c9735ef579b5f98d1fd7176f91bb1710d263a19d3ff891877df8e341baa1749d5fdce9825a19d9ecbe162b72ebcd11336d4d7884e066f4e199baaff8b4085 WHIRLPOOL 875db5df25112736dd62ec1195080d2567a670cf3a770e787b70c364c6b30b43bf906f7ba35901ff367ce940b02af7b17ae135693a28ff5fca9fc05038132ae2 +DIST metasploit-4.11.5_p2015110401.tar.gz 35426390 SHA256 fd8ef85a1d935245892c618001d1f992d6be16baa449a61c358b64a306ec249c SHA512 57e6d09546b219023a2f0c5920f143cbda1736c274004e16533693bc25d4f3fc35458c0ddecc1d552e0db575a41a7c7dab5db0dd1fa14d48e8fd66dbf6c9a94c WHIRLPOOL 1c3e2683598f25ce89904c5d0e9e3cf85820a6f09a06ef6e62207cdd30fe48e793012391b44c82131bacf05fce62f0093704d193769ab86ea40b9577543980f1 diff --git a/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild new file mode 100644 index 000000000000..d7825c12ff17 --- /dev/null +++ b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401.ebuild @@ -0,0 +1,299 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +#never ever ever have more than one ruby in here +USE_RUBY="ruby21" +inherit eutils ruby-ng + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git" + EGIT_CHECKOUT_DIR="${WORKDIR}"/all + inherit git-r3 + KEYWORDS="" + SLOT="9999" +else + ##Tags https://github.com/rapid7/metasploit-framework/releases + ##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version + #SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz" + ##Snapshots + MY_PV=${PV/_p/-} + SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" + RUBY_S="${PN}-framework-${MY_PV}" + inherit versionator + SLOT="$(get_version_component_range 1).$(get_version_component_range 2)" +fi + +DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code" +HOMEPAGE="http://www.metasploit.org/" +LICENSE="BSD" +IUSE="development +java oracle +pcap test" + +#multiple known bugs with tests reported upstream and ignored +#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible) +RESTRICT="test" + +RUBY_COMMON_DEPEND="virtual/ruby-ssl + >=dev-ruby/activesupport-4.0.9:4.0 + >=dev-ruby/actionpack-4.0.9:4.0 + >=dev-ruby/activerecord-4.0.9:4.0 + dev-ruby/bcrypt-ruby + dev-ruby/builder:3 + dev-ruby/bundler + dev-ruby/filesize + =dev-ruby/jsobfu-0.2* + dev-ruby/json + dev-ruby/kissfft + dev-ruby/metasm:1.0.2 + dev-ruby/metasploit_data_models:1.2.9 + dev-ruby/meterpreter_bins:0.0.22 + dev-ruby/metasploit-payloads:1.0.15 + dev-ruby/metasploit-credential:1.0.1 + >=dev-ruby/metasploit-concern-1.0.0:1.0 + >=dev-ruby/metasploit-model-1.0.0:1.0 + dev-ruby/msgpack + dev-ruby/nokogiri + dev-ruby/recog:2.0.14 + =dev-ruby/rkelly-remix-0.0.6 + dev-ruby/sqlite3 + >=dev-ruby/pg-0.11 + dev-ruby/packetfu:1.1.11 + >=dev-ruby/rubyzip-1.1 + dev-ruby/rb-readline-r7 + dev-ruby/robots + java? ( dev-ruby/rjb ) + oracle? ( dev-ruby/ruby-oci8 ) + pcap? ( dev-ruby/pcaprub:* + dev-ruby/network_interface ) + development? ( dev-ruby/fivemat + dev-ruby/pry + dev-ruby/redcarpet + dev-ruby/yard + >=dev-ruby/rake-10.0.0 + >=dev-ruby/factory_girl-4.1.0 )" + #lorcon doesn't support ruby21 + #lorcon? ( net-wireless/lorcon[ruby] ) +ruby_add_bdepend "${RUBY_COMMON_DEPEND} + test? ( >=dev-ruby/factory_girl-4.1.0 + dev-ruby/fivemat + dev-ruby/database_cleaner + >=dev-ruby/rspec-2.12 + dev-ruby/shoulda-matchers + dev-ruby/timecop + >=dev-ruby/rake-10.0.0 )" +ruby_add_rdepend "${RUBY_COMMON_DEPEND}" + +COMMON_DEPEND="dev-db/postgresql[server] + >=app-crypt/johntheripper-1.7.9-r1[-minimal] + net-analyzer/nmap" +RDEPEND+=" ${COMMON_DEPEND} + >=app-eselect/eselect-metasploit-0.16" + +RESTRICT="strip" + +QA_PREBUILT=" + usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin + usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin + usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin + usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin + usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin + usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin + usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin + usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin + usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin + usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin + usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso + usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso + usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso + usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin + usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf + usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so + usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so + usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so + " + +pkg_setup() { + if use test; then + su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail + su postgres -c "createuser msf_test_user -d -S -R" + if [ $? -ne 0 ]; then + su postgres -c "dropuser msf_test_user" || die + su postgres -c "createuser msf_test_user -d -S -R" || die + fi + su postgres -c "createdb --owner=msf_test_user msf_test_database" || die + fi + ruby-ng_pkg_setup +} + +all_ruby_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-r3_src_unpack + else + default_src_unpack +# mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all +# rm -r msf3 + #msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb) + #msf_version=${msf_version#*=} + fi +} + +all_ruby_prepare() { + # add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs + #epatch "${FILESDIR}/agix_psexec_pull-2657.patch" + epatch_user + + #unbundle johntheripper, at least it now defaults to running the system version + rm -r data/john/run.* + rm -r data/john/src.tar.bz2 + #remove random "cpuinfo" binaries which a only needed to detect which bundled john to run + rm -r data/cpuinfo + + #remove random oudated collected garbage + rm -r external + + #remove unneeded ruby bundler versioning files + #Gemfile.lock contains the versions tested by the msf team but not the hard requirements + #we regen this file in each_ruby_prepare + rm Gemfile.lock + #The Gemfile contains real known deps + #add our dep on upstream rb-readline instead of bundled one + #and then they broke it... + #sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die + sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die + #remove the bundled readline + #https://github.com/rapid7/metasploit-framework/pull/3105 + #this PR was closed due to numerous changes to their local fork, almost entirely for non-linux + #but now we have to go back to bundled readline because otherwise it's broken + #rm lib/rbreadline.rb + #now we edit the Gemfile based on use flags + #even if we pass --without=blah bundler still calculates the deps and messes us up + if ! use pcap; then + sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die + fi + if ! use development; then + sed -i -e "/^group :development do/,/^end$/d" Gemfile || die + fi + if ! use test; then + sed -i -e "/^group :test/,/^end$/d" Gemfile || die + fi + if ! use test && ! use development; then + sed -i -e "/^group :development/,/^end$/d" Gemfile || die + fi + #We don't need simplecov + sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die + sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die + + #we need to edit the gemspec too, since it tries to call git instead of anything sane + #probably a better way to fix this... if I care at some point + sed -i -e "/^ spec.files/,/^ }/d" metasploit-framework.gemspec || die + + #let's bogart msfupdate + rm msfupdate + echo "#!/bin/sh" > msfupdate + echo "echo \"[*]\"" >> msfupdate + echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate + echo "echo \"[*]\"" >> msfupdate + echo "echo \"\"" >> msfupdate + if [[ ${PV} == "9999" ]] ; then + echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate + echo " smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate + echo "else" >> msfupdate + echo " echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate + echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate + echo "fi" >> msfupdate + else + echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate + echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate + echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate + fi + #this is set executable in src_install + + #install our database.yml file before tests are run + cp "${FILESDIR}"/database.yml config/ + +} + +each_ruby_prepare() { + MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die + MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die + + #force all metasploit executables to use desired ruby version + #https://dev.metasploit.com/redmine/issues/8357 + for file in $(ls -1 msf*) + do + #poorly adapted from python.eclass + sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed" + done +} + +each_ruby_test() { + #review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox + + #we bogart msfupdate so no point in trying to test it + rm spec/msfupdate_spec.rb || die + #we don't really want to be uploading to virustotal during the tests + rm spec/tools/virustotal_spec.rb || die + + # https://dev.metasploit.com/redmine/issues/8425 + BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die + BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die + + MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake || die + su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user" +} + +each_ruby_install() { + #Tests have already been run, we don't need this stuff + rm -r spec || die + rm -r test || die + rm Gemfile.lock || die + + #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple. + # should be as simple as copying everything into the target... + dodir /usr/$(get_libdir)/${PN}${SLOT} + cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed" + rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md + fowners -R root:0 / + +} + +all_ruby_install() { + # do not remove LICENSE, bug #238137 + dodir /usr/share/doc/${PF} + cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die + dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation + + fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate + + #tell revdep-rebuild to ignore binaries meant for the target + dodir /etc/revdep-rebuild + cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT} + #These dirs contain prebuilt binaries for running on the TARGET not the HOST + SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter" + SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits" + EOF +} + +pkg_postinst() { + elog "Before use you should run 'env-update' and '. /etc/profile'" + elog "otherwise you may be missing important environmental variables." + + elog "You need to prepare the database by running:" + elog "emerge --config postgresql" + elog "/etc/init.d/postgresql-<version> start" + elog "emerge --config =metasploit-${PV}" + + "${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT} + + einfo + elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary" +} + +pkg_config() { + einfo "If the following fails, it is likely because you forgot to start/config postgresql first" + su postgres -c "createuser msf_user -D -S -R" + su postgres -c "createdb --owner=msf_user msf_database" +} diff --git a/net-analyzer/wireshark/wireshark-1.12.8.ebuild b/net-analyzer/wireshark/wireshark-1.12.8.ebuild index eb60a9b4650b..14f4796d8be0 100644 --- a/net-analyzer/wireshark/wireshark-1.12.8.ebuild +++ b/net-analyzer/wireshark/wireshark-1.12.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE=" adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl zlib diff --git a/net-libs/axtls/axtls-1.5.3.ebuild b/net-libs/axtls/axtls-1.5.3.ebuild index ea6a5d6e8211..2f837469f671 100644 --- a/net-libs/axtls/axtls-1.5.3.ebuild +++ b/net-libs/axtls/axtls-1.5.3.ebuild @@ -41,7 +41,7 @@ S="${WORKDIR}/${PN}-code" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86" +KEYWORDS="~amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~x86" IUSE="httpd cgi-lua cgi-php static static-libs doc" diff --git a/net-libs/http-parser/http-parser-2.6.0.ebuild b/net-libs/http-parser/http-parser-2.6.0.ebuild index 186c88065131..7a5bcfe0dd05 100644 --- a/net-libs/http-parser/http-parser-2.6.0.ebuild +++ b/net-libs/http-parser/http-parser-2.6.0.ebuild @@ -40,6 +40,6 @@ multilib_src_test() { } multilib_src_install() { - emake DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" install + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install use static-libs && dolib.a libhttp_parser.a } diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest index fb15c994ef30..4bf7c8299898 100644 --- a/net-libs/libdmapsharing/Manifest +++ b/net-libs/libdmapsharing/Manifest @@ -1,2 +1,2 @@ -DIST libdmapsharing-2.9.30.tar.gz 745913 SHA256 6c3917aac7de23999094a5d1ee463cd1b07053a8fcd5c6137b4284447b707e40 SHA512 6c47f8882e14d5a753725884f4e98ee203e29a11cc5882e2beb4b4d1a495e20283be4d7801e45e4078d21ccc6b6601d8d95e262d229adc7b728f8bdbd949154e WHIRLPOOL 3e5b65e9388a438efabeb59bb9961ab997b37711f12fcad19c24b0d07fc1cfe7a81f00f7af7916b3d142072a3dab0cadfe50452e0b1cbd51b028ec2c0e413ab4 DIST libdmapsharing-2.9.31.tar.gz 746372 SHA256 9c933ee15c89bc4ea0c3455d341ceb66e9f7705c94c32d485bc4b162f4f55b29 SHA512 36e2771f546ff42e437b6e3f0bb2cd11d5e75a34479f07277aa5f044f074bd0a2d20ff45660ebc73956c2ce64b5bd0bd50288cc1c875dc98ee0b44ed93f17b38 WHIRLPOOL 0a8f7b09818947bdadaf87ea05d158ca5de2945e7eb077dff1ecd31a616c86203a0de4694e2b19d0a60a887e3113c566f50765a46514cdf7a93ec55fc9bf5b29 +DIST libdmapsharing-2.9.32.tar.gz 742229 SHA256 74b9ca2a3f04708ef5e6a87922cb42bad677b6f27fd0bc8ad53067ef6bbf0518 SHA512 fd152749055dd02fefa672f7da3efc85bffa7ddb10880886dff829fc8abfaecc79131366fdf31f5657c1b5e622c04f3dbfc750998ea56ffaf9af800210b17084 WHIRLPOOL f8fb493eb9181a18ef1d2dacd44920f8312db344df7aa1f842764ef95591d03fd511fab4e3c1c2e4966caa8738db9227031a458a892cec16c2158381701b8484 diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.30.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.32.ebuild index 1a1d37143a88..c0adbf81dd56 100644 --- a/net-libs/libdmapsharing/libdmapsharing-2.9.30.ebuild +++ b/net-libs/libdmapsharing/libdmapsharing-2.9.32.ebuild @@ -3,7 +3,9 @@ # $Id$ EAPI=5 -inherit eutils +GCONF_DEBUG="no" + +inherit gnome2 DESCRIPTION="A library that implements the DMAP family of protocols" HOMEPAGE="http://www.flyn.org/projects/libdmapsharing" @@ -11,7 +13,7 @@ SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="3.0/2" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="+introspection test" # Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled @@ -20,15 +22,12 @@ IUSE="+introspection test" RDEPEND=" >=dev-libs/glib-2.36:2 x11-libs/gdk-pixbuf:2 - - >=net-dns/avahi-0.6 + >=net-dns/avahi-0.6[dbus] >=net-libs/libsoup-2.32:2.4 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 - sys-libs/zlib - - introspection? ( >=dev-libs/gobject-introspection-1.30 ) + introspection? ( >=dev-libs/gobject-introspection-1.30:= ) " DEPEND="${RDEPEND} dev-util/gtk-doc-am @@ -40,18 +39,12 @@ src_prepare() { # Remove useless CFLAGS alteration in configure sed -e 's/CFLAGS -O2/CFLAGS/' \ -i configure.ac configure || die + gnome2_src_prepare } src_configure() { - econf \ - --disable-gtk-doc \ - --disable-maintainer-mode \ + gnome2_src_configure \ --with-mdns=avahi \ $(use_enable introspection) \ $(use_enable test tests) } - -src_install() { - default - prune_libtool_files -} diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 4083186c705a..1306a7c0569f 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -1,3 +1,5 @@ DIST node-v0.12.6.tar.gz 19750717 SHA256 7a3b5ac351973a9dee8edbf0684bc8d0dea44b231e42274ffb008141ffa19ad2 SHA512 a7f1c88d8df0f65d986e283b859466a34459f8ebdd3232f4906f5ebd53c1a019a553eadcc50bcb5fe8252441c567692b9ada36e8b158ed818971cd927bf1b29f WHIRLPOOL 3677bee6016647282e877f4676fc3731ca49d9b5ccda6d99f8fc3f16e56fcf30072adb494539b9714d0b3afb657457a16fecab682ab62fd501e789f008255380 DIST node-v0.12.7.tar.gz 20063992 SHA256 b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d SHA512 0c9cb7542530463e7703435c8d819949785c1c6497c6d98f9854ca615fe33a62f451833e856f0159b836a698b4dee5d165fa505bad5d474f664e1533090d8606 WHIRLPOOL 647391b8c49fda868c14bd4eb3089cac139f50e710ac6b141ea82e1013c4ff7d40cdb0e88d69604d06e3bd07775876c754211a2b099685cb7353ae5708812525 DIST node-v4.1.1.tar.xz 12818088 SHA256 f7ca9ceb0b7cc49b12f28a652c908a1f0ffbf34cec73ad0805fe717b14996bb9 SHA512 1b38df92f0349e3da6c50d90b74500bfdaac479d93ad68e5f8f49b3c865867df637a642086669ed5c0b6561cf02716ebddb53888bd1b82e6324bd42f70915680 WHIRLPOOL e6ab82b9f61c2ab3e43949a150e51d9505ef72833516bc60e6a929a3c403928ec6fe3ee2bb55cf6d73eea38defcae7abe2935a44ff27b80e0cd8709d4a55c629 +DIST node-v4.2.2.tar.xz 12791572 SHA256 b016c3d2f434f86d8d3da9ad90ffb2fd35b32223e9081e3d4f67b8de0370ce69 SHA512 fe6563ca641581afa4ba7fda1b25175eae474aeb196504cd82a6486bf9dfe6c753c554b31d9aa3b6453c509aa792615e897343de69a0b8bfd26759efaea2e1cb WHIRLPOOL 2c2927697370c17cc3178e8dfbfe5819f5a406f84b28da4813507033b14d20616fe610e161618a6aea1463ac499c2d5a559360b97f236005db60ae9879ea8167 +DIST node-v5.0.0.tar.xz 12863764 SHA256 cf4f261618e19517c8cbf2fdde00d0b5160e271760abee00f387b11a0b3ca834 SHA512 5b07af6b77a25924e3028257a511f035df943b854c694168e24c20f6aa735cde72546fc231d63a491367e16232ee9b6622d1f748624bf3e99e0d0468528e96c3 WHIRLPOOL 8958da059e0bc8e196d9b5f1b079f6d1927a3707b466fdc6e87ece676f981a7f22c4fa485bdb6de9879305cf2deb578d49840dee6d69d1cddba698e070b19923 diff --git a/net-libs/nodejs/nodejs-4.2.2.ebuild b/net-libs/nodejs/nodejs-4.2.2.ebuild new file mode 100644 index 000000000000..c47c0905fde4 --- /dev/null +++ b/net-libs/nodejs/nodejs-4.2.2.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs + +DESCRIPTION="Evented IO for V8 Javascript" +HOMEPAGE="http://nodejs.org/" +SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" + +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" +IUSE="debug icu +npm snapshot +ssl" + +RDEPEND="icu? ( >=dev-libs/icu-55:= ) + ${PYTHON_DEPS} + >=net-libs/http-parser-2.5:= + >=dev-libs/libuv-1.6.1:= + >=dev-libs/openssl-1.0.2d:0=[-bindist] + sys-libs/zlib +" +DEPEND="${RDEPEND} + !!net-libs/iojs" + +S="${WORKDIR}/node-v${PV}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] ; then + if ! test-flag-CXX -std=c++11 ; then + die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." + fi + fi +} + +src_prepare() { + tc-export CC CXX PKG_CONFIG + export V=1 # Verbose build + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # make sure we use python2.* while using gyp + sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die + sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die + + # less verbose install output (stating the same as portage, basically) + sed -i -e "/print/d" tools/install.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die + sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die + + # Avoid a test that I've only been able to reproduce from emerge. It doesnt + # seem sandbox related either (invoking it from a sandbox works fine). + # The issue is that no stdin handle is openened when asked for one. + # It doesn't really belong upstream , so it'll just be removed until someone + # with more gentoo-knowledge than me (jbergstroem) figures it out. + rm test/parallel/test-stdout-close-unref.js || die + # AssertionError: 1 == 2 (on line 97) + rm test/parallel/test-cluster-disconnect.js || die + # AssertionError: Client never errored + rm test/parallel/test-tls-hello-parser-failure.js || die + # --- TIMEOUT --- + rm test/parallel/test-child-process-fork-net.js \ + test/parallel/test-child-process-fork-net2.js \ + test/parallel/test-child-process-recv-handle.js \ + test/parallel/test-cluster-dgram-1.js \ + test/parallel/test-cluster-send-deadlock.js \ + test/parallel/test-cluster-shared-handle-bind-error.js \ + test/parallel/test-dgram-exclusive-implicit-bind.js \ + test/parallel/test-tls-ticket-cluster.js || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + epatch_user +} + +src_configure() { + local myarch="" + local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib ) + use npm || myconf+=( --without-npm ) + use icu && myconf+=( --with-intl=system-icu ) + use snapshot && myconf+=( --with-snapshot ) + use ssl || myconf+=( --without-ssl ) + use debug && myconf+=( --debug ) + + case ${ABI} in + x86) myarch="ia32";; + amd64) myarch="x64";; + x32) myarch="x32";; + arm) myarch="arm";; + arm64) myarch="arm64";; + *) die "Unrecognized ARCH ${ARCH}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${PYTHON}" configure \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + --without-dtrace \ + "${myconf[@]}" || die +} + +src_compile() { + emake -C out mksnapshot + pax-mark m "out/${BUILDTYPE}/mksnapshot" + emake -C out +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + emake install DESTDIR="${ED}" PREFIX=/usr + if use npm; then + dodoc -r "${LIBDIR}"/node_modules/npm/html + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die + find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die + fi + + # set up a symlink structure that npm expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + pax-mark -m "${ED}"/usr/bin/node +} + +src_test() { + out/${BUILDTYPE}/cctest || die + declare -xl TESTTYPE="${BUILDTYPE}" + "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die +} + +pkg_postinst() { + einfo "When using node-gyp to install native modules, you can avoid" + einfo "having to download the full tarball by doing the following:" + einfo "" + einfo "node-gyp --nodedir /usr/include/node <command>" +} diff --git a/net-libs/nodejs/nodejs-5.0.0.ebuild b/net-libs/nodejs/nodejs-5.0.0.ebuild new file mode 100644 index 000000000000..c47c0905fde4 --- /dev/null +++ b/net-libs/nodejs/nodejs-5.0.0.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs + +DESCRIPTION="Evented IO for V8 Javascript" +HOMEPAGE="http://nodejs.org/" +SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" + +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" +IUSE="debug icu +npm snapshot +ssl" + +RDEPEND="icu? ( >=dev-libs/icu-55:= ) + ${PYTHON_DEPS} + >=net-libs/http-parser-2.5:= + >=dev-libs/libuv-1.6.1:= + >=dev-libs/openssl-1.0.2d:0=[-bindist] + sys-libs/zlib +" +DEPEND="${RDEPEND} + !!net-libs/iojs" + +S="${WORKDIR}/node-v${PV}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] ; then + if ! test-flag-CXX -std=c++11 ; then + die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." + fi + fi +} + +src_prepare() { + tc-export CC CXX PKG_CONFIG + export V=1 # Verbose build + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # make sure we use python2.* while using gyp + sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die + sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die + + # less verbose install output (stating the same as portage, basically) + sed -i -e "/print/d" tools/install.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die + sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die + + # Avoid a test that I've only been able to reproduce from emerge. It doesnt + # seem sandbox related either (invoking it from a sandbox works fine). + # The issue is that no stdin handle is openened when asked for one. + # It doesn't really belong upstream , so it'll just be removed until someone + # with more gentoo-knowledge than me (jbergstroem) figures it out. + rm test/parallel/test-stdout-close-unref.js || die + # AssertionError: 1 == 2 (on line 97) + rm test/parallel/test-cluster-disconnect.js || die + # AssertionError: Client never errored + rm test/parallel/test-tls-hello-parser-failure.js || die + # --- TIMEOUT --- + rm test/parallel/test-child-process-fork-net.js \ + test/parallel/test-child-process-fork-net2.js \ + test/parallel/test-child-process-recv-handle.js \ + test/parallel/test-cluster-dgram-1.js \ + test/parallel/test-cluster-send-deadlock.js \ + test/parallel/test-cluster-shared-handle-bind-error.js \ + test/parallel/test-dgram-exclusive-implicit-bind.js \ + test/parallel/test-tls-ticket-cluster.js || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + epatch_user +} + +src_configure() { + local myarch="" + local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib ) + use npm || myconf+=( --without-npm ) + use icu && myconf+=( --with-intl=system-icu ) + use snapshot && myconf+=( --with-snapshot ) + use ssl || myconf+=( --without-ssl ) + use debug && myconf+=( --debug ) + + case ${ABI} in + x86) myarch="ia32";; + amd64) myarch="x64";; + x32) myarch="x32";; + arm) myarch="arm";; + arm64) myarch="arm64";; + *) die "Unrecognized ARCH ${ARCH}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${PYTHON}" configure \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + --without-dtrace \ + "${myconf[@]}" || die +} + +src_compile() { + emake -C out mksnapshot + pax-mark m "out/${BUILDTYPE}/mksnapshot" + emake -C out +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + emake install DESTDIR="${ED}" PREFIX=/usr + if use npm; then + dodoc -r "${LIBDIR}"/node_modules/npm/html + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die + find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die + fi + + # set up a symlink structure that npm expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + pax-mark -m "${ED}"/usr/bin/node +} + +src_test() { + out/${BUILDTYPE}/cctest || die + declare -xl TESTTYPE="${BUILDTYPE}" + "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die +} + +pkg_postinst() { + einfo "When using node-gyp to install native modules, you can avoid" + einfo "having to download the full tarball by doing the following:" + einfo "" + einfo "node-gyp --nodedir /usr/include/node <command>" +} diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch new file mode 100644 index 000000000000..cafceb5ab35e --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch @@ -0,0 +1,22 @@ +--- ./Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300 ++++ ./Source/JavaScriptCore/CMakeLists.txt 2015-10-29 17:47:10.535712494 +0300 +@@ -1146,6 +1146,7 @@ + list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj) + endif () + elseif (WTF_CPU_ARM64) ++elseif (WTF_CPU_ALPHA) + elseif (WTF_CPU_HPPA) + elseif (WTF_CPU_IA64) + elseif (WTF_CPU_PPC) + elseif (WTF_CPU_PPC64) +--- CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300 ++++ CMakeLists.txt 2015-10-29 01:23:37.416886279 +0300 +@@ -82,6 +82,8 @@ + set(WTF_CPU_ARM 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(WTF_CPU_ARM64 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha") ++ set(WTF_CPU_ALPHA 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") + set(WTF_CPU_MIPS 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4") diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch new file mode 100644 index 000000000000..6c88c49d8b9e --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -98,6 +98,8 @@ + set(WTF_CPU_PPC64LE 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*") + set(WTF_CPU_HPPA 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ia64") ++ set(WTF_CPU_IA64 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390") + set(WTF_CPU_S390 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1147,6 +1147,7 @@ + endif () + elseif (WTF_CPU_ARM64) + elseif (WTF_CPU_HPPA) ++elseif (WTF_CPU_IA64) + elseif (WTF_CPU_PPC) + elseif (WTF_CPU_PPC64) + elseif (WTF_CPU_PPC64LE) diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild index bdd69c138218..94f032ab354e 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild @@ -135,11 +135,11 @@ pkg_setup() { } src_prepare() { - # Debian patches to fix support for some arches - # https://bugs.webkit.org/show_bug.cgi?id=129540 - epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch - # https://bugs.webkit.org/show_bug.cgi?id=129542 - epatch "${FILESDIR}"/${PN}-2.8.1-ia64-malloc.patch + # https://bugs.gentoo.org/show_bug.cgi?id=555504 + epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch + + # https://bugs.gentoo.org/show_bug.cgi?id=564352 + epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch # https://bugs.webkit.org/show_bug.cgi?id=148379 epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch @@ -158,6 +158,9 @@ src_configure() { # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 use alpha && append-ldflags "-Wl,--no-relax" + # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 + use ia64 && append-ldflags "-Wl,--no-as-needed" + # Sigbuses on SPARC with mcpu and co., bug #??? use sparc && filter-flags "-mvis" diff --git a/net-misc/elliptics-eblob/elliptics-eblob-0.22.16.ebuild b/net-misc/elliptics-eblob/elliptics-eblob-0.22.16.ebuild index cc4ae62311f3..74114527592e 100644 --- a/net-misc/elliptics-eblob/elliptics-eblob-0.22.16.ebuild +++ b/net-misc/elliptics-eblob/elliptics-eblob-0.22.16.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT="python2_7" +PYTHON_COMPAT=( python2_7 ) inherit eutils python-single-r1 flag-o-matic cmake-utils diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index 458c1211c4d9..6171ec45ec00 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1,6 +1,3 @@ -DIST ModemManager-1.4.0.tar.xz 1313396 SHA256 efe12c30d4660a4694dec2a1ea68ea176f4dc3cb4b9e843929115943dc189ca0 SHA512 4c6ab92f6151c190585f83cbd5a50f283f1bea9a98207d81a9cc577a26ff9ff32b0b1efade0a1f44dfc5f77d96da999aede1626a1ddb2a97a9741884408685fb WHIRLPOOL 1c75bc86dea1fa9d5a7510cbc5cfdc2ea1a23e28a9d42ed30a7124f4f13535703eec3b240b9de2398562af11cfa3fa55c24cc5a5a55f4b1817e4a58217c98c22 DIST ModemManager-1.4.10.tar.xz 1408036 SHA256 107ba0b4d0749aebb0347691a39f60891cc6004aeca8b2128d69c50557049a63 SHA512 b76d0cf5ece5c711fec183f5d2297ea5c35e61bee3f0e1165cf5ff5b52ee6d8d749266cc9232a214cc9141fb736973055959593f03a18e0389d41de01a4857d3 WHIRLPOOL d44afd0e61f4ec94f4ecd53093a613fade19eac204acb1c7e2ab17ee98ade6e201f8b3aa96642ed607c9727cdea2d46c637b5b6e568b565035669ef89fd253a8 -DIST ModemManager-1.4.2.tar.xz 1350604 SHA256 07d332fbe6f45f788f740810951e04042aaf023bd5ecf8ef0b3a06e37703585d SHA512 8be9387f78de5213ff77374ee2cba67c08301b29b2cd957c8bab86446d1227759833b9ecafb3caef590701f6422bae587db848391cf15c1dd16b5421e976a4c6 WHIRLPOOL 6a554a80ce53d1eb41f993ee5113a8f5606f20dde5c415f4c3375510bd5acb655f84ff5a17a5d678ba615810bcbc1366005b3d72dbab2b087a50f5e5352641a2 -DIST ModemManager-1.4.4.tar.xz 1395696 SHA256 1bf88861259772dc81e864e2faccfff0590d41676451a128c5f4e73550dd14d8 SHA512 66cc177b1fa0fef9da4c61a0019278fdcf00580b48ec4b0a01202b6132f887d64858871dcdc5965f8833eb85e49fe50f9406398961569d8e9a5d15003d1205cf WHIRLPOOL a9e960024c46bd3eeb39efaedd53a9401ebe88b3f158afc66908d0bdf4175b1ea31dadd229f9c9251167267e970ae3df177df26ab8075a0baf38d5794116d7ff -DIST ModemManager-1.4.6.tar.xz 1396764 SHA256 0cedabf46310f8c56630b116944f54ee64369c76c2f35f5f460ca19a8bb5a5cd SHA512 fb74961df2e3e1604de58838da6e8dd7cf80fee97dbfd71eb7f2df60cc319bf38df8c5706a5933856c500b014d3156066e608bb0820c967ddbd964bd9fc2fdec WHIRLPOOL 4f63ac160a4d4acddd2064a58204e6ba410543aefc936ffb753fbb15e004d089cf874ee2390df174638ae15f26f4cf7c7e720de793e69f0cd0b6a923558b0af1 +DIST ModemManager-1.4.12.tar.xz 1407168 SHA256 7ef5035375a953b285a742591df0a65fd442f4641ce4d8f4392a41d6d6bc70b3 SHA512 f3d8bfdfc5df14c866a4fd2c0ef125c818fc5b2464d166dee2ad2b8df3d9ee22667f521313e664b2a6d8e7f72a965929cb815ad4f7a6a1ecbd17957bfde720ee WHIRLPOOL d8b2cbeb08fbdf5cdee6b7a44b49b415ee31c5e78651e7e6c12a5c8f0aa9d828ab4ce0db40bc4b87592944a221ed815bea9243debb8b6647a687a85e93362626 DIST ModemManager-1.4.8.tar.xz 1397444 SHA256 d951eaffbe513bcde54f90602c6c423a49593f656d6485ba95f6fcb4bc1e8003 SHA512 6dfbdbf579d1b7dd624836877d6556cdb15eec73c60c329d1d6200563495f8943d90f55e2d4e98b7741c05a19f11ac2de61dcabb4aec16a2ae61db453eafc3b5 WHIRLPOOL 47ff7cc8a1f89996110eb0932274fdeceb940f63b2991cf7a1b96541b30e8c39e52cf7f30b4947c8670ca787e10698093cf4e0401aed3ec2564228e9cfdcb8c8 diff --git a/net-misc/modemmanager/modemmanager-1.4.0.ebuild b/net-misc/modemmanager/modemmanager-1.4.0.ebuild deleted file mode 100644 index b5cda34e77db..000000000000 --- a/net-misc/modemmanager/modemmanager-1.4.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_MIN_API_VERSION="0.18" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 user readme.gentoo udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/" -SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" -IUSE="+introspection mbim policykit +qmi qmi-newest vala" -REQUIRED_USE=" - qmi-newest? ( qmi ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) - mbim? ( >=net-libs/libmbim-1.10 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.6.0:= ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in, - You should install sys-apps/usb_modeswitch which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-more-warnings \ - --with-udev-base-dir="$(get_udevdir)" \ - --disable-static \ - --with-dist-version=${PVR} \ - $(use_enable introspection) \ - $(use_with mbim) \ - $(use_with policykit polkit) \ - $(use_with qmi) \ - $(use_with qmi-newest newest-qmi-commands) \ - $(use_enable vala) -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - use policykit && enewgroup plugdev - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.4.6.ebuild b/net-misc/modemmanager/modemmanager-1.4.12.ebuild index f4441121c4fe..643ff4f18770 100644 --- a/net-misc/modemmanager/modemmanager-1.4.6.ebuild +++ b/net-misc/modemmanager/modemmanager-1.4.12.ebuild @@ -25,7 +25,7 @@ REQUIRED_USE=" RDEPEND=" >=dev-libs/glib-2.32:2 virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.10 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.12.4:= ) diff --git a/net-misc/modemmanager/modemmanager-1.4.2.ebuild b/net-misc/modemmanager/modemmanager-1.4.2.ebuild deleted file mode 100644 index 29071b197353..000000000000 --- a/net-misc/modemmanager/modemmanager-1.4.2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 user readme.gentoo udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/" -SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86" -IUSE="+introspection mbim policykit +qmi qmi-newest vala" -REQUIRED_USE=" - qmi-newest? ( qmi ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) - mbim? ( >=net-libs/libmbim-1.10 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.6.0:= ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in, - You should install sys-apps/usb_modeswitch which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-more-warnings \ - --with-udev-base-dir="$(get_udevdir)" \ - --disable-static \ - --with-dist-version=${PVR} \ - $(use_enable introspection) \ - $(use_with mbim) \ - $(use_with policykit polkit) \ - $(use_with qmi) \ - $(use_with qmi-newest newest-qmi-commands) \ - $(use_enable vala) -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - use policykit && enewgroup plugdev - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.4.4.ebuild b/net-misc/modemmanager/modemmanager-1.4.4.ebuild deleted file mode 100644 index f4441121c4fe..000000000000 --- a/net-misc/modemmanager/modemmanager-1.4.4.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 user readme.gentoo udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/" -SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="+introspection mbim policykit +qmi qmi-newest vala" -REQUIRED_USE=" - qmi-newest? ( qmi ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) - mbim? ( >=net-libs/libmbim-1.10 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.12.4:= ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in, - You should install sys-apps/usb_modeswitch which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-more-warnings \ - --with-udev-base-dir="$(get_udevdir)" \ - --disable-static \ - --with-dist-version=${PVR} \ - $(use_enable introspection) \ - $(use_with mbim) \ - $(use_with policykit polkit) \ - $(use_with qmi) \ - $(use_with qmi-newest newest-qmi-commands) \ - $(use_enable vala) -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - use policykit && enewgroup plugdev - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - readme.gentoo_print_elog -} diff --git a/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild b/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild index b7c0452a30fa..ffab1f8fddb4 100644 --- a/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild +++ b/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="selinux" DEPEND="!<=net-misc/ntp-4.2.0-r2 diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest index ce426f9d4657..8022a7ca7b89 100644 --- a/net-misc/putty/Manifest +++ b/net-misc/putty/Manifest @@ -1,2 +1,3 @@ DIST putty-0.65.tar.gz 1937861 SHA256 d543c1fd4944ea51d46d4abf31bfb8cde9bd1c65cb36dc6b83e51ce875660ca0 SHA512 cfb3e5437a920aa11bccedf1bd43a538a51ec3777a6d1dba9e9714c3b3699eaf1f4eb027a8f5fd6425f9909564a28b607f465b1f2b2e1250059b04b9a9d40569 WHIRLPOOL 15eff58a0cec37516daf67cef56772602f5bcbcb39ba09d3d8fdba31fadb77734c404a9d85e674e17c17e53db8c0deaad906b56b3bce302ec08adc9a44850c2b +DIST putty-0.66.tar.gz 1948323 SHA256 fe7312f66c54865868b362f4b79bd1fbe7ce9e8b1fd504b04034182db1f32993 SHA512 796fdb104fbdcad22d93274ea7c3599a34a94b35c849eafd1398f9a71721fbf2b6e4cec4abb64bb7fffe8ac45faefd8995339547fdc9b0beca5d7a76e0cb6bd3 WHIRLPOOL 61a17937f7d8e7dbb5c18b98109b3da6c5309ba701549c052dca0a7fa6cd63386a26743f2c40458503f123007a42cc08e502d183efd27f9840fc452edf05bae6 DIST putty-icons.tar.bz2 4878 SHA256 960b189069dbfb20a1f49e378ab88bed716c6457593815e414d51ad7a3fa93a7 SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 WHIRLPOOL ec96fe682582bfa58ce73c3e5cb7bb61d2363b7a5e9d3259dfd11cd6396512b5b9ed954f6a431baab36b1f17963714b30c239cdf4c08191d27b5abb858f54a57 diff --git a/net-misc/putty/putty-0.66.ebuild b/net-misc/putty/putty-0.66.ebuild new file mode 100644 index 000000000000..3562b7b1ffe7 --- /dev/null +++ b/net-misc/putty/putty-0.66.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils gnome2-utils toolchain-funcs + +DESCRIPTION="A Free Telnet/SSH Client" +HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/" +LICENSE="MIT" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ppc64 ~sparc ~x86" +IUSE="doc +gtk ipv6 kerberos" +SRC_URI=" + https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2 + http://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz +" + +RDEPEND=" + !net-misc/pssh + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/pango + ) + kerberos? ( virtual/krb5 ) +" +DEPEND=" + ${RDEPEND} + dev-lang/perl + virtual/pkgconfig +" + +src_prepare() { + sed -i \ + -e '/AM_PATH_GTK(/d' \ + -e 's|-Werror||g' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + cd "${S}"/unix || die + econf \ + $(use_with kerberos gssapi) \ + $(use_with gtk) +} + +src_compile() { + cd "${S}"/unix || die + emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6) +} + +src_install() { + dodoc doc/puttydoc.txt + + if use doc; then + dohtml doc/*.html + fi + + cd "${S}"/unix || die + default + + if use gtk ; then + for i in 16 22 24 32 48 64 128 256; do + newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png + done + + # install desktop file provided by Gustav Schaffter in #49577 + make_desktop_entry ${PN} PuTTY ${PN} Network + fi +} + +pkg_preinst() { + use gtk && gnome2_icon_savelist +} + +pkg_postinst() { + use gtk && gnome2_icon_cache_update +} + +pkg_postrm() { + use gtk && gnome2_icon_cache_update +} diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 5768e4c384c4..6ead2ef471ce 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -1,4 +1,4 @@ DIST stunnel-5.20.tar.gz 625091 SHA256 4a36a3729a7287d9d82c4b38bf72c4d3496346cb969b86129c5deac22b20292b SHA512 59262aacf866cac25bac707b94c5a6185aa868b5fdfab38a9ef03a00b80f106d92e2872c0b0fecbc5d13adb7bdea7f922768fb78f38355dbf67eb34a148441e4 WHIRLPOOL fc890dff4ddeb00df9e8ea84fae8f0f23609d1356c91d4cdeade55f164bad322a8a2df72955b710e46e1f74a33bbc7f5c8d734efc190d0835056926d7c902b26 DIST stunnel-5.23.tar.gz 630943 SHA256 0fc4a702afd2e857bae8ad1f39c51546eb282c3d0ff4f4d55d62aece7328ddea SHA512 f312b5feff78548a7d1e7785068f0a0e3dd3785541f09d5850f9f5c5ee6bdf63b30761d68c3ba17465e87b048acd47e613aab139aab540873a38594f68669cb9 WHIRLPOOL dd32db35f2b09c3414471dd45d74369156a909429cf2becf34e08854d838d8c3c3979fb0b7e9e524a2e01abe7740ea0ac320985bb6dd813081296168ed7f1819 DIST stunnel-5.24.tar.gz 631730 SHA256 ab2e5a1034d422951ddad21b572eb7fa8efb4c4ce04bc86536c6845f3d02b07e SHA512 d9a1ef9cdd3ffafc2a3d1b3383bcf3dfc1a52cdd5a0bcfd64f50addf78a0fd0ce0def6b32ed801f8dfcabbecd64284454b1c90a18435b5d603ecba594d840340 WHIRLPOOL b625adbc9299c04308733bb5ee732350084b603128734214ec3079f58c02b58d08bfc53bf604468cd83cc5dc1bf5d968a4d5139cd98d7b2219303fdd3d6eae64 -DIST stunnel-5.25.tar.gz 635456 SHA256 1fb2209f1e006cc01813e1688599c4d0fb0adde4434c31ab95745b1db97484b7 SHA512 85fc9ab6da4d8a0dd10e1d4f459194a6da3e1245588b7bf4a49855370006da3a43b954f47ddcee542cdefd8da0089940f1abbb88d0c5868be0c5b82d3cb203f8 WHIRLPOOL 852ee95706d4e2ce98173d17b873207c3febb7a1cfddf29328b6934a0058999b588a05d0c71cab7e0fa800755e538ed0c8e59f8642b57fadcc4130a88cd8c18d +DIST stunnel-5.26.tar.gz 635710 SHA256 2c90d469011eed8dc94f003013e3c055de6fdb687ef1e71fa004281d7f7c2726 SHA512 8ac0ed96618855e1361cd0956dbd5b89e08ce7808751c0b3d1c3e74b0bbfb567e1da8ac058544a15ab431598e916214b2c8d411b2c9d2456c9c850eb4935854e WHIRLPOOL 5e278f74c09c270e2de8b8c7fecac07dc9c48c6a147d925bf6d1c29eb7058c58adf58ec9ecf04627f00a826d69cf9cc59ccd41b6d74fb69bb254a5ca567e4fb1 diff --git a/net-misc/stunnel/stunnel-5.25.ebuild b/net-misc/stunnel/stunnel-5.26.ebuild index d75157cf5747..d75157cf5747 100644 --- a/net-misc/stunnel/stunnel-5.25.ebuild +++ b/net-misc/stunnel/stunnel-5.26.ebuild diff --git a/net-p2p/amule/amule-2.3.1-r1.ebuild b/net-p2p/amule/amule-2.3.1-r1.ebuild new file mode 100644 index 000000000000..99b75d044441 --- /dev/null +++ b/net-p2p/amule/amule-2.3.1-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER="3.0" + +inherit eutils flag-o-matic wxwidgets user + +MY_P=${PN/m/M}-${PV} +S="${WORKDIR}"/${MY_P} + +DESCRIPTION="aMule, the all-platform eMule p2p client" +HOMEPAGE="http://www.amule.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="daemon debug geoip nls remote stats unicode upnp +X" + +RDEPEND=" + >=dev-libs/crypto++-5 + >=sys-libs/zlib-1.2.1 + stats? ( >=media-libs/gd-2.0.26[jpeg] ) + geoip? ( dev-libs/geoip ) + upnp? ( >=net-libs/libupnp-1.6.6 ) + remote? ( >=media-libs/libpng-1.2.0:0= + unicode? ( >=media-libs/gd-2.0.26 ) ) + X? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) + !X? ( x11-libs/wxGTK:${WX_GTK_VER} ) + !net-p2p/imule +" +DEPEND="${RDEPEND}" + +pkg_setup() { + if use stats && ! use X; then + einfo "Note: You would need both the X and stats USE flags" + einfo "to compile aMule Statistics GUI." + einfo "I will now compile console versions only." + fi +} + +pkg_preinst() { + if use daemon || use remote; then + enewgroup p2p + enewuser p2p -1 -1 /home/p2p p2p + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.2.6-fallocate.diff + # Bug 412371 + epatch "${FILESDIR}"/${PN}-2.3.1-gcc47.patch + + # https://bugs.gentoo.org/show_bug.cgi?id=465084 + epatch "${FILESDIR}"/${PN}-2.3.1-wx3.0.patch + epatch "${FILESDIR}"/${PN}-2.3.1-build.patch +} + +src_configure() { + local myconf + + if use X; then + einfo "wxGTK with X support will be used" + need-wxwidgets unicode + else + einfo "wxGTK without X support will be used" + need-wxwidgets base-unicode + fi + + if use X ; then + use stats && myconf="${myconf} + --enable-wxcas + --enable-alc" + use remote && myconf="${myconf} + --enable-amule-gui" + else + myconf=" + --disable-monolithic + --disable-amule-gui + --disable-wxcas + --disable-alc" + fi + + econf \ + --with-wx-config=${WX_CONFIG} \ + --enable-amulecmd \ + $(use_enable debug) \ + $(use_enable !debug optimize) \ + $(use_enable daemon amule-daemon) \ + $(use_enable geoip) \ + $(use_enable nls) \ + $(use_enable remote webserver) \ + $(use_enable stats cas) \ + $(use_enable stats alcc) \ + $(use_enable upnp) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + if use daemon; then + newconfd "${FILESDIR}"/amuled.confd amuled + newinitd "${FILESDIR}"/amuled.initd amuled + fi + if use remote; then + newconfd "${FILESDIR}"/amuleweb.confd amuleweb + newinitd "${FILESDIR}"/amuleweb.initd amuleweb + fi +} diff --git a/net-p2p/amule/files/amule-2.3.1-build.patch b/net-p2p/amule/files/amule-2.3.1-build.patch new file mode 100644 index 000000000000..2e977f3f056b --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.1-build.patch @@ -0,0 +1,10 @@ +--- aMule-2.3.1/src/LoggerConsole.cpp~ 2011-06-13 10:50:25.000000000 +0200 ++++ aMule-2.3.1/src/LoggerConsole.cpp 2015-04-11 10:58:20.592470541 +0200 +@@ -29,6 +29,7 @@ + + #include "Logger.h" // for Add(Debug)LogLineM() + ++DEFINE_LOCAL_EVENT_TYPE(MULE_EVT_LOGLINE) + + #ifdef __DEBUG__ + bool CLogger::IsEnabled(DebugType /*type*/) const diff --git a/net-p2p/amule/files/amule-2.3.1-wx3.0.patch b/net-p2p/amule/files/amule-2.3.1-wx3.0.patch new file mode 100644 index 000000000000..77568b1b8d7c --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.1-wx3.0.patch @@ -0,0 +1,45 @@ +diff -ur aMule-2.3.1/src/amuled.cpp aMule-2.3.1.wx3/src/amuled.cpp +--- aMule-2.3.1/src/amuled.cpp 2011-07-13 17:00:12.000000000 +0200 ++++ aMule-2.3.1.wx3/src/amuled.cpp 2014-01-19 13:55:50.904800356 +0100 +@@ -423,7 +423,9 @@ + #ifndef __WXMSW__ + + ++/* + static EndProcessDataMap endProcDataMap; ++*/ + + + int CDaemonAppTraits::WaitForChild(wxExecuteData &execData) +@@ -449,6 +451,7 @@ + wxSleep(1); + result = AmuleWaitPid(execData.pid, &status, WNOHANG, &msg); + if (result == 0) { ++ /* + // Add a WxEndProcessData entry to the map, so that we can + // support process termination + wxEndProcessData *endProcData = new wxEndProcessData(); +@@ -456,6 +459,7 @@ + endProcData->process = execData.process; + endProcData->tag = 0; + endProcDataMap[execData.pid] = endProcData; ++ */ + + status = execData.pid; + } else { +@@ -480,6 +484,7 @@ + msg << wxT("OnSignalChildHandler() has been called for child process with pid `") << + siginfo->si_pid << + wxT("'. "); ++/* + // Make sure we leave no zombies by calling waitpid() + int status = 0; + pid_t result = AmuleWaitPid(siginfo->si_pid, &status, WNOHANG, &msg); +@@ -503,6 +508,7 @@ + msg << wxT(" Error: the child process pid is not on the pid map."); + } + } ++*/ + + // Log our passage here + AddDebugLogLineN(logGeneral, msg); diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest index 85b9e2b70752..aaeed416745a 100644 --- a/net-p2p/gtk-gnutella/Manifest +++ b/net-p2p/gtk-gnutella/Manifest @@ -1,3 +1,2 @@ DIST gtk-gnutella-1.1.3.tar.bz2 19504243 SHA256 2659ddb846f60d13789674e926a71bbb4a8b9d3ca98c6b034a95eaa073531405 SHA512 df143b6e89b0a4c6e8ddbba24ddcab3603f04e7df1fab7d389241a112c6cd3297e4837dfc0d225289997b99867a5466a5b8697c68ef2bdc5817261fbc103d505 WHIRLPOOL fe1a1375e75204bdf92c9690f1885211dc456c2cc466f4d7e47c865fc0e1c77ce07d27b58ff2e53c4c28214d055878c7d805f0b79043748e1448c6b8ac398c82 -DIST gtk-gnutella-1.1.4.tar.bz2 19546318 SHA256 6ae259ff9d5f20a2d10dba66ed6cbe5b56552307a6e8bc36df053b70aff4c956 SHA512 e09fde0e1f8a701e099f91768e032d022f6e9d41cdb4cc7833f1e7ba0e2795bc102c6b835960eb69e577ffc1426c42f6e1682ebadb8c5a643a796f88ff204ac6 WHIRLPOOL a9e63865896444c2ba22e9cf4302f5da5f6bdcec257cc87c618c3c3514cbf924e0eb6df7909b21ad5798650a577adf38cb37806810fd3f6a7f67be5f7a7cc8f1 DIST gtk-gnutella-1.1.5.tar.bz2 19552392 SHA256 c332043a885ba302841a261c118264d903627fd21b062c99538db7dc7dada8a5 SHA512 eb94ef5cbc447ebf75d16eb24f0a4d88197a9b79f842fe73f963af3ba5985cc4ce99605d29e33123754d9a509218b71acc684df27a075c3947278211c1b204e5 WHIRLPOOL c5bc302dd7bd92eac2298c52b557723b473a930a7e1b40cddc74424bef7acf0a9b90f27ba503dc40038c925047dfcf6f80ca8de2f0e20a6429d70267de3ada49 diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.4.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.4.ebuild deleted file mode 100644 index 154b509fd546..000000000000 --- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils - -IUSE="nls dbus ssl +gtk" - -DESCRIPTION="A GTK+ Gnutella client" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -HOMEPAGE="http://gtk-gnutella.sourceforge.net/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" - -RDEPEND=" - dev-libs/glib:2 - sys-libs/zlib - gtk? ( >=x11-libs/gtk+-2.2.1:2 ) - dbus? ( >=sys-apps/dbus-0.35.2 ) - ssl? ( >=net-libs/gnutls-2.2.5 ) - nls? ( >=sys-devel/gettext-0.11.5 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - strip-linguas -i po - - echo "# Gentoo-selected LINGUAS" > po/LINGUAS - for ling in ${LINGUAS}; do - echo $ling >> po/LINGUAS - done -} - -src_configure() { - # There is no option to turn off optimization through the build.sh - # script. - sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die - - # The build script does not support the equivalent --enable - # options so we must construct the configuration by hand. - - local myconf - - if ! use nls; then - myconf="${myconf} --disable-nls" - fi - - if ! use dbus; then - myconf="${myconf} --disable-dbus" - fi - - if ! use ssl; then - myconf="${myconf} --disable-gnutls" - fi - - if use gtk; then - myconf="${myconf} --gtk2" - else - myconf="${myconf} --topless" - fi - - ./build.sh \ - --configure-only \ - --prefix="/usr" \ - --cc=$(tc-getCC) \ - ${myconf} -} - -src_compile() { - # Build system is not parallel-safe, bug 500760 - emake -j1 -} - -src_install() { - dodir /usr/bin - emake INSTALL_PREFIX="${D}" install || die "Install failed" - dodoc AUTHORS ChangeLog README TODO - - # Touch the symbols file into the future to avoid warnings from - # gtk-gnutella later on, since we will most likely strip the binary. - touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die -} diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest index 8e347bcdbcf6..c326aac5eb6d 100644 --- a/net-print/epson-inkjet-printer-escpr/Manifest +++ b/net-print/epson-inkjet-printer-escpr/Manifest @@ -1,2 +1,3 @@ DIST epson-inkjet-printer-escpr-1.4.4-1lsb3.2.tar.gz 2432872 SHA256 bec7c51d11d96b6448bd96b5e9ac622786e3fc5024e13cae2fc248f8858db2f6 SHA512 7a3f1f880dba9048773d051cfe54ea2ee929d82a85efb496d4df4b84b33ed2f48bb6020892615d5d22da6b5671501b82df55cea6e11b35fea392392f115a6330 WHIRLPOOL 856bcffc4fe45c6bb15c7ecbe1c41e315ee68bf2c3c93697ac4f314324e2b3a0a8796ba741c04e962f1ca9148dbf38d529649ffd5d7ddaaa757666ea066e32a0 DIST epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz 2852564 SHA256 9229aa8a033e97e29b0671082d08e1c56ebbee4e5adb2f350f81181835f06be8 SHA512 680ffa68ea84830463bea1e6ffc4e1380ed60dc45689844afa15989177a8c3a2a67becd8a7b899b6ee6c8078de9b217563af06c70b1d42aefa7469327c0601af WHIRLPOOL 1abaf4954781c2734e13a79f7dfde26d27ddec45fd360fa1983d544fe49123ff92305b9b30fdd8482d0c2f5cb954d1e7472d9cd18804cd093c41f81669bf5970 +DIST epson-inkjet-printer-escpr-1.6.1-1lsb3.2.tar.gz 3044091 SHA256 bb7dea7439c571662db9cf7a8834cb87ed69fa249a7945218403187c6097c76f SHA512 e4e6749ffcb8dd3b35bb6ba931165695b1b983fd9b47d5981358d191870c9658fec92aff63352b854f7d1362129e2359ef96166713ed11863e3536dbb5832bb3 WHIRLPOOL e958b2921541177255176f9efd512ac0b981f2faf8828dc03409c364d14dc53ec113dcd37f116b12ecf0a3d8e59e1df9b589ec88f6fabf10ba61707386990126 diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.1.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.1.ebuild new file mode 100644 index 000000000000..18b5c89fb00f --- /dev/null +++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib + +DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)" +HOMEPAGE="http://www.epson.com/" +SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/04/23/02/a5ee7e1622b0ba692bea6763d6d7f4810a8d0808/epson-inkjet-printer-escpr-1.6.1-1lsb3.2.tar.gz" +# http://download.ebz.epson.net/dsc/search/01/search/ + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="net-print/cups" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/1.6.1-warnings.patch" +} + +src_configure() { + econf --disable-shared + + # Makefile calls ls to generate a file list which is included in Makefile.am + # Set the collation to C to avoid automake being called automatically + unset LC_ALL + export LC_COLLATE=C +} + +src_install() { + default + rm -r "${ED%/}/usr/$(get_libdir)" || die +} diff --git a/net-print/epson-inkjet-printer-escpr/files/1.6.1-warnings.patch b/net-print/epson-inkjet-printer-escpr/files/1.6.1-warnings.patch new file mode 100644 index 000000000000..7eeba307d17b --- /dev/null +++ b/net-print/epson-inkjet-printer-escpr/files/1.6.1-warnings.patch @@ -0,0 +1,40 @@ +--- a/lib/epson-escpr-api.h ++++ b/lib/epson-escpr-api.h +@@ -111,6 +111,9 @@ + /*** -------------------------------------------------------------------------------*/
+ extern EPS_ERR_CODE epsMakeMainteCmd (EPS_INT32, EPS_UINT8*, EPS_UINT32* );
+
++extern EPS_ERR_CODE SetupJobAttrib (const EPS_JOB_ATTRIB* );
++extern EPS_ERR_CODE SendStartJob (EPS_BOOL );
++extern EPS_ERR_CODE PrintBand (const EPS_UINT8*, EPS_UINT32, EPS_UINT32* );
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/src/filter.c ++++ b/src/filter.c +@@ -37,6 +37,7 @@ + #include "epson-escpr-api.h" + #include "epson-escpr-services.h" + #include "epson-escpr-mem.h" ++#include "epson-escpage.h" + + #include "err.h" + #include "mem.h" +@@ -45,6 +46,7 @@ + #include "libprtX.h" + #include "optBase.h" + #include "linux_cmn.h" ++#include "xfifo.h" + + #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4) + +--- a/src/mem.c ++++ b/src/mem.c +@@ -23,6 +23,7 @@ + #endif + + #include <stdlib.h> ++#include "err.h" + #include "mem.h" + + void * diff --git a/net-proxy/hatop/hatop-0.7.7.ebuild b/net-proxy/hatop/hatop-0.7.7.ebuild index 67be8be3aff0..e82a801118ad 100644 --- a/net-proxy/hatop/hatop-0.7.7.ebuild +++ b/net-proxy/hatop/hatop-0.7.7.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT="python2_7" +PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="ncurses" inherit python-r1 diff --git a/net-wireless/multimode/multimode-1.00-r2.ebuild b/net-wireless/multimode/multimode-1.00-r2.ebuild index 13df49f49361..30706949b429 100644 --- a/net-wireless/multimode/multimode-1.00-r2.ebuild +++ b/net-wireless/multimode/multimode-1.00-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT="python2_7" +PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 diff --git a/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild b/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild index 97a8fbd06b3c..7cf7761b48a2 100644 --- a/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild +++ b/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT="python2_7" +PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 diff --git a/net-wireless/multimode/multimode-9999.ebuild b/net-wireless/multimode/multimode-9999.ebuild index 26b61e05aa78..61c42ca7838a 100644 --- a/net-wireless/multimode/multimode-9999.ebuild +++ b/net-wireless/multimode/multimode-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT="python2_7" +PYTHON_COMPAT=( python2_7 ) inherit python-single-r1 diff --git a/net-wireless/rfcat/rfcat-9999.ebuild b/net-wireless/rfcat/rfcat-9999.ebuild index e3509660948c..af74b6cb3822 100644 --- a/net-wireless/rfcat/rfcat-9999.ebuild +++ b/net-wireless/rfcat/rfcat-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI=5 -PYTHON_COMPAT="python2_7" +PYTHON_COMPAT=( python2_7 ) inherit mercurial distutils-r1 DESCRIPTION="The swiss army knife of subGHz" diff --git a/profiles/package.mask b/profiles/package.mask index 0fa4705c6676..2b33aafee7e4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,11 @@ #--- END OF EXAMPLES --- +# Patrice Clement <monsieurp@gentoo.org> (07 Nov 2015) +# Duplicate package since it already exists as virtual/perl-Parse-CPAN-meta. +# Masked for removal in 30 days. +dev-perl/Parse-CPAN-Meta + # Brian Evans <grknight@gentoo.org> (06 Nov 2015) # Mask new versions of dev-php/pecl-yaml that only work with PHP-7+ >=dev-php/pecl-yaml-2.0 diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest index 424ef14336d9..6f2a67409bb6 100644 --- a/sci-calculators/galculator/Manifest +++ b/sci-calculators/galculator/Manifest @@ -1,2 +1,2 @@ -DIST galculator-2.1.2.tar.bz2 427684 SHA256 23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b SHA512 e327ca9e6845a3022b4a2bcdaccf68c60d569f839f5cc3706886ff952fbac369f4022887ed4d5b39d6631c67f9de895db4cae4b0f39a681ef9b29747228d81b1 WHIRLPOOL 255a159841ad0bd523fd6933d4b8f3a27cbe14f4465c9db19d68046dd4eed2b1eddeb596795a5782c2114b36f093ab2f51afbd5356b931b50689debb4e88ec48 DIST galculator-2.1.3.tar.bz2 466288 SHA256 91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235 SHA512 782b5a672fa40bab01dc39fb32e79e8da08993bace6c37768db2ca11a2bb996fdc07e773a0f70b7bba73c018de6ea6e3f71afc3885ccbc94d345fef62cdfa74a WHIRLPOOL 188c80101d41e93b6ddfaf4c65aadcb65c5639e4cf0c2cd75dba77f7dd4d405164ce0fb5af48c7a5599de7574e06e39d047d42424454310555500f304bd3daf2 +DIST galculator-2.1.4.tar.bz2 472989 SHA256 01cfafe6606e7ec45facb708ef85efd6c1e8bb41001a999d28212a825ef778ae SHA512 ca5f373649d9bf26184e94ba6a501610efbb13e92a8723cda78b83aa495519e82e5b4fcd17f00f615eb702ed186598aecc70ae63a8238c32384b7f608cba4cfa WHIRLPOOL 23104f14850cbe59b2753e0bd659182e593be9e82c009ecd934a1c441d71c2eddee5d788c678e02514ce56c866edc15f4b13785daf1eef5ac7dbca2a1244a544 diff --git a/sci-calculators/galculator/galculator-2.1.2.ebuild b/sci-calculators/galculator/galculator-2.1.4.ebuild index 5646bc0537d8..fb17a33094de 100644 --- a/sci-calculators/galculator/galculator-2.1.2.ebuild +++ b/sci-calculators/galculator/galculator-2.1.4.ebuild @@ -8,21 +8,24 @@ GCONF_DEBUG=no inherit gnome2 DESCRIPTION="GTK+ based algebraic and RPN calculator" -HOMEPAGE="http://galculator.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +HOMEPAGE="http://galculator.mnim.org/" +SRC_URI="http://galculator.mnim.org/downloads/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" -RDEPEND="dev-libs/glib:2 +RDEPEND=" + dev-libs/glib:2 x11-libs/gtk+:3 - x11-libs/pango" + x11-libs/pango +" DEPEND="${RDEPEND} dev-util/intltool sys-devel/flex sys-devel/gettext - virtual/pkgconfig" + virtual/pkgconfig +" DOCS="AUTHORS ChangeLog NEWS README THANKS doc/shortcuts" diff --git a/sci-calculators/galculator/metadata.xml b/sci-calculators/galculator/metadata.xml index 2ad6e98df1b7..d85862033da6 100644 --- a/sci-calculators/galculator/metadata.xml +++ b/sci-calculators/galculator/metadata.xml @@ -3,6 +3,6 @@ <pkgmetadata> <herd>gnome</herd> <upstream> - <remote-id type="sourceforge">galculator</remote-id> + <remote-id type="github">galculator/galculator</remote-id> </upstream> </pkgmetadata> diff --git a/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild index d1c08139b7fb..bbb38de20fbd 100644 --- a/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild +++ b/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild @@ -49,7 +49,7 @@ src_prepare() { } src_configure() { - need-wxwidgets unicode + use wxwidgets && need-wxwidgets unicode local mycmakeargs=() mycmakeargs+=( -DOPENBABEL_USE_SYSTEM_INCHI=ON diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest index 6db6fd569950..bcc9921a1167 100644 --- a/sci-physics/lammps/Manifest +++ b/sci-physics/lammps/Manifest @@ -6,6 +6,7 @@ DIST lammps-22Oct15.tar.gz 87938562 SHA256 8376b52e8eef4d1c3628c15ff358ecf74303e DIST lammps-23Oct15.tar.gz 87933918 SHA256 3500cdeb22344c7f3a040834a232d6c5ddb9f601820794441fcc24dadedc49b6 SHA512 a26d214b3e7c47d63cf00a364753a829d1c8f0cf4f8b73e829a4463650303d6905b6c942df5890387413b44496c8615b286296b34df9181e54806bb2f361b39a WHIRLPOOL 9a2d6e8fb57f1af2969345d9b250ed1244d2e40c97d5e2994c0ef6225ca265b490809848faa7cdc29a3eaa7c51a6223320039863f6c382a1a51da6f474e52088 DIST lammps-24Sep15.tar.gz 87307191 SHA256 e03cdeb2b3b6107d98969febea26575c85590603ab4f79d26efc46bac6d6cc60 SHA512 356dd556f845cec456865062375120c0898cef1870617d80b31b0e8e964585140120b21f891cd9b40ecde7aaf43beb34d7b15396830e08273624a9b14da551e4 WHIRLPOOL 667b8aaf927d268c569a192c835b7dbdc80a0f25abb1f2c96007517ea218a69b2816dde4ebe28ca82974d01472c0e1126b67e89a19fb3ef49e4020f3d9c69fba DIST lammps-26Oct15.tar.gz 89265403 SHA256 c69356b3056881cbbb7eb659eb9cd4fc9d86e7f010502fe47c91ed865cbabea7 SHA512 738cd9fb7b11cb1e7304814ac4463d534f0a5dda1c70cc483d3c19b038c15cd61a2c03c6972cccc69afbe42d88bf01ef33d0972bba9516a840026891fc3f144a WHIRLPOOL c7c7882e32b026cdba0d5bceb1ecfa4127e77edeb9d567760e19d6103109fdf9cefe79a17fd6e3291d04347984cfdb1a999136ead0be20f0173a73e53f106d95 +DIST lammps-31Oct15.tar.gz 90163112 SHA256 c9f50531ddd720cc4aa469f74a8c528b91934bed9da1d165bfeaa14501beaf61 SHA512 10bd5c2868ad472f44379093ffbf4ef3ac9e65afde00ceafb13913f9253c568173b2abdd5401bbe761730f20412bb81a7e29c267b99527168eb1cfa99af20d17 WHIRLPOOL 654017e23ee6b367f9d8124cca4aeec4f2d0c21cedb8c76e0a74cea075750c6d7f51e873914d926eea6dbbe121faa0d003068c810d4ae201e431404edaba7858 DIST lammps-4Sep15.tar.gz 87259558 SHA256 8652c801e4ce8b6b7d42a6c71f76b68a6e741dc8efb8d7d3dad36b624fe8f150 SHA512 ee730c8bd96e14931192a68c12e4ebde301cc3525b20816d051059f155b70c6edcea7dc2ed911e0b89685d751cd5a74b4bb5eedd6c16a042a2191bf8a9665fc9 WHIRLPOOL 271ac0d74e03d3e3e118a8b2385d98ce3f566ead67f1c329a219c265f886dc267b11be17c2caa52749ebac212bbc7456fba2d0d6ec69cd25815316e601b3360a DIST lammps-5Oct15.tar.gz 88451532 SHA256 a76f92ae05b99f9257abf7d79d9365c5743fa5a16b941a5e40f74036c5879211 SHA512 e0a034778cd5e3b9a27c9fc6257f1f7a6a9161732cd83bac2c4b0f82c39d5a6a385bb4640322478bfbe9467afb28b998cd19108b3d4a21e369b80c39a486e065 WHIRLPOOL 291e7820d4736421aeda9a1295854bd7b52d8ca3f14900e9394373410ee5db02ad6ab53991cf4dc8e73328b24fa44659d10693aca7cb48301227299ad622ce31 DIST lammps-9Sep15.tar.gz 87275742 SHA256 c783be8bf2c2fbef75522b09b4420006d94104f2a60b82f55f7bc255c6163079 SHA512 60fa8c818c72c3c236095c7aa23c2ec30cc3370b6dc14d0c1d9e347772e70c96dab43019092eb93f2327377f1b4cc642416be65d156b1faf934bfa805d228bcf WHIRLPOOL 4a9dbb0f1b493177614646dcef124c723a3b6171d0894fee8b34e9fff7d0962ada0a2a27564338fef6551aaff322f4b50784b98c250555173cba5478cc60e9af diff --git a/sci-physics/lammps/lammps-20151031.ebuild b/sci-physics/lammps/lammps-20151031.ebuild new file mode 100644 index 000000000000..55f834d0c882 --- /dev/null +++ b/sci-physics/lammps/lammps-20151031.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit eutils flag-o-matic fortran-2 multilib python-r1 + +convert_month() { + local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ) + echo ${months[${1#0}]} +} + +MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2} + +DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator" +HOMEPAGE="http://lammps.sandia.gov/" +SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples gzip lammps-memalign mpi python static-libs" + +DEPEND=" + mpi? ( + virtual/blas + virtual/lapack + virtual/mpi + ) + gzip? ( app-arch/gzip ) + sci-libs/voro++ + python? ( ${PYTHON_DEPS} ) + " +RDEPEND="${DEPEND}" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S="${WORKDIR}/${MY_P}" + +lmp_emake() { + local LAMMPS_INCLUDEFLAGS + LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')" + LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')" + + # The lammps makefile uses CC to indicate the C++ compiler. + emake \ + ARCHIVE="$(tc-getAR)" \ + CC="$(usex mpi "mpic++" "$(tc-getCXX)")" \ + F90="$(usex mpi "mpif90" "$(tc-getFC)")" \ + LINK="$(usex mpi "mpic++" "$(tc-getCXX)")" \ + CCFLAGS="${CXXFLAGS}" \ + F90FLAGS="${FCFLAGS}" \ + LINKFLAGS="${LDFLAGS}" \ + LMP_INC="${LAMMPS_INCLUDEFLAGS}" \ + MPI_INC="$(usex mpi "" "-I../STUBS")" \ + MPI_PATH="$(usex mpi "" "-L../STUBS")" \ + MPI_LIB="$(usex mpi "" "-lmpi_stubs")" \ + user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\ + "$@" +} + +lmp_activate_packages() { + # Build packages + local packages=( yes-asphere yes-body yes-class2 yes-colloid \ + yes-coreshell yes-dipole yes-fld yes-granular yes-kspace \ + yes-manybody yes-mc yes-meam yes-misc \ + $(usex mpi "yes-user-atc" "") \ + yes-molecule yes-opt yes-peri yes-poems yes-qeq yes-reax \ + yes-replica yes-rigid yes-shock yes-snap yes-srd \ + yes-user-eff yes-user-fep \ + $(usex mpi "yes-user-lb" "") \ + yes-user-phonon yes-user-sph yes-voronoi yes-xtc ) + + for p in ${packages[@]}; do + lmp_emake -C src ${p} + done +} + +lmp_build_packages() { + lmp_emake -C lib/meam -j1 -f Makefile.gfortran + lmp_emake -C lib/poems -f Makefile.g++ + lmp_emake -C lib/reax -j1 -f Makefile.gfortran + use mpi && lmp_emake -C lib/atc -f Makefile.g++ +} + +lmp_clean_packages() { + lmp_emake -C lib/meam -f Makefile.gfortran clean + lmp_emake -C lib/poems -f Makefile.g++ clean + lmp_emake -C lib/reax -f Makefile.gfortran clean + use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean +} + +src_prepare() { + # Fix inconsistent use of SHFLAGS. + sed -i \ + -e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \ + -e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \ + lib/voronoi/Makefile.lammps || die + + # Fix missing .so name. + sed -i \ + -e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \ + src/MAKE/Makefile.serial || die + + # Fix makefile in tools. + sed -i \ + -e 's:g++:$(CXX) $(CXXFLAGS):' \ + -e 's:gcc:$(CC) $(CCFLAGS):' \ + -e 's:ifort:$(FC) $(FCFLAGS):' \ + tools/Makefile || die + + # Patch python. + epatch "${FILESDIR}/lammps-python3-r1.patch" + epatch "${FILESDIR}/python-shebang.patch" +} + +src_compile() { + # Fix atc... + append-cxxflags -I../../src + + # Acticate packages. + elog "Activating lammps packages..." + lmp_activate_packages + + # Compile stubs for serial version. + use mpi || lmp_emake -C src mpi-stubs + + elog "Building packages..." + lmp_build_packages + + if use static-libs; then + # Build static library. + elog "Building static library..." + lmp_emake -C src mode=lib serial + fi + + # Clean out packages (that's not done by the build system with the clean + # target), so we can rebuild the packages with -fPIC. + elog "Cleaning packages..." + lmp_clean_packages + + # The build system does not rebuild the packages with -fPIC, adding flag + # manually. + append-cxxflags -fPIC + append-fflags -fPIC + + # Compile stubs for serial version. + use mpi || lmp_emake -C src mpi-stubs + + elog "Building packages..." + lmp_build_packages + + # Build shared library. + elog "Building shared library..." + lmp_emake -C src mode=shlib serial + + # Compile main executable. The shared library is always built, and + # mode=shexe is simply a way to re-use the object files built in the + # "shlib" step when linking the executable. The executable is not actually + # using the shared library. If we have built the static library, then we + # link that into the executable. + elog "Linking executable..." + if use static-libs; then + lmp_emake -C src mode=exe serial + else + lmp_emake -C src mode=shexe serial + fi + + # Compile tools. + elog "Building tools..." + lmp_emake -C tools binary2txt chain data2xmovie micelle2d +} + +src_install() { + use static-libs && newlib.a src/liblammps_serial.a liblammps.a + newlib.so src/liblammps_serial.so liblammps.so.0.0.0 + dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so + dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0 + newbin src/lmp_serial lmp + dobin tools/binary2txt + dobin tools/chain + dobin tools/data2xmovie + dobin tools/micelle2d + # Don't forget to add header files of optional packages as they are added + # to this ebuild. There may also be .mod files from Fortran based + # packages. + insinto "/usr/include/${PN}" + doins -r src/*.h lib/meam/*.mod + + local LAMMPS_POTENTIALS="usr/share/${PN}/potentials" + insinto "/${LAMMPS_POTENTIALS}" + doins potentials/* + echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps + doenvd 99lammps + + # Install python script. + use python && python_foreach_impl python_domodule python/lammps.py + + if use examples; then + local LAMMPS_EXAMPLES="/usr/share/${PN}/examples" + insinto "${LAMMPS_EXAMPLES}" + doins -r examples/* + fi + + dodoc README + if use doc; then + dodoc doc/Manual.pdf + dohtml -r doc/* + fi +} diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index 5e251ec4763b..e321b24f0a9b 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -1,5 +1,5 @@ DIST man-db-2.6.6.tar.xz 1448576 SHA256 7da90f8d8df91e0e682769d50f4bdb905f525b5d0f01e7e5b8cc3c6da45f66c3 SHA512 7abb8609e1113dd1852076c4c71557c3b376fefa7e42fa39198f7b882f4b3fe733983045742c4b3903be2c953c09c724f735619b4396283a4ed2ad7816aaf4ec WHIRLPOOL e5c7b41afd7374bb1df3024134f9bd8a1af42b5ad63d4e516e946b0e8ccc88bafc055fdba707b0c764030e92748b225a72672bfe07e2bc3e8d78526d17f5ff72 DIST man-db-2.6.7.1.tar.xz 1452280 SHA256 8d65559838fccca774e3ef7c15c073180c786e728785c735e136297facca41fc SHA512 91e1036701174c5623a4cf4208a93130822dc9c61ffd9c6bf0dddaf7c4c5b2401e6238f60578dfa81a11d67d360cbc4d45af920542fb4a0624c7169b17a618f8 WHIRLPOOL 30c510289d1444b3231704c22ddf2c17b58d4aa8b9e8a94552537fbc971b23f16b2c43a32fa9f85fb7b8eca2fd71a73d52955fcd0ab24ef49d3903832eafecf7 DIST man-db-2.7.2.tar.xz 1501264 SHA256 22674eaf51dce8bcc83fd86b1c8d11f99de5c6d8962d7fad7b02307c4ad6e492 SHA512 fd0659f002980ba902bcd1186de09f82d840b039cbeea3457377926991ce5aaa602fe228c0969ea643140a4d5e7bdfbdab7c747943ac93b51c17a591677a7b84 WHIRLPOOL 51ad5e4580b5ff9ede9a0c2e17d579ed2a14c5ef1b11a43b92f99e5467db3e1627eed58c76040710e6fb7ae24258a4904142db8951c21e0981318082710dd772 -DIST man-db-2.7.3.tar.xz 1502928 SHA256 9d4744c9956007e7aad59efcc6bb8b6da410ee507df46f9e81311431f80114ea SHA512 0b265b52d8278f80dfbe34cd3ae13382ecea42a8e55046ddd9be3d552b1b404eb7afc6956001ecdb4500ce352a4cded6a4875bba935ca4dbaaed0b51e9b3119e WHIRLPOOL 77c6fd8df3aec6bf40ab8d7cabb0e1aeb53f63db8d2b015f529333972d0792bad49b36b7ec9481dfffefd2b3b079c0701c6164ce4ee616bfa6d2b0f73b5b34e8 DIST man-db-2.7.4.tar.xz 1503972 SHA256 153f4d3c33f5f9b0c8484bb39d9d271f6ae4aa1b3f5d6d515879692dba944f0b SHA512 979f4b8380a57d2e7275095a31903c112c36558aba33f5d3c26d5bbb5d846c3dae11b943a32db8a5cd9af34605558329666c3830e932a81af8647c370f509139 WHIRLPOOL 7ad145e7b6f04707059b31c7a01c931d4b9f3fb0d638f8c17f91f6f249d91b9121a2d22b0a4115dffb41949cf60e4d8c5e940f6fb39257cf7bcfbdf03885e7a7 +DIST man-db-2.7.5.tar.xz 1505428 SHA256 5c4ddd0d67abbbcb408dc5804906f62210f7c863ef791198faca3d75681cca14 SHA512 8e82fb437372261a2b33e1acb45b6322dac1864f13b20968d6a09b27edec795111c25bafcb7f6f3550784d4621eb4871f76d0275d7fa9e01644a5ced60666933 WHIRLPOOL c9322b8a816f9eeab974172827adbc93e1c6ee973c6af9049e370d1cefdb1d6cc4bb29383ed609e8567ac98052fb195887096e511b734688012cd7250d66466e diff --git a/sys-apps/man-db/man-db-2.7.3.ebuild b/sys-apps/man-db/man-db-2.7.5.ebuild index bf66d3865377..bf66d3865377 100644 --- a/sys-apps/man-db/man-db-2.7.3.ebuild +++ b/sys-apps/man-db/man-db-2.7.5.ebuild diff --git a/sys-apps/rng-tools/rng-tools-5-r2.ebuild b/sys-apps/rng-tools/rng-tools-5-r2.ebuild index 5c8819889523..d241dcc45caa 100644 --- a/sys-apps/rng-tools/rng-tools-5-r2.ebuild +++ b/sys-apps/rng-tools/rng-tools-5-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ppc x86" +KEYWORDS="~alpha amd64 arm ia64 ppc x86" IUSE="selinux" DEPEND="dev-libs/libgcrypt:0 diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest index e6cd891a8e28..53b677aa3ede 100644 --- a/sys-block/gparted/Manifest +++ b/sys-block/gparted/Manifest @@ -1,2 +1,2 @@ -DIST gparted-0.22.0.tar.bz2 2185652 SHA256 aa755e1a6e84c8eaac8b3c44416cbe9c202a4993ceaba22f293d20b83b2d6f27 SHA512 4cc6868dd182e00d1f3afc261009a5ebca81d1b7319f97c9b3c3267c5a11f043bbad644e14245a5c5b342971b2fd7705cbf7b159d8e800f7877de42c30c6581b WHIRLPOOL 4752197e8060dd24852a7c5ad2799cc19e9dde2e6694656392ce0703c6c2da1cfeffd2a3625f8da9ab02fdc3db66cb33608b3c52c9a6d369e0106a367efe7859 DIST gparted-0.23.0.tar.bz2 2264376 SHA256 7fd1dddf29814c2982f55ab765b8918561e1b5dabf792012c66b4d3ba25da754 SHA512 5ac03da1b13b23ee36006a4e785fd9b67968763305b5b0657948ac5c68391ba9643d53d44ff29703fa78a5df877a95a5be4ef41e83da524d8362a46bc15cbf06 WHIRLPOOL 2a24d6dfb3aa52f9c0e42b6897d06e8911620f6ddd2cea44b61b49b80244c147104e01356c3c300c56f62975df94fb4112ef4682e365988f729138fd202c5b26 +DIST gparted-0.24.0.tar.bz2 2276313 SHA256 02398ab33894a59b0bd8707e598c46d8bb56f1413cd54de48eed61e2920ecd60 SHA512 914e8292adfd8648e57a83303721eb94d8527135d46bf9f5a9c53265294b44109c7f00e40761c26f186f97a8ef4a58ed16f53b3db6f78db3b4052dc5ed99755a WHIRLPOOL 81d774e3bcd5c08c90fd41a5bb7ef7e403e28c59401212f0501fa551fc66c08bb5ca415d1e69d173d3e54797c24de437d5ec677ac1f0698b0d4a9331bbd6b987 diff --git a/sys-block/gparted/gparted-0.22.0.ebuild b/sys-block/gparted/gparted-0.24.0.ebuild index 222d099531fa..d5ddecde4114 100644 --- a/sys-block/gparted/gparted-0.22.0.ebuild +++ b/sys-block/gparted/gparted-0.24.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2+ FDL-1.2+" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" +KEYWORDS="~amd64 ~arm ~ppc ~x86" IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs" # FIXME: add gpart support @@ -54,6 +54,7 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils dev-util/intltool + sys-devel/gettext virtual/pkgconfig " diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest index b09ed0e674bb..8ed88c0583ed 100644 --- a/sys-boot/os-prober/Manifest +++ b/sys-boot/os-prober/Manifest @@ -1,4 +1,3 @@ DIST os-prober_1.65.tar.xz 24712 SHA256 c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84 SHA512 64dd9042a26dc859d9186bb48545d85b1a369d00a93b5045c420eac0c4b672ab32cb6028eada5f1cc21c8ab9386c35b8eedb79bc7975faf7b0a7b2841b284f53 WHIRLPOOL 397a92312b018fa08b2e838bc6b85fa4d55502dfb8e8725c79f4a0ae397e3bd258a7bb302f74b2293cd85f4ddabf4cba75ff2b4b57fa9904094c3a50e1ace36e -DIST os-prober_1.66.tar.xz 24904 SHA256 ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057 SHA512 6aaa2787be9ea522ae71b8c65fc04bb05af233c81e2a8cd0c27b79d6f8c697c5585b5f5fce91c67eab3bbc782e29087fb22db2626609702ab272a398e59ce333 WHIRLPOOL 12d058e78ddd168938b0160b8a2348b497d24c17b99a30a34edcd3e663e8c57eded8d85d02d97c85ad936aadce123387c85dd9c3f0510bf200a9fbf632fd95bf -DIST os-prober_1.67.tar.xz 25092 SHA256 69d5b5f5ab9182025fda9cfd9f09be20f28ed6fe7ea07c26664d5e571ed355aa SHA512 bc05256d9e1ef808ccaf5a95e23a811f3086ad5b54b444b30b9b21e0c56c71f5c4a7dc69b5d2604ec90209f9a0ef1e00286da016f953f430a5c269a6dc75a718 WHIRLPOOL 5b88ed969d64555ee663a19572bfeaff8ecd3ca750765133791fe597f953394630b3a631c49733142775291ad61fedccec0090f26ab3017f0df2607fc49ad6ca DIST os-prober_1.68.tar.xz 25336 SHA256 ad0b98c3e59239bff94e8f03bb618c21043c5314a7d00726d53f84add8478804 SHA512 b545cb42eb6e46da051aa7b63ec2cb29549aa197d0e0c361fa5d4a92ae3774c665003b4c1cd4294c9d26a63a71cd50cce75fed3be9d770adffeb0bd0b8cfc79e WHIRLPOOL a337446d1e6691d50b749fe3843452389845dbb5de5e06227baebd90b2535aa3111f7373f7c26335feef5637dc84ae5c1f0faa8bcaf97dfa4393129129e8cbf2 +DIST os-prober_1.70.tar.xz 25468 SHA256 f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d SHA512 d060a7fd4e128693b1bb79cff014b4583f56fd0ed4fdd1afd9670623538c03c4e458697c85c753ef4746b1acc5f91e31ef1f0d83fcb696e35ae8355f16edd9a4 WHIRLPOOL 9414e27187223aa6cddf910bcf77f2b677bf1bef0b358b287a59dbbd2acb9a35060163d18c26808a97da061b8d3e77713e283de2d32e23188400fde975c607a7 diff --git a/sys-boot/os-prober/os-prober-1.66.ebuild b/sys-boot/os-prober/os-prober-1.66.ebuild deleted file mode 100644 index 9e98b17baa1b..000000000000 --- a/sys-boot/os-prober/os-prober-1.66.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -#inherit eutils multilib toolchain-funcs -inherit toolchain-funcs - -DESCRIPTION="Utility to detect other OSs on a set of drives" -HOMEPAGE="http://packages.debian.org/source/sid/os-prober" -SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -S=${WORKDIR}/${PN} - -src_prepare() { - # use default GNU rules - rm Makefile || die 'rm Makefile failed' - # Fix references to grub-mount - sed -i -e 's:grub-mount:grub2-mount:g' \ - common.sh \ - linux-boot-probes/common/50mounted-tests \ - os-probes/common/50mounted-tests -} - -src_compile() { - tc-export CC - emake newns -} - -src_install() { - dobin os-prober linux-boot-prober - - # Note: as no shared libraries are installed, /usr/lib is correct - exeinto /usr/lib/os-prober - doexe newns - - insinto /usr/share/os-prober - doins common.sh - - keepdir /var/lib/os-prober - - local debarch=${ARCH%-*} dir - - case ${debarch} in - amd64) debarch=x86 ;; - ppc|ppc64) debarch=powerpc ;; - esac - - for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do - exeinto /usr/lib/$dir - doexe $dir/common/* - if [[ -d $dir/$debarch ]]; then - doexe $dir/$debarch/* - fi - if [[ -d $dir/$debarch/efi ]]; then - exeinto /usr/lib/$dir/efi - doexe $dir/$debarch/efi/* - fi - done - - if use amd64 || use x86; then - exeinto /usr/lib/os-probes/mounted - doexe os-probes/mounted/powerpc/20macosx - fi - - dodoc README TODO debian/changelog -} - -pkg_postinst() { - elog "If you intend for os-prober to detect versions of Windows installed on" - elog "NTFS-formatted partitions, your system must be capable of reading the" - elog "NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g" -} diff --git a/sys-boot/os-prober/os-prober-1.67.ebuild b/sys-boot/os-prober/os-prober-1.70.ebuild index 1163bc0625af..35c50c608c4a 100644 --- a/sys-boot/os-prober/os-prober-1.67.ebuild +++ b/sys-boot/os-prober/os-prober-1.70.ebuild @@ -23,7 +23,7 @@ src_prepare() { sed -i -e 's:grub-mount:grub2-mount:g' \ common.sh \ linux-boot-probes/common/50mounted-tests \ - os-probes/common/50mounted-tests + os-probes/common/50mounted-tests || die } src_compile() { diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest index 283f1e20ee68..54c581ff86fb 100644 --- a/sys-devel/prelink/Manifest +++ b/sys-devel/prelink/Manifest @@ -1,4 +1 @@ -DIST prelink-20110511.tar.bz2 924501 SHA256 038725b6e3125dc163bca6c6bd348958ca117510d6d2603f06431fee59b4e0fe SHA512 4ae8a8a9fc29c98954e43eb606bef5e4d6eeca6ea9cec855f13e640e1090dd99543c60da240bc8f68b01e1ec94a6860863772378b1b13191faf42912fb8d51ec WHIRLPOOL 8e8dc9247bfd9425527f7246aa2e61ff351a7701729c22f04bddce46ac37fe109a2c777cc880a40a55a28a0072337e5e8f8e410616b537180486c757f2dad161 -DIST prelink-20111012.tar.bz2 926500 SHA256 b86df2e6c051176da711a85982b80d87c8ce8e053e04bd0ffb2f9ba817f62aaf SHA512 51e57337b528728e916a69c2fc6a21503882d43317d927c1c3990193b929e7d0a91e04411647fd798f4f2467a87dc5482a8f8f95650546bb2336d42e563e66cf WHIRLPOOL e4c0b2ec05694ea56dd365b725f19d8b263a6392426ac47d4cefa49326a32b6174026416b98acb5a56a2644c2094db6f4c4c3523de3b74d33c09ac42e235ae66 -DIST prelink-20120628.tar.bz2 917485 SHA256 46548d655e9d764260b735ecdd1c8b0673756224f5fd9a4f14fef1cdb6bad44d SHA512 ee45d0c916fe8dd8e358ba1bae2ea0af41f7ae45a77b2c126236f93035bd335797834714fd9d7841a3e6987855a12adf5c8c954c72155e51319786ac21ed42ef WHIRLPOOL 06f34a15363924576bfa8c54180a78993589c3fd51c6a4cd7a58c823c4a5738591bc9332173e3312a557b1af4c1c71bc1f02982145fd9af5ad1f7063be58a205 DIST prelink-20130503.tar.bz2 928040 SHA256 6339c7605e9b6f414d1be32530c9c8011f38820d36431c8a62e8674ca37140f0 SHA512 69138a695e3e535deacd8224f6f8364ff64b8868b87b516d1f3392d9df968f77265177e9fede09c38f16aa878f9fd57a9ec39f0d9deabc0c9c01609b11156ba3 WHIRLPOOL 51b4234009c6ac6e6f45f09e3513feb5efe1dbf9d705b55f88d0443fe386bacbe04fa4a4e5d60caf40ef0a98a5557eb2e9f3a11549ec01c0200c324cb948ab34 diff --git a/sys-devel/prelink/prelink-20110511.ebuild b/sys-devel/prelink/prelink-20110511.ebuild deleted file mode 100644 index 12ce281b4e75..000000000000 --- a/sys-devel/prelink/prelink-20110511.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic - -DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times" -HOMEPAGE="https://people.redhat.com/jakub/prelink" - -SRC_URI="mirror://gentoo/${P}.tar.bz2" -#SRC_URI="https://people.redhat.com/jakub/prelink/${P}.tar.bz2" -# -# if not available rip the distfile with rpm2targz from -# https://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/prelink-[ver].src.rpm - -# track http://pkgs.fedoraproject.org/gitweb/?p=prelink.git;a=summary for -# version bumps - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 -arm ppc ppc64 x86" -IUSE="" - -DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)] - !dev-libs/libelf - >=sys-libs/glibc-2.8" -RDEPEND="${DEPEND} - >=sys-devel/binutils-2.18" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-20061201-prelink-conf.patch - - sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201 - sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147 - - # older GCCs don't support this flag - # sed it from the Makefile then add it back to CFLAGS so we can use - # strip-unsupported-flags - sed -i -e 's:-Wno-pointer-sign::' src/Makefile.in #325269 - append-cflags -Wno-pointer-sign - strip-unsupported-flags -} - -src_install() { - default - - insinto /etc - doins doc/prelink.conf - - exeinto /etc/cron.daily - newexe "${FILESDIR}"/prelink.cron prelink - newconfd "${FILESDIR}"/prelink.confd prelink - - dodir /var/{lib/misc,log} - touch "${D}/var/lib/misc/prelink.full" - touch "${D}/var/lib/misc/prelink.quick" - touch "${D}/var/lib/misc/prelink.force" - touch "${D}/var/log/prelink.log" -} - -pkg_postinst() { - echo - elog "You may wish to read the Gentoo Linux Prelink Guide, which can be" - elog "found online at:" - elog - elog " https://wiki.gentoo.org/wiki/Prelink" - elog - elog "Please edit /etc/conf.d/prelink to enable and configure prelink" - echo - touch "${ROOT}/var/lib/misc/prelink.force" -} diff --git a/sys-devel/prelink/prelink-20111012.ebuild b/sys-devel/prelink/prelink-20111012.ebuild deleted file mode 100644 index e56ff8acfd13..000000000000 --- a/sys-devel/prelink/prelink-20111012.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic - -DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times" -HOMEPAGE="https://people.redhat.com/jakub/prelink" - -#SRC_URI="mirror://gentoo/${P}.tar.bz2" -SRC_URI="https://people.redhat.com/jakub/prelink/${P}.tar.bz2" -# -# if not available rip the distfile with rpm2targz from -# https://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/prelink-[ver].src.rpm - -# track http://pkgs.fedoraproject.org/gitweb/?p=prelink.git;a=summary for -# version bumps - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~x86" -IUSE="" - -DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)] - !dev-libs/libelf - >=sys-libs/glibc-2.8" -RDEPEND="${DEPEND} - >=sys-devel/binutils-2.18" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-20061201-prelink-conf.patch - - sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201 - sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147 - # >=binutils-2.22 --no-copy-dt-needed-entries is the default - # --copy-dt-needed-entries was renamed from --add-needed in 2.21, use the - # former so we don't have to bump the dep - sed -i \ - -e '/CCLINK=/s:\(CCLINK="$(CC)\):\1 -Wl,--add-needed :' \ - -e '/CXXLINK=/s:\(CXXLINK="$(CXX)\):\1 -Wl,--add-needed :' \ - testsuite/Makefile.in - - has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread - # older GCCs don't support this flag - sed -i -e 's:-Wno-pointer-sign::' src/Makefile.in #325269 - append-cflags -Wno-pointer-sign - strip-unsupported-flags -} - -src_install() { - default - - insinto /etc - doins doc/prelink.conf - - exeinto /etc/cron.daily - newexe "${FILESDIR}"/prelink.cron prelink - newconfd "${FILESDIR}"/prelink.confd prelink - - dodir /var/{lib/misc,log} - touch "${D}/var/lib/misc/prelink.full" - touch "${D}/var/lib/misc/prelink.quick" - touch "${D}/var/lib/misc/prelink.force" - touch "${D}/var/log/prelink.log" -} - -pkg_postinst() { - echo - elog "You may wish to read the Gentoo Linux Prelink Guide, which can be" - elog "found online at:" - elog - elog " https://wiki.gentoo.org/wiki/Prelink" - elog - elog "Please edit /etc/conf.d/prelink to enable and configure prelink" - echo - touch "${ROOT}/var/lib/misc/prelink.force" -} diff --git a/sys-devel/prelink/prelink-20120628.ebuild b/sys-devel/prelink/prelink-20120628.ebuild deleted file mode 100644 index 8234aa94a4ef..000000000000 --- a/sys-devel/prelink/prelink-20120628.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit autotools eutils flag-o-matic - -DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times" -HOMEPAGE="https://people.redhat.com/jakub/prelink" - -SRC_URI="mirror://gentoo/${P}.tar.bz2" -#SRC_URI="https://people.redhat.com/jakub/prelink/${P}.tar.bz2" - -# if not available on jakub's dev space extract the distfile with rpm2tarbz2 from -# https://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/prelink-[ver].src.rpm -# -# track http://pkgs.fedoraproject.org/cgit/prelink.git/ for updates - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~x86" -IUSE="selinux" - -DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)] - selinux? ( sys-libs/libselinux[static-libs(+)] ) - !dev-libs/libelf - >=sys-libs/glibc-2.8" -RDEPEND="${DEPEND} - >=sys-devel/binutils-2.18" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-20061201-prelink-conf.patch - - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #469126 - - sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147 - # >=binutils-2.22 --no-copy-dt-needed-entries is the default - # --copy-dt-needed-entries was renamed from --add-needed in 2.21, use the - # former so we don't have to bump the dep - sed -i \ - -e '/CCLINK=/s:\(CCLINK="$(CC)\):\1 -Wl,--add-needed :' \ - -e '/CXXLINK=/s:\(CXXLINK="$(CXX)\):\1 -Wl,--add-needed :' \ - testsuite/Makefile.am - - # older GCCs don't support this flag - sed -i -e 's:-Wno-pointer-sign::' src/Makefile.am #325269 - append-cflags -Wno-pointer-sign - strip-unsupported-flags - - has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread - - eautoreconf # prevent maintainer mode - - # have to do this after eautoreconf or automake barfs on the trailing - # backslash of the previous line - sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in # 254201 - - export ac_cv_{header_selinux_selinux_h,lib_selinux_is_selinux_enabled}=$(usex selinux) -} - -src_install() { - default - - insinto /etc - doins doc/prelink.conf - - exeinto /etc/cron.daily - newexe "${FILESDIR}"/prelink.cron prelink - newconfd "${FILESDIR}"/prelink.confd prelink - - dodir /var/{lib/misc,log} - touch "${D}/var/lib/misc/prelink.full" - touch "${D}/var/lib/misc/prelink.quick" - touch "${D}/var/lib/misc/prelink.force" - touch "${D}/var/log/prelink.log" -} - -pkg_postinst() { - echo - elog "You may wish to read the Gentoo Linux Prelink Guide, which can be" - elog "found online at:" - elog - elog " https://wiki.gentoo.org/wiki/Prelink" - elog - elog "Please edit /etc/conf.d/prelink to enable and configure prelink" - echo - touch "${ROOT}/var/lib/misc/prelink.force" -} diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index ef6558af7ca0..a79317e983d9 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -1,4 +1,6 @@ DIST freebsd-sources-9.1-en-13-03.patch 32571 SHA256 8bafbaba1b23f4651a9e578dbbb3b8d9b4a0a28dc1702f6dc17a40728b861595 SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc WHIRLPOOL c7b0a56efd9cebecde56590cacb1ee743845ce13577505255deca44c167d679ce94c759cfb363c26a5f2a9fc16dfc06d17eea18d638fd72c21ec0fdd81a71c5f +DIST freebsd-sources-EN-1519-kqueue.patch 543 SHA256 09f3b3e80a9902bfea78dfcaf434daf09f7ffa4ff701a34eaf387fee36d1f4e3 SHA512 222c7256c79beefa322a20f4f35fde7ababb46b28669df491087d46f28d9dbf1eca09c9fbbef678f1262a52741eafc0701676d087025e968d34352b95b5a61f6 WHIRLPOOL c3a334188155f261036a81377940bbaa78ddfcee1727001fb71759af67300c8a3ab02a649bec239522d0a06f143064a168ea925285c6a9d7f07a05ed81999d10 +DIST freebsd-sources-EN-1520-vm.patch 1100 SHA256 cc6c4e383d53316aba079ef8047aa80e8256214877d4281049df923d6aea7098 SHA512 2a853d0a3c57832915922ab511175395b0f2d43346e3b2501e83e42f063ac32bf3317bc93f2e3151d630f34e7b0fbcd3b21092fffcf163ba1b39c156f6b3c8ce WHIRLPOOL 7999092d2c5ddffc5e9ef665536150f768de7936c38306616d7a1ee63339afae17b04ae2aa9a2b110ed219c1039beeff5dbff8e222e1ea6a921c16c4f262e587 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3 diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild index 27e930a942f8..0d0e26c85117 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-10.2.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild @@ -11,6 +11,10 @@ SLOT="0" IUSE="+build-kernel debug dtrace zfs" +# Security Advisory and Errata patches. +UPSTREAM_PATCHES=( "EN-15:19/kqueue.patch" + "EN-15:20/vm.patch" ) + if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SRC_URI="${SRC_URI} diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild index 145d71fd5b38..16325ed508fb 100644 --- a/sys-fs/lvm2/lvm2-2.02.116.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.116.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) diff --git a/sys-kernel/linux-docs/Manifest b/sys-kernel/linux-docs/Manifest index b1523bc54b36..382551df84ed 100644 --- a/sys-kernel/linux-docs/Manifest +++ b/sys-kernel/linux-docs/Manifest @@ -2,6 +2,6 @@ DIST linux-3.10.58.tar.xz 73287940 SHA256 dffd5af29d516caf1b2fba8360acad81eec24a DIST linux-3.12.30.tar.xz 76465772 SHA256 24941aa7e5b9c556080d59e63ef9eea4e739ed1b29d367d2e777243f90633480 SHA512 3f0b188547f0f0adcd8d7e6246465020bee316eda8ca20be8140f2115ae04d58a3d2e37ef60480ebe009797c71db5a14dd60cfcff958561cb12d313ee0d18499 WHIRLPOOL d139c36f20d08cb721c1ac08e48e33aba04b1b04c199b557ab814dbb3fb048d6ccf0f0e4fcf5bb2c430888dfa891981770e1973f7cbdda49ba5c284fbaa44a91 DIST linux-3.14.22.tar.xz 78451580 SHA256 77a0c7a41b1fc4232a959c539e48f98071769c8cc553e013291fbfadba62b084 SHA512 2d2f40fc18f2769a1fe53115de91ea37aeab53f5b4ca9bedaf7622447c87a97c5d59c2e4a3faf1356d00a365a970d7a53d98fdbdc7e967aef402918e7bff9b61 WHIRLPOOL 89768ea13f7e1b912feabb303e6146dc0886702c3133cb15d4f2351ddc6976af4b135a61f0dc78f3a4da6a51ea515cd322f008e9074b3d427a6116b287aa197a DIST linux-3.4.104.tar.xz 67176948 SHA256 8bf42d8befdd61a296546dfb626eca7c108b7c3eb0c284f4bd4273c628e1c275 SHA512 a8d86b0fa9bbb602262f8e4155870a5e33224597030d6b6777480ea81127564d9bf94389d8adb59c8e9cec2f586f59031968d33ec3b6b82c10e13924c303872b WHIRLPOOL 95cb16ceab4899689145385c5acbe4cf46682e9f5258dc99b6b890347c06aba903858a0fd98d9d34a264a9db46c54e9fa6da0821bb33bd3a2a3fb6a82ba7f451 -DIST linux-4.1.4.tar.xz 83015496 SHA256 3ee2f2bdcb8ecf729fc7ed0545a6a2292f2853bd0eb259bc4124265a6ad4909f SHA512 a87b9692fe6f17c562c60a82640d26278ec6c6ce90c433b184162f216733e6a228ebb5a5d167e787bb260dcf90edc99413cf0e282744ed682539b171b1e616c3 WHIRLPOOL 666ed8c4cde164dd20264d49b4b3800a599ac020563c8181e5265639efe82406cb09663c86c83c228bdfc5d03b0364e058ac365c490cc0e066c49d42b0821967 +DIST linux-4.1.12.tar.xz 83044368 SHA256 4b49b246b2b99404432fdaa3338a01ce84dcd05b9501aaa71b04d81ac6e13f61 SHA512 e75636441f589bc132ebde17aa3c510b4277da9c5646e3785c5fdca7e1a860e280fbb1819818a34529de5062e54dccb2335a7e6d3c3aaed51d0317c860fbe601 WHIRLPOOL 4514c131790c30e0ecf8359951ec806f919f75aa3aa2166b5a3bed37b4c5e53c13c1914341913dfc1ab6db55539da63586bdb339a1157af90c2a93f5e79fb420 DIST linux-4.2.5.tar.xz 85538096 SHA256 7c43bb038ddf7396b998fb802b1453f68035cba2dcadeb507f54520bbe533187 SHA512 323e08348e185346606db5cd10e0c8b038d68f480592b4a74dd5f9e4eda6853c2763f75b6c73fe91903bff67b29a5bb5dbbb36d60e56fd9764009f3a5881ab21 WHIRLPOOL b275baf06f87e6593d45bd889aed45fdfff63f1ef180d6332d95e790f60cf0bffce69ea792c45af22752347c58b2634a4a67e306da15af8390f37598c9ce326c DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935 diff --git a/sys-kernel/linux-docs/linux-docs-4.1.4.ebuild b/sys-kernel/linux-docs/linux-docs-4.1.12.ebuild index 7e8068b9ff0f..7e8068b9ff0f 100644 --- a/sys-kernel/linux-docs/linux-docs-4.1.4.ebuild +++ b/sys-kernel/linux-docs/linux-docs-4.1.12.ebuild diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest index 37d4a90a5eea..7929d380f013 100644 --- a/sys-libs/libvpd/Manifest +++ b/sys-libs/libvpd/Manifest @@ -1,2 +1,3 @@ DIST libvpd-2.1.3.tar.gz 116493 SHA256 18390b1c272c774b153615a84d4f4e683da08156daf5a0b001c3c07f54d422ae SHA512 f5aac9253752552674ac6c54dd3e6dbdd7ff79867740076d6e19782940b809e53736a11e668978d8d73bf636d92d1daeb78080e5fd31c4febc2257e5497c373c WHIRLPOOL a0f34265c865282a755092c854521d538bbb633b92ff8004a7b8f4949a91bfd924ca156edd4357f67fbf62c7456e0785887a6e62e67f385d348aae8836c4b199 DIST libvpd-2.2.4.tar.gz 374665 SHA256 13a44a156cfe60b6ee7c1f4dc9171335657bfd5903c59a686abf1149b1b12c12 SHA512 89f7e235e957393fe33e484b23fce15fbf36274db6115e7245027a17b7535e387f835c048a7063f317f10de2351a78acf2ca72b10adee0020ce62a035bfe787e WHIRLPOOL e902455cd34262f581af2af160c9f16c542a63a5c58121116be2d6eb3bf58cc6ec2ee2074ad45959f7d0add9836129bba884d264e970ac9b62edb720f19157ec +DIST libvpd-2.2.5.tar.gz 374311 SHA256 6ce194d2c929ca45b6640b858587580c5d158db52a85d59ba7bd846c4a4f3faf SHA512 06969e61d2882a30ebff13b6432397edb0119adc0b0f8ea603973c6ef439320c39c1cbc218fab154d595fadc966bfef07a4a9c4e4ec8fd772cf7d396000864b0 WHIRLPOOL 61137227612ebc71c76689bf444dae59e1c2b12a7e1a66aa940cf414f70fb22c81dbc46b438ca7462e48916ae66f53715d1a4dc338ea7db811b73992c4cf9f1d diff --git a/sys-libs/libvpd/libvpd-2.2.5.ebuild b/sys-libs/libvpd/libvpd-2.2.5.ebuild new file mode 100644 index 000000000000..220009728d95 --- /dev/null +++ b/sys-libs/libvpd/libvpd-2.2.5.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils udev + +DESCRIPTION="Library implementation for listing vpds" +HOMEPAGE="http://sourceforge.net/projects/linux-diag/" +SRC_URI="http://sourceforge.net/projects/linux-diag/files/libvpd/${PV}/libvpd-${PV}.tar.gz" + +LICENSE="IBM" +SLOT="0" +KEYWORDS="~ppc ~ppc64" +IUSE="static-libs" + +DEPEND=" + >=dev-db/sqlite-3.7.8 + sys-libs/zlib +" +RDEPEND="${DEPEND}" + +src_configure() { + # sysconfdir is used only to establish where the udev rules file should go + # unfortunately it also adds the subdirs on its own so we strip it down to + # dirname + econf \ + $(use_enable static-libs static) \ + --sysconfdir="$( dirname $(get_udevdir) )" +} + +src_install(){ + emake DESTDIR="${D}" install + prune_libtool_files + +} diff --git a/www-apache/anyterm/anyterm-1.1.29-r1.ebuild b/www-apache/anyterm/anyterm-1.1.29-r1.ebuild new file mode 100644 index 000000000000..88c80e5ebda2 --- /dev/null +++ b/www-apache/anyterm/anyterm-1.1.29-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic + +DESCRIPTION="A terminal anywhere" +HOMEPAGE="http://anyterm.org/" +SRC_URI="http://anyterm.org/download/${P}.tbz2" + +LICENSE="GPL-2 Boost-1.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="virtual/ssh" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.34.1" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.28-respect-LDFLAGS.patch" + "${FILESDIR}/${P}-gcc-4.4.patch" + "${FILESDIR}/${P}-boost-1.50.patch" +) + +src_prepare() { + epatch "${PATCHES[@]}" +} + +src_compile() { + # this package uses `ld -r -b binary` and thus resulting executable contains + # executable stack + append-ldflags -Wl,-z,noexecstack + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die +} + +src_install() { + dosbin anytermd || die + dodoc CHANGELOG README || die + doman anytermd.1 || die + newinitd "${FILESDIR}/anyterm.init.d" anyterm || die + newconfd "${FILESDIR}/anyterm.conf.d" anyterm || die +} + +pkg_postinst() { + elog "To proceed installation, read following:" + elog "http://anyterm.org/1.1/install.html" +} diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest index 42349a17c906..9b3ac9aca0c9 100644 --- a/www-apps/moodle/Manifest +++ b/www-apps/moodle/Manifest @@ -1,3 +1,3 @@ -DIST moodle-2.7.10.tgz 34992167 SHA256 0cc41106b462b244cb4aac02999f099ede4b10c721e07df0d0f6860403fa4f4c SHA512 b4f5aadd8fd9dbed33e1ebd85623bce4ea4c9d1e1bca64529b0122b2ba3c0e3d997327ba5f3e301643cc311ee2a711fa47ff8197564f75392a7f0f4d547c678a WHIRLPOOL 424535889add84e79b8643695d5d295a05142fa0291675b114364e62b8a01497cbf9f27ec6d18f37fec8ea12b5e0bf28c395907aa45a7b7d9bcc9c4a32fd4c1d -DIST moodle-2.8.8.tgz 35960643 SHA256 e5f9289edc847e84159a99767bf6621ddd930ef0aa1fd43d41d484e06f58d6f5 SHA512 bce2c99ad9f0bd4eea1a5d6896a4dc6e3deca08f34ef4e52a2905ca181191a606e6e92602cbdf0635e8d736e658633967e867f9816bf4a74a33af9b7eadf1010 WHIRLPOOL 3c4c028707ee059881eadf0ff18e58323da26102461a267e2219619b9ceeda96fad78a1f5e0102ebbbfa933975384682a5732040969fce410040502ed86323da -DIST moodle-2.9.2.tgz 36435068 SHA256 14599e518b95269aa770d00c29b45b8d3acab6308f6112197564205674b171c2 SHA512 5897c9ddc3f98e0c6f80f051684f9cf0f4da75f4ed7dd9e551000edf711d6e1ca2848af44677b0e93f80506f258d4eda5f236cbe00c1e0a264bae86f07621996 WHIRLPOOL c387f11751e464eeee3c7aa30cb254abce1a8035c5108a1f827d2be8cbaa174f102a40b66bd218db74b53e1c5a36a0e94aaeab3ca9e69f716d2425249e5f233f +DIST moodle-2.7.11.tgz 34998741 SHA256 8e7daf0d492dc78cbc3a50651b67b22c836329d696c5453bf0839c3fdd8b5838 SHA512 1fb085bc7e64be22479df568e73496d01042e1197b8d2d5f42a40341a0ec48b5127c1f18b96cb65af09dd8d7314cec35ad25372041399e2e436cb17ec3838101 WHIRLPOOL 27d64a1d65dc804bc8b5080782fbbd397aa4891fd3013964744bc64a1c9cd024ae5712f258554a42fa6f975a0310a514c6ea3b01f3f290d5e3fcd12ff3833130 +DIST moodle-2.8.9.tgz 35992485 SHA256 09fca589cdf4b63052e5319931e8c42ca2e0e53d5eeb12cab852ef84bb50f034 SHA512 6357d3902657056f2da685fb0ac230511c04f2ed54ceb380e637c06ee37e0c6765221aacebdc8c8901c6b646a0043d5c23ed91fd87eda2ebce0cc6128102e515 WHIRLPOOL f2631ba8f4aa01ec052f90ec8f9df37e93287493e0c11194a76422115ceb0a11631afb8d46402906c423a8d5667b0cbf23ee63a5fe112f232075d3788604fb52 +DIST moodle-2.9.3.tgz 36476693 SHA256 48f59bd77df53fb5f608da492f09c21eb7c8994c3ddce39fa7a9fd8e3e0e8f46 SHA512 fe98155f8ad3ddeab571aa6ecf71bb9f44e87801a3de8cca64b5341ed1a13f21d843804187016951dd105f1eec6ea25a95d53a405c3def5a5ac6ac738d14e0d7 WHIRLPOOL c64b2cb7033db84c4e0f7a9479b6bf74b2c615a8382168cb93f75825dc6c3b3760a8abfc0d99261a5c1e528b64a42113b8c9c19c20a68684eb50bd0072514c30 diff --git a/www-apps/moodle/moodle-2.7.10.ebuild b/www-apps/moodle/moodle-2.7.11.ebuild index 969d4d538dab..969d4d538dab 100644 --- a/www-apps/moodle/moodle-2.7.10.ebuild +++ b/www-apps/moodle/moodle-2.7.11.ebuild diff --git a/www-apps/moodle/moodle-2.8.8.ebuild b/www-apps/moodle/moodle-2.8.9.ebuild index 2ca271047681..2ca271047681 100644 --- a/www-apps/moodle/moodle-2.8.8.ebuild +++ b/www-apps/moodle/moodle-2.8.9.ebuild diff --git a/www-apps/moodle/moodle-2.9.2.ebuild b/www-apps/moodle/moodle-2.9.3.ebuild index 2ca271047681..2ca271047681 100644 --- a/www-apps/moodle/moodle-2.9.2.ebuild +++ b/www-apps/moodle/moodle-2.9.3.ebuild diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 3078dec30466..992db8973ece 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ DIST chromium-46.0.2490.71-lite.tar.xz 261722748 SHA256 28248eea8ee6855e6b5e41ff1cd28d8f5878896c2c388e113e419141c07dcbaf SHA512 e889739ab2783d617626e113642804c6e92bae08e4192b656c62f5efa57bee8db7eda2edc2e48a2245936f6c1a359ee55847c52a9d63588a0c5253332aeddd71 WHIRLPOOL b33fdc7f46dc90341acdb9cafd4854235479020d722fe6431c2e0e5626634eb0f8e1f34d0bb1f55adbc984c889f60f136f465bcc578005089f3b2b6360b57843 DIST chromium-47.0.2526.16-lite.tar.xz 302984700 SHA256 771deecde8d861e6ac7ba125113269566cad6a9dbdcf129eeac1005b38691096 SHA512 fed1e62c98ec2c21d7ff4b0357fdcd67b536b2bdf9eec3b043dd50127c073749cf8e138e7909481992ab3b4de4a47d34ede3bc348b4dad4964c4c2cd9cf52f84 WHIRLPOOL c45149bb9b91c215be65254680d878c5260ecdfb0a97325fd5726ad67d6fcedae8b70bb158ba1be1e10aed10cb6713625f444a85348c08098f25710df53be239 -DIST chromium-47.0.2526.6-lite.tar.xz 302688196 SHA256 c794fa33f97b0ab9b77a9438d8ba86cd1311d18241acd53a6f23df058f051279 SHA512 838ca886e78e03e53bc8c6c9d0bd89d04004a8befc5021cc13cc1ac0b30620cac88d543353518a413ea94be503fcb64c0810b8bd24c706afa64c5e4425e4827e WHIRLPOOL ee7636c223d63bd46f65da05839af4da369445afe427eefb268066a86c5819385c75cdc1abb8ec9506defe631b0e1ef29b6e71a1d8d7331edc63c3be3a90a82a +DIST chromium-47.0.2526.49-lite.tar.xz 317398984 SHA256 32fe2246fc25542475c9702853eef9299f097ddeeea7700f275965189da8ac8f SHA512 8d927c564d39182ff35f3089164cfacee12a81d6e46cd349e114ba97ad5a8d807dc24873ef1eccef36a9a75f83a7bb83552d89da4cb6141933ce1e0c07187963 WHIRLPOOL a99a3abc6698bb32dfaff2674e816431178653187cebcfacfdf549bd862e93dcd47405f484d2784ead2be5fb722dff2c88eaaac2aeae2d35a55af4ab87ac1f11 DIST chromium-48.0.2547.0-lite.tar.xz 306282056 SHA256 cfbdce75bd8904d4a43d5bc7acc82481bfe840c17894294cb0b3d79c2386cee2 SHA512 706c7e6699b7e07a819d29c88a678c62507251cb08ccd4516e2ce847519a34356d49762037a3fefac8adff39f1f9b7c0a6284fa455ffccd98e6074d1ac346d1f WHIRLPOOL 7694f443375dfdc17c90fd4b6c603b210b5e34ad39cfbe93ee9bcdebf0d5600f389b5ffd54fd3438460ffa88e4d456ad20e5b0553582b8ce0389f2bd7c7e15f5 DIST chromium-48.0.2552.0-lite.tar.xz 306545148 SHA256 ab72fd1e4ff9c2d2d8d931e12ba52395044cd136f1927c1cdb137fdef9dd0ad1 SHA512 1133d4670133ff9a18a2fbad08fcfb5cb2f28e9df092417ca17c0f5360767fa597eb85a0f55de7e2dc06e90a55068410da890664cc1bd071cc85631acebad16d WHIRLPOOL e13788bb8c21a06fc81c0bc2dfe03b13e19089eb8c59301c92666ec7745ac65a527f5a1179c9633194c63b562a2958154b0afc8c173e2a4db59eefada85580e0 diff --git a/www-client/chromium/chromium-47.0.2526.6.ebuild b/www-client/chromium/chromium-47.0.2526.49.ebuild index bb24b4ac678b..b46557dcf707 100644 --- a/www-client/chromium/chromium-47.0.2526.6.ebuild +++ b/www-client/chromium/chromium-47.0.2526.49.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD hotwording? ( no-source-code )" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="cups gnome gnome-keyring gtk3 hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" +IUSE="cups gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -378,6 +378,7 @@ src_configure() { $(gyp_use gnome-keyring use_gnome_keyring) $(gyp_use gnome-keyring linux_link_gnome_keyring) $(gyp_use gtk3) + $(gyp_use hangouts enable_hangout_services_extension) $(gyp_use hidpi enable_hidpi) $(gyp_use hotwording enable_hotwording) $(gyp_use kerberos) diff --git a/www-client/dillo/dillo-3.0.5.ebuild b/www-client/dillo/dillo-3.0.5.ebuild index 539f208decec..29c9fafffe14 100644 --- a/www-client/dillo/dillo-3.0.5.ebuild +++ b/www-client/dillo/dillo-3.0.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.dillo.org/download/${P}.tar.bz2 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd" IUSE="doc +gif ipv6 +jpeg +png ssl" RDEPEND=" diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 5691b2be3c30..de0ed3fcee79 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,7 +1,5 @@ DIST modsecurity-2.9.0.tar.gz 4246467 SHA256 e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434 SHA512 1af04f29bf23c51d03cdd3795c530f88b523a645aa02d776a6b23dcbc31decec7cd574919e5c7c7cf82684df2774062de5e465bddbbaf4c01a442c6d49401d3d WHIRLPOOL 1167ba6048a3ca05dcdabf03c67ae12720cca0cec74547fc223ee92ff76b6d5131785fa77b5f16da180e56590c851c192eaf02817b798e4d6f41fa6bfb2735a6 DIST nginx-1.8.0.tar.gz 832104 SHA256 23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5 SHA512 3e5d7e1b01839b2638251c47046149450b9b65985e611ef55e5953846e9eb0128c3708c695540ad4dfd0ce5e3060dfecb51213403048fab1a99dd5cea94f0038 WHIRLPOOL e4619e0e0454b86d725a21abe9300ad33ad700c4d577b33f1762b5af796093abd3c7b6afed38301dd0b2a235d6ff47db189b24fd19a5cbc777398bc237ae8534 -DIST nginx-1.9.4.tar.gz 866423 SHA256 479b0c03747ee6b2d4a21046f89b06d178a2881ea80cfef160451325788f2ba8 SHA512 6616b971361ded7a316a5718dffb2476dac0c625afb047595fbca0e24ea84391d3e0df88bc8d6a40747411094f8453a85c331d8089e51eecd1ac152898bb350a WHIRLPOOL a3e6699b81fbf33b24ae605a0cd113a76eac9f572a05e7b982f4dca3ede573fe425cddd21b136255ca7d0db8201babb2780fe7ba971dc4d62a4bc8545ddc8c67 -DIST nginx-1.9.5.tar.gz 884023 SHA256 48e2787a6b245277e37cb7c5a31b1549a0bbacf288aa4731baacf9eaacdb481b SHA512 a3f12ca919b9750141c323d58e5be32d1f6ed086c6ecf45c559baa911606cbae1bb3b2eafd84f67294b6b23366ef5be7d24edc1dae7b3fa5b3aff5ecbaefb31d WHIRLPOOL b1c6bb6062423f70904483041855caaf42e79edc1ba14e32d240bc541236afd4a8c287e23147ffa04136171c2bd37b5b77ee7ec872ee35fb8bce1ac6f4d0b866 DIST nginx-1.9.6.tar.gz 884733 SHA256 ed501fc6d0eff9d3bc1049cc1ba3a3ac8c602de046acb2a4c108392bbfa865ea SHA512 d42199542585dc2c4feeeb5a86462b96ccd008a72a067d9fa83ed6171f098f4f515a62df2b4bf4b169b1aa78eccb6099701caea6a805de784a0f4bfe2ce92716 WHIRLPOOL 137643033860520610d707cb04f262e78e349e27ba6ed3fd5b91c95d4f8aeca49fa96721f58f809f81ed457040aa1c05d7f37400912376bc454829b491dd4983 DIST nginx_http_sticky_module_ng-1.2.5.tar.bz2 124072 SHA256 f975c033eb3c342f7247f6524774bbb727aaf630ed984576dbafe5de7a790c58 SHA512 d6ae723f739efb2f0548461931b1c395801684759962beda08067111426b1c9787ceaede91b0e984c023108fd17864c53c53925506f7e8e25ec8d2fc065585f6 WHIRLPOOL 1013c6a51f5989c8131392b3d9704d42c99f9727a673f6205878d0b7dfd265bb6042c1d30089603c9b38e339d48302e6873e77fe380b7e8edba25b71e9e84ba6 DIST nginx_http_sticky_module_ng-1.2.6.tar.bz2 124089 SHA256 e47b9fd435d7a5a3200f945a9745aaa7b9446495bda76df48f211129f88d6b26 SHA512 2632b04c94f523aa7c9726db182cba11d83e642c2db5798274e67fbef30de95d02e4e95cbfb98bc429d4244d630b5d9617405b43f728ae0117a5c134940c0ded WHIRLPOOL 1b754c02f834c6b4d4930e9c46b8c5accb6c9663718fb9296c92d79bc33206e66e49e4234ca4db9a5afcd42fa23273bdf0e675aa7b38927c4e46a85318c189eb @@ -15,7 +13,6 @@ DIST ngx_http_fancyindex-0.3.5.tar.gz 14837 SHA256 e0998e83be58bc5787fa9243a76a9 DIST ngx_http_headers_more-0.26.tar.gz 28028 SHA256 d6bdc51f9e778a3b23e41a51cae542c1467a1e5e55c1329a7ffc454be084fb6f SHA512 842927de67d28f3cff596607f209d1004b6d49f1d45b861758405ed6fe6f7aab76ad63530ccdfff1c1947db1190dd65dee0a29f50026bfa7a39a9a051561cf88 WHIRLPOOL 0dc37c36717be40a07112388d913d20bc99d76f90604da618d5547f24d93c636c14c2cca18191ff5916b40ec0113da648cfc07e1c00b1853f2b15ce056d5f3d7 DIST ngx_http_headers_more-0.261.tar.gz 28022 SHA256 03d1f5fbecba8565f247d87a38f5e4b6440b0a56d752bdd2b29af2f1c4aea480 SHA512 252b5adc86f114460a956b38cca448917124523730e95ffc822a953232da9835e5ee663c65077413d655a8887ac692872b5de115e3cf4123463df7a84f759c3f WHIRLPOOL d97828ac45a1641210544a8b3ee21d86a8c2160fa665352992822b9a4cd7b8b48f9816afc124007e73467237a53615bff23a5cfbfad48bd04fefb9843335f1ee DIST ngx_http_lua-0.9.15.tar.gz 520190 SHA256 659fe4c201f4a4ae1007fa029cef472aaa837bf0904babb6158f83b86536c5b7 SHA512 1d809f873ced8e50422298bb4b730b8e7aaf442c11570cbe892fd73a414ff4f6d6eca7be8b2d2dbf57a136136b17d80596ee2f2f195dcb59776e78df5a94ae92 WHIRLPOOL caf128254f99d674eb370779c6e41c0b459be1c5a2baac7df1ff3498a38349bd2c140594eea3eb29c468a366e265421f90363886be73db0b3484cc6f386cb563 -DIST ngx_http_lua-0.9.16.tar.gz 523900 SHA256 a3cda55b8cba5bc6632aa270b8a02d543fdb43f4d60a3bd2cb411c2a3b467656 SHA512 01be7dca10c1c1f25d2b8e65c9944662d5ba0235ecccba1143f7c30dcb76fad847a4a2fa7a34055906a33d50ecf8fb463aac9f76581390035a88e48c9b9f5319 WHIRLPOOL 6f8c04f8d284d1fdcf69471a4590ad0381335ae64e6f0bc5b3ec4a13c8e7254d2363cbf23304f559997d7e5695832390bc187e18ee57b9c72c39c8ed5a98b7e0 DIST ngx_http_lua-0.9.17.tar.gz 540687 SHA256 68fba0cae22b11314968ba18d811991a95cade992aa76da3768af93d4b83b70f SHA512 3e140dff37443f2b2d9da28c4318741c7e8fb7e5d5f29b51745ed62517d3f5e873e1f86c0ade7e0d637aef0227c8a533699e8525292d8210f2b9eb41b3d7852a WHIRLPOOL a9e1e8a88b7339cb16f2e2f261afb81d175e14edd1b4987e300c7e0541a871a660128996f9b7de746f5846df4ff34d583379e8b9dae0658eca5438b0c146b96a DIST ngx_http_naxsi-0.53-2.tar.gz 165690 SHA256 3eadff1d91995beae41b92733ade28091c2075a24ae37058f4d6aa90b0f4b660 SHA512 ada592f5e7f80a6d549cc435ee8720df01a788dc88cf27a7d55521bb7e4c66fa11b9ec28216aff7e13c70a5faf12cb745bd398b8a782ed4dea1eecd04b07e24c WHIRLPOOL c5b736dbe9bd66daf7e023f176a08f78225b61990781d7ad5a55d0f35391df7e05bf1b2623a6227e0355cf0204ef9eac1b9fa03aa62b3c0d6eac515f1213f270 DIST ngx_http_naxsi-0.54.tar.gz 163809 SHA256 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 SHA512 91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43 WHIRLPOOL ef68cfecc9849086527c3590744d3c0d73cec830c6cf1ebca63566a7444438757a85d0c79fa552c4763e0416a615f4cf8d99622e2f36d3713b7072138a82f5a8 diff --git a/www-servers/nginx/nginx-1.9.4.ebuild b/www-servers/nginx/nginx-1.9.4.ebuild deleted file mode 100644 index 73c2e3b5d276..000000000000 --- a/www-servers/nginx/nginx-1.9.4.ebuild +++ /dev/null @@ -1,686 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# Maintainer notes: -# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite -# - any http-module activates the main http-functionality and overrides USE=-http -# - keep the following requirements in mind before adding external modules: -# * alive upstream -# * sane packaging -# * builds cleanly -# * does not need a patch for nginx core -# - TODO: test the google-perftools module (included in vanilla tarball) - -# prevent perl-module from adding automagic perl DEPENDs -GENTOO_DEPEND_ON_PERL="no" - -# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license) -DEVEL_KIT_MODULE_PV="0.2.19" -DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1" -DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz" -DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" - -# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) -HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1" -HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1" -HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz" -HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" - -# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license) -HTTP_HEADERS_MORE_MODULE_PV="0.26" -HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}" -HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz" -HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}" - -# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license) -HTTP_CACHE_PURGE_MODULE_PV="2.3" -HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" -HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz" -HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" - -# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) -HTTP_SLOWFS_CACHE_MODULE_PV="1.10" -HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" -HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz" -HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" - -# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license) -HTTP_FANCYINDEX_MODULE_PV="0.3.5" -HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" -HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz" -HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" - -# http_lua (https://github.com/openresty/lua-nginx-module, BSD license) -HTTP_LUA_MODULE_PV="0.9.16" -HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}" -HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz" -HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}" - -# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license) -HTTP_AUTH_PAM_MODULE_PV="1.4" -HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}" -HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz" -HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}" - -# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license) -HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0" -HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}" -HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz" -HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}" - -# http_metrics (https://github.com/zenops/ngx_metrics, BSD license) -HTTP_METRICS_MODULE_PV="0.1.1" -HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}" -HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz" -HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}" - -# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) -HTTP_NAXSI_MODULE_PV="0.53-2" -HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}" -HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz" -HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src" - -# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license) -RTMP_MODULE_PV="1.1.7" -RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}" -RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz" -RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}" - -# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license) -HTTP_DAV_EXT_MODULE_PV="0.0.3" -HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}" -HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz" -HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}" - -# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license) -HTTP_ECHO_MODULE_PV="0.58" -HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}" -HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz" -HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}" - -# mod_security for nginx (https://modsecurity.org/, Apache-2.0) -# keep the MODULE_P here consistent with upstream to avoid tarball duplication -HTTP_SECURITY_MODULE_PV="2.9.0" -HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}" -HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz" -HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}" - -# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3) -HTTP_PUSH_STREAM_MODULE_PV="0.5.1" -HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}" -HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz" -HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}" - -# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2) -HTTP_STICKY_MODULE_PV="1.2.6" -HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}" -HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2" -HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d" - -# mogilefs-module (http://www.grid.net.ru/nginx/mogilefs.en.html, BSD-2) -HTTP_MOGILEFS_MODULE_PV="1.0.4" -HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" -HTTP_MOGILEFS_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}.tar.gz" -HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" - -# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2) -HTTP_MEMC_MODULE_PV="0.16" -HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}" -HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz" -HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}" - -inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib - -DESCRIPTION="Robust, small and high performance http and reverse proxy server" -HOMEPAGE="http://nginx.org" -SRC_URI="http://nginx.org/download/${P}.tar.gz - ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz - nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) - nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) - nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz ) - nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz ) - nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) - nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz ) - nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) - nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) - nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) - nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz ) - rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz ) - nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz ) - nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz ) - nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) - nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz ) - nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 ) - nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz ) - nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )" - -LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ - nginx_modules_http_security? ( Apache-2.0 ) - nginx_modules_http_push_stream? ( GPL-3 )" - -SLOT="mainline" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi -geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi -split_clients upstream_ip_hash userid uwsgi" -NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static -image_filter mp4 perl random_index realip secure_link spdy stub_status sub xslt" -NGINX_MODULES_MAIL="imap pop3 smtp" -NGINX_MODULES_3RD=" - http_upload_progress - http_headers_more - http_cache_purge - http_slowfs_cache - http_fancyindex - http_lua - http_auth_pam - http_upstream_check - http_metrics - http_naxsi - http_dav_ext - http_echo - http_security - http_push_stream - http_sticky - http_ajp - http_mogilefs - http_memc" - -IUSE="aio debug +http +http-cache ipv6 libatomic luajit +pcre pcre-jit rtmp -selinux ssl threads userland_GNU vim-syntax" - -for mod in $NGINX_MODULES_STD; do - IUSE="${IUSE} +nginx_modules_http_${mod}" -done - -for mod in $NGINX_MODULES_OPT; do - IUSE="${IUSE} nginx_modules_http_${mod}" -done - -for mod in $NGINX_MODULES_MAIL; do - IUSE="${IUSE} nginx_modules_mail_${mod}" -done - -for mod in $NGINX_MODULES_3RD; do - IUSE="${IUSE} nginx_modules_${mod}" -done - -CDEPEND=" - pcre? ( >=dev-libs/libpcre-4.2 ) - pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) - ssl? ( dev-libs/openssl:0= ) - http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) ) - nginx_modules_http_geoip? ( dev-libs/geoip ) - nginx_modules_http_gunzip? ( sys-libs/zlib ) - nginx_modules_http_gzip? ( sys-libs/zlib ) - nginx_modules_http_gzip_static? ( sys-libs/zlib ) - nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) - nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) - nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) - nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) ) - nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1c:0= ) - nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) - nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) - nginx_modules_http_auth_pam? ( virtual/pam ) - nginx_modules_http_metrics? ( dev-libs/yajl ) - nginx_modules_http_dav_ext? ( dev-libs/expat ) - nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-nginx ) - !www-servers/nginx:0" -DEPEND="${CDEPEND} - arm? ( dev-libs/libatomic_ops ) - libatomic? ( dev-libs/libatomic_ops )" -PDEPEND="vim-syntax? ( app-vim/nginx-syntax )" - -REQUIRED_USE="pcre-jit? ( pcre ) - nginx_modules_http_lua? ( nginx_modules_http_rewrite ) - nginx_modules_http_naxsi? ( pcre ) - nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) - nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) - nginx_modules_http_security? ( pcre ) - nginx_modules_http_push_stream? ( ssl )" - -pkg_setup() { - NGINX_HOME="/var/lib/nginx" - NGINX_HOME_TMP="${NGINX_HOME}/tmp" - - ebegin "Creating nginx user and group" - enewgroup ${PN} - enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN} - eend $? - - if use libatomic; then - ewarn "GCC 4.1+ features built-in atomic operations." - ewarn "Using libatomic_ops is only needed if using" - ewarn "a different compiler or a GCC prior to 4.1" - fi - - if [[ -n $NGINX_ADD_MODULES ]]; then - ewarn "You are building custom modules via \$NGINX_ADD_MODULES!" - ewarn "This nginx installation is not supported!" - ewarn "Make sure you can reproduce the bug without those modules" - ewarn "_before_ reporting bugs." - fi - - if use !http; then - ewarn "To actually disable all http-functionality you also have to disable" - ewarn "all nginx http modules." - fi - - if use nginx_modules_http_ajp; then - eerror "The AJP module currently doesn't build for nginx >1.8." - eerror "It will be reintroduced with the 1.9 series when proven stable." - eerror "Either disable it or stick with nginx 1.7.x." - die "AJP module not supported" - fi - - if use nginx_modules_http_mogilefs && use threads; then - eerror "mogilefs won't compile with threads support." - eerror "Please disable either flag and try again." - die "Can't compile mogilefs with threads support" - fi -} - -src_prepare() { - epatch_user - - epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch" - - if use nginx_modules_http_upstream_check; then - epatch "${FILESDIR}/check-1.9.2".patch - fi - - if use nginx_modules_http_lua; then - sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die - fi - - find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die - # We have config protection, don't rename etc files - sed -i 's:.default::' auto/install || die - # remove useless files - sed -i -e '/koi-/d' -e '/win-/d' auto/install || die - - # don't install to /etc/nginx/ if not in use - local module - for module in fastcgi scgi uwsgi ; do - if ! use nginx_modules_http_${module}; then - sed -i -e "/${module}/d" auto/install || die - fi - done -} - -src_configure() { - # mod_security needs to generate nginx/modsecurity/config before including it - if use nginx_modules_http_security; then - cd "${HTTP_SECURITY_MODULE_WD}" - if use luajit ; then - sed -i \ - -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \ - configure || die - fi - ./configure \ - --enable-standalone-module \ - $(use_enable pcre-jit) \ - $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security" - fi - - cd "${S}" - - local myconf=() http_enabled= mail_enabled= - - use aio && myconf+=( --with-file-aio ) - use debug && myconf+=( --with-debug ) - use ipv6 && myconf+=( --with-ipv6 ) - use libatomic && myconf+=( --with-libatomic ) - use pcre && myconf+=( --with-pcre ) - use pcre-jit && myconf+=( --with-pcre-jit ) - use threads && myconf+=( --with-threads ) - - # HTTP modules - for mod in $NGINX_MODULES_STD; do - if use nginx_modules_http_${mod}; then - http_enabled=1 - else - myconf+=( --without-http_${mod}_module ) - fi - done - - for mod in $NGINX_MODULES_OPT; do - if use nginx_modules_http_${mod}; then - http_enabled=1 - myconf+=( --with-http_${mod}_module ) - fi - done - - if use nginx_modules_http_fastcgi; then - myconf+=( --with-http_realip_module ) - fi - - # third-party modules - if use nginx_modules_http_upload_progress; then - http_enabled=1 - myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} ) - fi - - if use nginx_modules_http_headers_more; then - http_enabled=1 - myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} ) - fi - - if use nginx_modules_http_cache_purge; then - http_enabled=1 - myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} ) - fi - - if use nginx_modules_http_slowfs_cache; then - http_enabled=1 - myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} ) - fi - - if use nginx_modules_http_fancyindex; then - http_enabled=1 - myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} ) - fi - - if use nginx_modules_http_lua; then - http_enabled=1 - if use luajit; then - export LUAJIT_LIB=$(pkg-config --variable libdir luajit) - export LUAJIT_INC=$(pkg-config --variable includedir luajit) - else - export LUA_LIB=$(pkg-config --variable libdir lua) - export LUA_INC=$(pkg-config --variable includedir lua) - fi - myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} ) - myconf+=( --add-module=${HTTP_LUA_MODULE_WD} ) - fi - - if use nginx_modules_http_auth_pam; then - http_enabled=1 - myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} ) - fi - - if use nginx_modules_http_upstream_check; then - http_enabled=1 - myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} ) - fi - - if use nginx_modules_http_metrics; then - http_enabled=1 - myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} ) - fi - - if use nginx_modules_http_naxsi ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} ) - fi - - if use rtmp ; then - http_enabled=1 - myconf+=( --add-module=${RTMP_MODULE_WD} ) - fi - - if use nginx_modules_http_dav_ext ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} ) - fi - - if use nginx_modules_http_echo ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} ) - fi - - if use nginx_modules_http_security ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity ) - fi - - if use nginx_modules_http_push_stream ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} ) - fi - - if use nginx_modules_http_sticky ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} ) - fi - - if use nginx_modules_http_mogilefs ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} ) - fi - - if use nginx_modules_http_memc ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} ) - fi - - if use http || use http-cache; then - http_enabled=1 - fi - - if [ $http_enabled ]; then - use http-cache || myconf+=( --without-http-cache ) - use ssl && myconf+=( --with-http_ssl_module ) - else - myconf+=( --without-http --without-http-cache ) - fi - - # MAIL modules - for mod in $NGINX_MODULES_MAIL; do - if use nginx_modules_mail_${mod}; then - mail_enabled=1 - else - myconf+=( --without-mail_${mod}_module ) - fi - done - - if [ $mail_enabled ]; then - myconf+=( --with-mail ) - use ssl && myconf+=( --with-mail_ssl_module ) - fi - - # custom modules - for mod in $NGINX_ADD_MODULES; do - myconf+=( --add-module=${mod} ) - done - - # https://bugs.gentoo.org/286772 - export LANG=C LC_ALL=C - tc-export CC - - if ! use prefix; then - myconf+=( --user=${PN}" "--group=${PN} ) - fi - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \ - --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ - --pid-path="${EPREFIX}"/run/${PN}.pid \ - --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}usr/include" \ - --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ - --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ - --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ - --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ - --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \ - --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \ - --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \ - "${myconf[@]}" || die "configure failed" - - # A purely cosmetic change that makes nginx -V more readable. This can be - # good if people outside the gentoo community would troubleshoot and - # question the users setup. - sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die -} - -src_compile() { - use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}" - - # https://bugs.gentoo.org/286772 - export LANG=C LC_ALL=C - emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" -} - -src_install() { - emake DESTDIR="${D%/}" install - - cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die - - newinitd "${FILESDIR}"/nginx.initd-r2 nginx - - systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service - - doman man/nginx.8 - dodoc CHANGES* README - - # just keepdir. do not copy the default htdocs files (bug #449136) - keepdir /var/www/localhost - rm -rf "${D}"usr/html || die - - # set up a list of directories to keep - local keepdir_list="${NGINX_HOME_TMP}"/client - local module - for module in proxy fastcgi scgi uwsgi; do - use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}" - done - - keepdir /var/log/nginx ${keepdir_list} - - # this solves a problem with SELinux where nginx doesn't see the directories - # as root and tries to create them as nginx - fperms 0750 "${NGINX_HOME_TMP}" - fowners ${PN}:0 "${NGINX_HOME_TMP}" - - fperms 0700 /var/log/nginx ${keepdir_list} - fowners ${PN}:${PN} /var/log/nginx ${keepdir_list} - - # logrotate - insinto /etc/logrotate.d - newins "${FILESDIR}"/nginx.logrotate-r1 nginx - - if use nginx_modules_http_perl; then - cd "${S}"/objs/src/http/modules/perl/ - emake DESTDIR="${D}" INSTALLDIRS=vendor - perl_delete_localpod - fi - - if use nginx_modules_http_cache_purge; then - docinto ${HTTP_CACHE_PURGE_MODULE_P} - dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} - fi - - if use nginx_modules_http_slowfs_cache; then - docinto ${HTTP_SLOWFS_CACHE_MODULE_P} - dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md} - fi - - if use nginx_modules_http_fancyindex; then - docinto ${HTTP_FANCYINDEX_MODULE_P} - dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst - fi - - if use nginx_modules_http_lua; then - docinto ${HTTP_LUA_MODULE_P} - dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown} - fi - - if use nginx_modules_http_auth_pam; then - docinto ${HTTP_AUTH_PAM_MODULE_P} - dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog} - fi - - if use nginx_modules_http_upstream_check; then - docinto ${HTTP_UPSTREAM_CHECK_MODULE_P} - dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES} - fi - - if use nginx_modules_http_naxsi; then - insinto /etc/nginx - doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules - fi - - if use rtmp; then - docinto ${RTMP_MODULE_P} - dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl} - fi - - if use nginx_modules_http_dav_ext; then - docinto ${HTTP_DAV_EXT_MODULE_P} - dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README - fi - - if use nginx_modules_http_echo; then - docinto ${HTTP_ECHO_MODULE_P} - dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki} - fi - - if use nginx_modules_http_security; then - docinto ${HTTP_SECURITY_MODULE_P} - dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt} - fi - - if use nginx_modules_http_push_stream; then - docinto ${HTTP_PUSH_STREAM_MODULE_P} - dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile} - fi - - if use nginx_modules_http_sticky; then - docinto ${HTTP_STICKY_MODULE_P} - dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf} - fi - - if use nginx_modules_http_memc; then - docinto ${HTTP_MEMC_MODULE_P} - dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown - fi -} - -pkg_postinst() { - if use ssl; then - if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then - install_cert /etc/ssl/${PN}/${PN} - use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem} - fi - fi - - if use nginx_modules_http_lua && use nginx_modules_http_spdy; then - ewarn "Lua 3rd party module author warns against using ${P} with" - ewarn "NGINX_MODULES_HTTP=\"lua spdy\". For more info, see http://git.io/OldLsg" - fi - - # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for - # existing installations - local fix_perms=0 - - for rv in ${REPLACING_VERSIONS} ; do - version_compare ${rv} 1.4.1-r2 - [[ $? -eq 1 ]] && fix_perms=1 - done - - if [[ $fix_perms -eq 1 ]] ; then - ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following" - ewarn "directories the world-readable bit removed (if set):" - ewarn " ${EPREFIX}/var/log/nginx" - ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" - ewarn "Check if this is correct for your setup before restarting nginx!" - ewarn "This is a one-time change and will not happen on subsequent updates." - ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}" - chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi} - fi - - # If the nginx user can't change into or read the dir, display a warning. - # If su is not available we display the warning nevertheless since we can't check properly - su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null - if [ $? -ne 0 ] ; then - ewarn "Please make sure that the nginx user or group has at least" - ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)" - ewarn "Otherwise you end up with empty log files after a logrotate." - fi -} diff --git a/www-servers/nginx/nginx-1.9.5.ebuild b/www-servers/nginx/nginx-1.9.5.ebuild deleted file mode 100644 index a266b79c8aac..000000000000 --- a/www-servers/nginx/nginx-1.9.5.ebuild +++ /dev/null @@ -1,695 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# Maintainer notes: -# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite -# - any http-module activates the main http-functionality and overrides USE=-http -# - keep the following requirements in mind before adding external modules: -# * alive upstream -# * sane packaging -# * builds cleanly -# * does not need a patch for nginx core -# - TODO: test the google-perftools module (included in vanilla tarball) - -# prevent perl-module from adding automagic perl DEPENDs -GENTOO_DEPEND_ON_PERL="no" - -# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license) -DEVEL_KIT_MODULE_PV="0.2.19" -DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1" -DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz" -DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" - -# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) -HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1" -HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1" -HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz" -HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" - -# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license) -HTTP_HEADERS_MORE_MODULE_PV="0.261" -HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}" -HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz" -HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}" - -# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license) -HTTP_CACHE_PURGE_MODULE_PV="2.3" -HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" -HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz" -HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" - -# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) -HTTP_SLOWFS_CACHE_MODULE_PV="1.10" -HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" -HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz" -HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" - -# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license) -HTTP_FANCYINDEX_MODULE_PV="0.3.5" -HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" -HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz" -HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" - -# http_lua (https://github.com/openresty/lua-nginx-module, BSD license) -HTTP_LUA_MODULE_PV="0.9.16" -HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}" -HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz" -HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}" - -# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license) -HTTP_AUTH_PAM_MODULE_PV="1.4" -HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}" -HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz" -HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}" - -# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license) -HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0" -HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}" -HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz" -HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}" - -# http_metrics (https://github.com/zenops/ngx_metrics, BSD license) -HTTP_METRICS_MODULE_PV="0.1.1" -HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}" -HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz" -HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}" - -# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) -HTTP_NAXSI_MODULE_PV="0.54" -HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}" -HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz" -HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src" - -# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license) -RTMP_MODULE_PV="1.1.7" -RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}" -RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz" -RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}" - -# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license) -HTTP_DAV_EXT_MODULE_PV="0.0.3" -HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}" -HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz" -HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}" - -# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license) -HTTP_ECHO_MODULE_PV="0.58" -HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}" -HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz" -HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}" - -# mod_security for nginx (https://modsecurity.org/, Apache-2.0) -# keep the MODULE_P here consistent with upstream to avoid tarball duplication -HTTP_SECURITY_MODULE_PV="2.9.0" -HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}" -HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz" -HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}" - -# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3) -HTTP_PUSH_STREAM_MODULE_PV="0.5.1" -HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}" -HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz" -HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}" - -# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2) -HTTP_STICKY_MODULE_PV="1.2.6" -HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}" -HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2" -HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d" - -# mogilefs-module (http://www.grid.net.ru/nginx/mogilefs.en.html, BSD-2) -HTTP_MOGILEFS_MODULE_PV="1.0.4" -HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" -HTTP_MOGILEFS_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}.tar.gz" -HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}" - -# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2) -HTTP_MEMC_MODULE_PV="0.16" -HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}" -HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz" -HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}" - -inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib - -DESCRIPTION="Robust, small and high performance http and reverse proxy server" -HOMEPAGE="http://nginx.org" -SRC_URI="http://nginx.org/download/${P}.tar.gz - ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz - nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) - nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) - nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz ) - nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz ) - nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) - nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz ) - nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) - nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) - nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) - nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz ) - rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz ) - nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz ) - nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz ) - nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) - nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz ) - nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 ) - nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz ) - nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )" - -LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ - nginx_modules_http_security? ( Apache-2.0 ) - nginx_modules_http_push_stream? ( GPL-3 )" - -SLOT="mainline" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi -geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi -split_clients upstream_ip_hash userid uwsgi" -NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static -image_filter mp4 perl random_index realip secure_link stub_status sub xslt" -NGINX_MODULES_MAIL="imap pop3 smtp" -NGINX_MODULES_3RD=" - http_upload_progress - http_headers_more - http_cache_purge - http_slowfs_cache - http_fancyindex - http_lua - http_auth_pam - http_upstream_check - http_metrics - http_naxsi - http_dav_ext - http_echo - http_security - http_push_stream - http_sticky - http_ajp - http_mogilefs - http_memc" - -IUSE="aio debug +http http2 +http-cache ipv6 libatomic luajit +pcre pcre-jit rtmp -selinux ssl threads userland_GNU vim-syntax" - -for mod in $NGINX_MODULES_STD; do - IUSE="${IUSE} +nginx_modules_http_${mod}" -done - -for mod in $NGINX_MODULES_OPT; do - IUSE="${IUSE} nginx_modules_http_${mod}" -done - -for mod in $NGINX_MODULES_MAIL; do - IUSE="${IUSE} nginx_modules_mail_${mod}" -done - -for mod in $NGINX_MODULES_3RD; do - IUSE="${IUSE} nginx_modules_${mod}" -done - -# Add so we can warn users updating about config changes -IUSE="${IUSE} nginx_modules_http_spdy" - -CDEPEND=" - pcre? ( >=dev-libs/libpcre-4.2 ) - pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) - ssl? ( dev-libs/openssl:0= ) - http2? ( >=dev-libs/openssl-1.0.1c:0= ) - http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) ) - nginx_modules_http_geoip? ( dev-libs/geoip ) - nginx_modules_http_gunzip? ( sys-libs/zlib ) - nginx_modules_http_gzip? ( sys-libs/zlib ) - nginx_modules_http_gzip_static? ( sys-libs/zlib ) - nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) - nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) - nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) - nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) ) - nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) - nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) - nginx_modules_http_auth_pam? ( virtual/pam ) - nginx_modules_http_metrics? ( dev-libs/yajl ) - nginx_modules_http_dav_ext? ( dev-libs/expat ) - nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-nginx ) - !www-servers/nginx:0" -DEPEND="${CDEPEND} - arm? ( dev-libs/libatomic_ops ) - libatomic? ( dev-libs/libatomic_ops )" -PDEPEND="vim-syntax? ( app-vim/nginx-syntax )" - -REQUIRED_USE="pcre-jit? ( pcre ) - nginx_modules_http_lua? ( nginx_modules_http_rewrite ) - nginx_modules_http_naxsi? ( pcre ) - nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) - nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) - nginx_modules_http_security? ( pcre ) - nginx_modules_http_push_stream? ( ssl )" - -pkg_setup() { - NGINX_HOME="/var/lib/nginx" - NGINX_HOME_TMP="${NGINX_HOME}/tmp" - - ebegin "Creating nginx user and group" - enewgroup ${PN} - enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN} - eend $? - - if use libatomic; then - ewarn "GCC 4.1+ features built-in atomic operations." - ewarn "Using libatomic_ops is only needed if using" - ewarn "a different compiler or a GCC prior to 4.1" - fi - - if [[ -n $NGINX_ADD_MODULES ]]; then - ewarn "You are building custom modules via \$NGINX_ADD_MODULES!" - ewarn "This nginx installation is not supported!" - ewarn "Make sure you can reproduce the bug without those modules" - ewarn "_before_ reporting bugs." - fi - - if use !http; then - ewarn "To actually disable all http-functionality you also have to disable" - ewarn "all nginx http modules." - fi - - if use nginx_modules_http_ajp; then - eerror "The AJP module currently doesn't build for nginx >1.8." - eerror "It will be reintroduced with the 1.9 series when proven stable." - eerror "Either disable it or stick with nginx 1.7.x." - die "AJP module not supported" - fi - - if use nginx_modules_http_mogilefs && use threads; then - eerror "mogilefs won't compile with threads support." - eerror "Please disable either flag and try again." - die "Can't compile mogilefs with threads support" - fi -} - -src_prepare() { - epatch_user - - epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch" - - if use nginx_modules_http_upstream_check; then - epatch "${FILESDIR}/check-1.9.2".patch - fi - - if use nginx_modules_http_lua; then - sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die - fi - - find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die - # We have config protection, don't rename etc files - sed -i 's:.default::' auto/install || die - # remove useless files - sed -i -e '/koi-/d' -e '/win-/d' auto/install || die - - # don't install to /etc/nginx/ if not in use - local module - for module in fastcgi scgi uwsgi ; do - if ! use nginx_modules_http_${module}; then - sed -i -e "/${module}/d" auto/install || die - fi - done -} - -src_configure() { - # mod_security needs to generate nginx/modsecurity/config before including it - if use nginx_modules_http_security; then - cd "${HTTP_SECURITY_MODULE_WD}" - if use luajit ; then - sed -i \ - -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \ - configure || die - fi - ./configure \ - --enable-standalone-module \ - $(use_enable pcre-jit) \ - $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security" - fi - - cd "${S}" - - local myconf=() http_enabled= mail_enabled= - - use aio && myconf+=( --with-file-aio ) - use debug && myconf+=( --with-debug ) - use http2 && myconf+=( --with-http_v2_module ) - use ipv6 && myconf+=( --with-ipv6 ) - use libatomic && myconf+=( --with-libatomic ) - use pcre && myconf+=( --with-pcre ) - use pcre-jit && myconf+=( --with-pcre-jit ) - use threads && myconf+=( --with-threads ) - - # HTTP modules - for mod in $NGINX_MODULES_STD; do - if use nginx_modules_http_${mod}; then - http_enabled=1 - else - myconf+=( --without-http_${mod}_module ) - fi - done - - for mod in $NGINX_MODULES_OPT; do - if use nginx_modules_http_${mod}; then - http_enabled=1 - myconf+=( --with-http_${mod}_module ) - fi - done - - if use nginx_modules_http_fastcgi; then - myconf+=( --with-http_realip_module ) - fi - - # third-party modules - if use nginx_modules_http_upload_progress; then - http_enabled=1 - myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} ) - fi - - if use nginx_modules_http_headers_more; then - http_enabled=1 - myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} ) - fi - - if use nginx_modules_http_cache_purge; then - http_enabled=1 - myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} ) - fi - - if use nginx_modules_http_slowfs_cache; then - http_enabled=1 - myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} ) - fi - - if use nginx_modules_http_fancyindex; then - http_enabled=1 - myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} ) - fi - - if use nginx_modules_http_lua; then - http_enabled=1 - if use luajit; then - export LUAJIT_LIB=$(pkg-config --variable libdir luajit) - export LUAJIT_INC=$(pkg-config --variable includedir luajit) - else - export LUA_LIB=$(pkg-config --variable libdir lua) - export LUA_INC=$(pkg-config --variable includedir lua) - fi - myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} ) - myconf+=( --add-module=${HTTP_LUA_MODULE_WD} ) - fi - - if use nginx_modules_http_auth_pam; then - http_enabled=1 - myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} ) - fi - - if use nginx_modules_http_upstream_check; then - http_enabled=1 - myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} ) - fi - - if use nginx_modules_http_metrics; then - http_enabled=1 - myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} ) - fi - - if use nginx_modules_http_naxsi ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} ) - fi - - if use rtmp ; then - http_enabled=1 - myconf+=( --add-module=${RTMP_MODULE_WD} ) - fi - - if use nginx_modules_http_dav_ext ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} ) - fi - - if use nginx_modules_http_echo ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} ) - fi - - if use nginx_modules_http_security ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity ) - fi - - if use nginx_modules_http_push_stream ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} ) - fi - - if use nginx_modules_http_sticky ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} ) - fi - - if use nginx_modules_http_mogilefs ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} ) - fi - - if use nginx_modules_http_memc ; then - http_enabled=1 - myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} ) - fi - - if use http || use http-cache || use http2; then - http_enabled=1 - fi - - if [ $http_enabled ]; then - use http-cache || myconf+=( --without-http-cache ) - use ssl && myconf+=( --with-http_ssl_module ) - else - myconf+=( --without-http --without-http-cache ) - fi - - # MAIL modules - for mod in $NGINX_MODULES_MAIL; do - if use nginx_modules_mail_${mod}; then - mail_enabled=1 - else - myconf+=( --without-mail_${mod}_module ) - fi - done - - if [ $mail_enabled ]; then - myconf+=( --with-mail ) - use ssl && myconf+=( --with-mail_ssl_module ) - fi - - # custom modules - for mod in $NGINX_ADD_MODULES; do - myconf+=( --add-module=${mod} ) - done - - # https://bugs.gentoo.org/286772 - export LANG=C LC_ALL=C - tc-export CC - - if ! use prefix; then - myconf+=( --user=${PN}" "--group=${PN} ) - fi - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \ - --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ - --pid-path="${EPREFIX}"/run/${PN}.pid \ - --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}usr/include" \ - --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ - --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ - --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ - --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ - --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \ - --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \ - --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \ - "${myconf[@]}" || die "configure failed" - - # A purely cosmetic change that makes nginx -V more readable. This can be - # good if people outside the gentoo community would troubleshoot and - # question the users setup. - sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die -} - -src_compile() { - use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}" - - # https://bugs.gentoo.org/286772 - export LANG=C LC_ALL=C - emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" -} - -src_install() { - emake DESTDIR="${D%/}" install - - cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die - - newinitd "${FILESDIR}"/nginx.initd-r2 nginx - - systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service - - doman man/nginx.8 - dodoc CHANGES* README - - # just keepdir. do not copy the default htdocs files (bug #449136) - keepdir /var/www/localhost - rm -rf "${D}"usr/html || die - - # set up a list of directories to keep - local keepdir_list="${NGINX_HOME_TMP}"/client - local module - for module in proxy fastcgi scgi uwsgi; do - use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}" - done - - keepdir /var/log/nginx ${keepdir_list} - - # this solves a problem with SELinux where nginx doesn't see the directories - # as root and tries to create them as nginx - fperms 0750 "${NGINX_HOME_TMP}" - fowners ${PN}:0 "${NGINX_HOME_TMP}" - - fperms 0700 /var/log/nginx ${keepdir_list} - fowners ${PN}:${PN} /var/log/nginx ${keepdir_list} - - # logrotate - insinto /etc/logrotate.d - newins "${FILESDIR}"/nginx.logrotate-r1 nginx - - if use nginx_modules_http_perl; then - cd "${S}"/objs/src/http/modules/perl/ - emake DESTDIR="${D}" INSTALLDIRS=vendor - perl_delete_localpod - fi - - if use nginx_modules_http_cache_purge; then - docinto ${HTTP_CACHE_PURGE_MODULE_P} - dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} - fi - - if use nginx_modules_http_slowfs_cache; then - docinto ${HTTP_SLOWFS_CACHE_MODULE_P} - dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md} - fi - - if use nginx_modules_http_fancyindex; then - docinto ${HTTP_FANCYINDEX_MODULE_P} - dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst - fi - - if use nginx_modules_http_lua; then - docinto ${HTTP_LUA_MODULE_P} - dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown} - fi - - if use nginx_modules_http_auth_pam; then - docinto ${HTTP_AUTH_PAM_MODULE_P} - dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog} - fi - - if use nginx_modules_http_upstream_check; then - docinto ${HTTP_UPSTREAM_CHECK_MODULE_P} - dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES} - fi - - if use nginx_modules_http_naxsi; then - insinto /etc/nginx - doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules - fi - - if use rtmp; then - docinto ${RTMP_MODULE_P} - dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl} - fi - - if use nginx_modules_http_dav_ext; then - docinto ${HTTP_DAV_EXT_MODULE_P} - dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README - fi - - if use nginx_modules_http_echo; then - docinto ${HTTP_ECHO_MODULE_P} - dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki} - fi - - if use nginx_modules_http_security; then - docinto ${HTTP_SECURITY_MODULE_P} - dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt} - fi - - if use nginx_modules_http_push_stream; then - docinto ${HTTP_PUSH_STREAM_MODULE_P} - dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile} - fi - - if use nginx_modules_http_sticky; then - docinto ${HTTP_STICKY_MODULE_P} - dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf} - fi - - if use nginx_modules_http_memc; then - docinto ${HTTP_MEMC_MODULE_P} - dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown - fi -} - -pkg_postinst() { - if use ssl; then - if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then - install_cert /etc/ssl/${PN}/${PN} - use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem} - fi - fi - - if use nginx_modules_http_spdy; then - ewarn "In nginx 1.9.5 the spdy module was superseded by http2." - ewarn "Update your configs and package.use accordingly." - fi - - if use nginx_modules_http_lua && use http2; then - ewarn "Lua 3rd party module author warns against using ${P} with" - ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg" - fi - - # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for - # existing installations - local fix_perms=0 - - for rv in ${REPLACING_VERSIONS} ; do - version_compare ${rv} 1.4.1-r2 - [[ $? -eq 1 ]] && fix_perms=1 - done - - if [[ $fix_perms -eq 1 ]] ; then - ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following" - ewarn "directories the world-readable bit removed (if set):" - ewarn " ${EPREFIX}/var/log/nginx" - ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" - ewarn "Check if this is correct for your setup before restarting nginx!" - ewarn "This is a one-time change and will not happen on subsequent updates." - ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}" - chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi} - fi - - # If the nginx user can't change into or read the dir, display a warning. - # If su is not available we display the warning nevertheless since we can't check properly - su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null - if [ $? -ne 0 ] ; then - ewarn "Please make sure that the nginx user or group has at least" - ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)" - ewarn "Otherwise you end up with empty log files after a logrotate." - fi -} diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest index 936b7f800c82..10026eed2f2a 100644 --- a/www-servers/resin/Manifest +++ b/www-servers/resin/Manifest @@ -1 +1,2 @@ DIST resin-4.0.44-src.zip 40342346 SHA256 dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512 bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8 WHIRLPOOL bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa +DIST resin-4.0.46-src.zip 40400255 SHA256 e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f WHIRLPOOL a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238 diff --git a/www-servers/resin/files/4.0.46/build.xml.patch b/www-servers/resin/files/4.0.46/build.xml.patch new file mode 100644 index 000000000000..dc3a413fc0bf --- /dev/null +++ b/www-servers/resin/files/4.0.46/build.xml.patch @@ -0,0 +1,59 @@ +--- build.xml.orig 2015-08-12 23:14:20.302000000 +0000 ++++ build.xml 2015-08-12 23:14:47.909000000 +0000 +@@ -12,7 +12,7 @@ + <property name="eclipse.home" value="${user.home}/eclipse"/> + + <target name="compile" +- depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink, gae, jasper"> ++ depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, gae"> + </target> + + <!-- +@@ -27,10 +27,6 @@ + </antcall> + </target> + --> +- <target name="resin-eclipselink" depends="eclipselink"> +- <copy file="modules/eclipselink/dist/resin-eclipselink.jar" +- todir="${resin.lib}"/> +- </target> + + <target name="richfaces" depends="init"> + <antcall target="artifact" inheritRefs="true"> +@@ -92,13 +88,6 @@ + </antcall> + </target> + +- <target name="eclipselink" depends="init"> +- <antcall target="module" inheritRefs="true"> +- <param name="module.name" value="eclipselink"/> +- <param name="module.jar" value="resin-eclipselink.jar"/> +- </antcall> +- </target> +- + <!-- gae APIs for quercus testing --> + <target name="gae" depends="init"> + <antcall target="module" inheritRefs="true"> +@@ -437,13 +426,6 @@ + </antcall> + </target> + +- <target name="jasper" depends="init"> +- <antcall target="module" inheritRefs="true"> +- <param name="module.name" value="jasper"/> +- <param name="module.jar" value="resin-jasper.jar"/> +- </antcall> +- </target> +- + <target name="version"> + <copy file="${resin.modules}/kernel/src/com/caucho/Version.tmpl" + tofile="${resin.modules}/kernel/src/com/caucho/Version.java" +@@ -903,7 +885,7 @@ + <delete dir="${dist}/${dist.name}"/> + </target> + +- <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/> ++ <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/> + + <target name="configure" depends="init"> + <copy tofile="modules/c/src/resin/Makefile.in" diff --git a/www-servers/resin/files/4.0.46/resin.conf b/www-servers/resin/files/4.0.46/resin.conf new file mode 100644 index 000000000000..a48840b5e9f2 --- /dev/null +++ b/www-servers/resin/files/4.0.46/resin.conf @@ -0,0 +1,16 @@ +# JVM Runtime +# Using the default setting, it will determine your JVM from the system-vm +# set using java-config. +# See java-config(1) manual page for assistance in determining this value. + +# You can override this value with whatever JDK you want. +# For a list of valid values for GENTOO_VM see output of +# java-config -L +#GENTOO_VM=sun-jdk-1.5 + +# Verbose starting and stopping? (yes/no, defaults to no) +#VERBOSE="yes" + +# Select which server will be started, this is an advanced feature, please refer +# to Resin documentation. +SERVER_ID="" diff --git a/www-servers/resin/files/4.0.46/resin.init b/www-servers/resin/files/4.0.46/resin.init new file mode 100644 index 000000000000..6103369d40e3 --- /dev/null +++ b/www-servers/resin/files/4.0.46/resin.init @@ -0,0 +1,37 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need net + use dns logger mysql postgresql +} + +runResin() { + JAVA_HOME=$(java-config -O) + [ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O) + export JAVA_HOME + + local extraArgs= + if [ "${VERBOSE}" = "yes" ]; then + extraArgs="-verbose" + fi + + local msg="${1}" + shift + + local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar -conf /etc/resin/resin.xml -server \"${SERVER_ID}\" -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}" + + ebegin "${msg}" + su - resin -c "${cmdline}" + eend $? +} + +start() { + runResin "Starting Resin" "start" +} + +stop() { + runResin "Stopping Resin" "shutdown" +} diff --git a/www-servers/resin/resin-4.0.46.ebuild b/www-servers/resin/resin-4.0.46.ebuild new file mode 100644 index 000000000000..6dddbd305cb4 --- /dev/null +++ b/www-servers/resin/resin-4.0.46.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user + +DESCRIPTION="A fast Servlet and JSP engine" +HOMEPAGE="http://www.caucho.com" +SRC_URI="http://www.caucho.com/download/${P}-src.zip" + +LICENSE="GPL-2" +SLOT="0" +IUSE="admin doc" + +KEYWORDS="~amd64 ~x86" + +CDEPEND=" + dev-java/jsr101:0 + dev-java/mojarra:2.2 + dev-java/oracle-javamail:0 + dev-java/validation-api:1.0 + dev-java/resin-servlet-api:3.1 + dev-java/glassfish-xmlrpc-api:0 + dev-java/glassfish-deployment-api:1.2" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + dev-libs/openssl + dev-java/ant-core:0 + ${CDEPEND}" + +RESIN_HOME="/usr/$(get_libdir)/resin" + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +EANT_GENTOO_CLASSPATH=" +jsr101 +mojarra-2.2 +oracle-javamail +validation-api-1.0 +glassfish-xmlrpc-api +resin-servlet-api-3.1 +glassfish-deployment-api-1.2" + +PATCHES=( + "${FILESDIR}"/"${PV}"/build.xml.patch +) + +pkg_setup() { + java-pkg-2_pkg_setup + enewgroup resin + enewuser resin -1 /bin/bash ${RESIN_HOME} resin +} + +src_prepare() { + epatch "${PATCHES[@]}" + + # No bundled JARs! + rm -f "${S}/modules/ext/"*.jar || die + rm -rf "${S}/project-jars" || die + + java-ant_bsfix_one "${S}/build.xml" + java-ant_bsfix_one "${S}/build-common.xml" + + rm -rf lib/* || die + + ln -s $(java-config --jdk-home)/lib/tools.jar || die +} + +src_configure() { + append-flags -fPIC -DPIC + + chmod 755 "${S}/configure" || die + econf --prefix=${RESIN_HOME} || die "econf failed" +} + +src_compile() { + einfo "Building libraries..." + emake || die "make failed" + + einfo "Building jars..." + eant || die "ant failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" + + einfo "Moving configuration to /etc ..." + dodir /etc/ + mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed" + dosym /etc/resin ${RESIN_HOME}/conf + + einfo "Rewriting resin.xml ..." + sed -i \ + -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \ + -e 's,${resin.root}/doc/admin,webapps/admin,' \ + "${D}/etc/resin/resin.xml" || die + + einfo "Fixing log directory ..." + rm -rf "${D}/${RESIN_HOME}/log" || die + keepdir /var/log/resin + dosym /var/log/resin ${RESIN_HOME}/log + + einfo "Installing basic documentation ..." + dodoc README "${S}"/conf/*.xml + + einfo "Installing init.d script ..." + newinitd "${FILESDIR}/${PV}/resin.init" resin + newconfd "${FILESDIR}/${PV}/resin.conf" resin + + sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || die + + einfo "Fixing location of jars ..." + rm -f "${S}/lib/tools.jar" || die + java-pkg_dojar "${S}"/lib/*.jar + rm -fr "${D}/${RESIN_HOME}/lib" || die + dosym /usr/share/resin/lib ${RESIN_HOME}/lib + + einfo "Symlinking directories from /var/lib/resin ..." + rm -rf "${D}/${RESIN_HOME}/resin-data" || die + rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die + dodir /var/lib/resin/webapps + keepdir /var/lib/resin/hosts + keepdir /var/lib/resin/resin-data + keepdir /var/lib/resin/watchdog-data + mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \ + die "mv of webapps failed" + rm -rf "${D}/${RESIN_HOME}/webapps" || die + dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps + dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts + dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data + dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data + + dosym \ + "$(java-pkg_getjar resin-servlet-api-3.1 resin-servlet-api.jar)" \ + "${JAVA_PKG_JARDEST}/resin-servlet-api.jar" + + use admin && { + einfo "Installing administration app ..." + cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die + } + use doc && { + einfo "Installing documentation app ..." + cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die + } + + use source && { + einfo "Installing sources ..." + java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null + } + + einfo "Removing stale directories ..." + rm -fr "${D}/${RESIN_HOME}/bin" || die + rm -fr "${D}/${RESIN_HOME}/doc" || die + rm -fr "${D}/${RESIN_HOME}/keys" || die + rm -fr "${D}/${RESIN_HOME}/licenses" || die + rm -fr "${D}/etc/resin/"*.orig || die + + einfo "Fixing ownerships and permissions ..." + fowners -R 0:root / + fowners -R resin:resin /etc/resin + fowners -R resin:resin /var/lib/resin + fowners -R resin:resin /var/log/resin + + fperms 644 /etc/conf.d/resin + fperms 755 /etc/init.d/resin + fperms 750 /var/lib/resin + fperms 750 /etc/resin +} + +pkg_postinst() { + elog + elog " User and group 'resin' have been added." + elog + elog " By default, Resin runs on port 8080. You can change this" + elog " value by editing /etc/resin/resin.properties." + elog +} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild index 489d06a8d42f..228e7e4526a8 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/" LICENSE="LGPL-2+" SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+X debug +introspection jpeg jpeg2k tiff test" COMMON_DEPEND=" diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest index a8fff925acf7..332162dc95d0 100644 --- a/x11-libs/gtk+extra/Manifest +++ b/x11-libs/gtk+extra/Manifest @@ -1 +1,2 @@ DIST gtkextra-3.0.5.tar.gz 1465561 SHA256 9cab6c5d6b792eb828d17cec2b9c1baba2ef57f789a290464afab80b53969e65 SHA512 6bd6732dc06648ee3267ec1f5d64b01e0be4bfdc3fff914adaca73a563d28639b825e2881b6c6ed1ae08e605878d3aa92c308dc596a24ae8d803d0be93a56db9 WHIRLPOOL 430e43c7d5c257a229efe6e5d282576cacf476653cbf62ccbd0a2525fb271acaaf197db793666573b76f39a42bf82c6bcd2f7cf49ce1264ea15e0f94e7eaeb61 +DIST gtkextra-3.2.0.tar.gz 1496537 SHA256 f24478ae8b863864708827f18ad7d72fac99ad013ef1396f9f1c277e9be0953b SHA512 545758f50e5f5c0dfdae8ba9bf7a3cd2dff8489c9868c219c2f53770297641f5a36b442dc8f12951b9c39cf87401665560cb1a846ad6cb97b29f45ee12f5e33f WHIRLPOOL 7aa97146194dd312df8520a06f3efc9efe6a30743b51e8c5a461c47f9c192ef443026b39f090ff33a116e86648fd340e955e4e6abee6fc72ce0ff9391664d219 diff --git a/x11-libs/gtk+extra/gtk+extra-3.2.0.ebuild b/x11-libs/gtk+extra/gtk+extra-3.2.0.ebuild new file mode 100644 index 000000000000..77cd83104457 --- /dev/null +++ b/x11-libs/gtk+extra/gtk+extra-3.2.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +GCONF_DEBUG="no" + +inherit gnome2 + +DESCRIPTION="Useful Additional GTK+ widgets" +HOMEPAGE="http://gtkextra.sourceforge.net" +SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz" + +LICENSE="FDL-1.1 LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="+introspection static-libs test" + +RDEPEND=" + >=x11-libs/gtk+-2.12.0:2 + dev-libs/glib:2 + introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" +# dev-libs/gobject-introspection-common needed for eautoreconf + +S="${WORKDIR}/gtkextra-${PV}" + +src_configure() { + gnome2_src_configure \ + --enable-glade=no \ + --disable-man \ + $(use_enable introspection) \ + $(use_enable static-libs static) \ + $(use_enable test tests) +} diff --git a/x11-libs/gtk+extra/metadata.xml b/x11-libs/gtk+extra/metadata.xml index 8e67fd60f834..a97fafc3ceec 100644 --- a/x11-libs/gtk+extra/metadata.xml +++ b/x11-libs/gtk+extra/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnome</herd> - <use> - <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for - introspection</flag> - </use> <upstream> <remote-id type="sourceforge">gtkextra</remote-id> </upstream> diff --git a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild index 2043dcb6e55d..ddd80534afec 100644 --- a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild +++ b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse" LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1" SLOT="0" IUSE="+introspection libnotify" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd" # Pull in libnotify-0.7 because it's controlled via an automagic ifdef COMMON_DEPEND=" diff --git a/x11-libs/pixman/pixman-0.32.8.ebuild b/x11-libs/pixman/pixman-0.32.8.ebuild index fa730ea13692..cefd42305df7 100644 --- a/x11-libs/pixman/pixman-0.32.8.ebuild +++ b/x11-libs/pixman/pixman-0.32.8.ebuild @@ -9,7 +9,7 @@ inherit xorg-2 toolchain-funcs versionator EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman" DESCRIPTION="Low-level pixel manipulation routines" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008 diff --git a/x11-libs/pixman/pixman-0.33.4.ebuild b/x11-libs/pixman/pixman-0.33.4.ebuild index dc3517f48dae..de6dce34a70a 100644 --- a/x11-libs/pixman/pixman-0.33.4.ebuild +++ b/x11-libs/pixman/pixman-0.33.4.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Low-level pixel manipulation routines" if [[ $PV = 9999* ]]; then KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest index 3d3a25416a51..4336eee862a9 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -6,3 +6,4 @@ DIST lightdm-1.14.2.tar.xz 477232 SHA256 28b078979870782aaa1a9167945e1dab19cc6d6 DIST lightdm-1.15.3.tar.xz 479432 SHA256 0670c6de84e9edfea3210b42aef688a848fa5366d150a71a67cdf83bc64bda5f SHA512 2fde5b1d01c8bbfa1fa74af9947c4ced9211d0f56d9590c9b5253a51774e2f927a4c6c2e76cde7d34351ae8474bf20e27cf71806c0a4e3a4dffc81b070384344 WHIRLPOOL a4765ee04e9faedfe397b561d17e6ac37ee1738358f7dd00f4be6e4fbabca6a83bd76fe845e4605345053350768363c2027a474a0087d5d37b819a0638c35f54 DIST lightdm-1.16.3.tar.xz 480400 SHA256 c88b0ea63949724f807f5835f1a8a9468a4102e2dfad902d539f7f6bd0bb5b4b SHA512 65b780c9e03c8b0e912a49bc627345770e1f75500b65d8599935b9daf1e0eaa6a77e183e08f1eb38a6af3d7ff6d38f5d65419bd1c0ab9282c7ae84d17d34b55d WHIRLPOOL faa24407c4e00d5e440d6255695ff18754962a3a1e3445910c606d0f53c42e64e10a6337b52f54c45f65cb6f306bd236be239c0e41011ec0698a599f463e7a00 DIST lightdm-1.16.4.tar.xz 480324 SHA256 7078d748acaeaafca807b58b004facc266ed7a785178d7d71d98d027eb828a20 SHA512 b4b09c594583837d012aa2578880b682cfbda777ab21adbfdc2d7cedadbe30dfda10f17b2de3efe2b3224e8e50afe8dfb291ae47c683e92609c02ba9f49f43c3 WHIRLPOOL d72490d68f0da4bbdd5c5b4819bd9cf2f590c30ee1766734c28baca72c0fa8f18d4a0bc5ff8fe3e0408f33e9fc93578350b34a22e6da909d9e4cd2bd5a4f45ce +DIST lightdm-1.16.5.tar.xz 482528 SHA256 8c8c58e9eaafb25c772ed809bf6b374254e51f6138ac8c2caf3e8bdaf87e63e1 SHA512 9e20b40f3f72ba12a35a1586d7ea139279949c7f2638314bd8aa5a62eba4d8e46cd6047892bbdd582aab866839c2d5ff5763af8fc6feb03c6d7576eff68a0948 WHIRLPOOL df363db7bf878fa577cc23feda5951589cd52f463279d0ffff74d4bf394d9f87d944c607387703407a604d7a20a13c7cb0de116509fb3a4fa06fcffd55e28dfb diff --git a/x11-misc/lightdm/lightdm-1.16.5.ebuild b/x11-misc/lightdm/lightdm-1.16.5.ebuild new file mode 100644 index 000000000000..aaee53ffaaa0 --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.16.5.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils pam readme.gentoo systemd versionator + +TRUNK_VERSION="$(get_version_component_range 1-2)" +DESCRIPTION="A lightweight display manager" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM" +SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz + mirror://gentoo/introspection-20110205.m4.tar.bz2" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="audit +gtk +introspection kde qt4 qt5 +gnome" +REQUIRED_USE="|| ( gtk kde )" + +COMMON_DEPEND="audit? ( sys-process/audit ) + >=dev-libs/glib-2.32.3:2 + dev-libs/libxml2 + gnome? ( sys-apps/accountsservice ) + virtual/pam + x11-libs/libX11 + >=x11-libs/libxklavier-5 + introspection? ( >=dev-libs/gobject-introspection-1 ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + )" +RDEPEND="${COMMON_DEPEND} + >=sys-auth/pambase-20101024-r2" +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc-am + dev-util/intltool + gnome? ( gnome-base/gnome-common ) + sys-devel/gettext + virtual/pkgconfig" +PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter ) + kde? ( x11-misc/lightdm-kde )" + +DOCS=( NEWS ) +RESTRICT="test" + +src_prepare() { + sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 + sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die + + einfo "Fixing the session-wrapper variable in lightdm.conf" + sed -i -e \ + "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + data/lightdm.conf || die "Failed to fix lightdm.conf" + + epatch_user + + # Remove bogus Makefile statement. This needs to go upstream + sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die + if has_version dev-libs/gobject-introspection; then + eautoreconf + else + AT_M4DIR=${WORKDIR} eautoreconf + fi +} + +src_configure() { + # Set default values if global vars unset + local _greeter _session _user + _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} + _session=${LIGHTDM_SESSION:=gnome} + _user=${LIGHTDM_USER:=root} + # Let user know how lightdm is configured + einfo "Gentoo configuration" + einfo "Default greeter: ${_greeter}" + einfo "Default session: ${_session}" + einfo "Greeter user: ${_user}" + + # also disable tests because libsystem.c does not build. Tests are + # restricted so it does not matter anyway. + econf \ + --localstatedir=/var \ + --disable-static \ + --disable-tests \ + $(use_enable audit libaudit) \ + $(use_enable introspection) \ + $(use_enable qt4 liblightdm-qt) \ + $(use_enable qt5 liblightdm-qt5) \ + --with-user-session=${_session} \ + --with-greeter-session=${_greeter} \ + --with-greeter-user=${_user} \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html +} + +src_install() { + default + + # Delete apparmor profiles because they only work with Ubuntu's + # apparmor package. Bug #494426 + if [[ -d ${D}/etc/apparmor.d ]]; then + rm -r "${D}/etc/apparmor.d" || die \ + "Failed to remove apparmor profiles" + fi + + insinto /etc/${PN} + doins data/{${PN},keys}.conf + doins "${FILESDIR}"/Xsession + fperms +x /etc/${PN}/Xsession + # /var/lib/lightdm-data could be useful. Bug #522228 + dodir /var/lib/lightdm-data + + prune_libtool_files --all + rm -rf "${ED}"/etc/init + + # Remove existing pam file. We will build a new one. Bug #524792 + rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter} + pamd_mimic system-local-login ${PN} auth account password session #372229 + pamd_mimic system-local-login ${PN}-greeter auth account password session #372229 + dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 + + readme.gentoo_create_doc + + systemd_dounit "${FILESDIR}/${PN}.service" +} diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index 7fa0ac18140b..957cdec861de 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1,2 +1,3 @@ DIST sddm-0.11.0.tar.gz 4735807 SHA256 80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce SHA512 9dd2b80788e3cfdb353e64f709db451e04828991976b8b0f74c0e97dbf467fa2744702c73e5e50137eec10dac92df7dacd83fb458f75dd595556fc95fb1759f7 WHIRLPOOL 079c5093374710c2a3247a3e27dd26f3d10962c7cb8f260b80a4ba17a72e63676012d4b8e50f8f4bffc43124efdf05c7e14aefe86253b391345c7fa98a2d4c2f DIST sddm-0.12.0.tar.xz 3866620 SHA256 7d7504bf8a717a9131a2f32be852d7631365d21a468ca2649c8245f24ff29ae0 SHA512 d1d9f60634cb2a71096d92321a7a8b33efb8879a766979ca7c1d31ac5f1dbde8253384070338eef80f777db1cd78eef540e9111151f7f9e7d8e648d557e58047 WHIRLPOOL 58d21ead822b85bf3f0f6375cfadee6225dd9bf696e786fe68f283def43b4107d11e14b357d60b0278266270f9ddcb6a9b86285bc3b1a19644583f6ebebc4990 +DIST sddm-0.13.0.tar.xz 3869452 SHA256 dd868caaccf7783ead799f3b79e442d5adcb46251b78c8dbf3e9da0016dd347d SHA512 292a584945e74ea987088f975d5973b45a5b4fc07fa90b487fb9ece2de7ecca352344354474dfa8d103c8242367c19ad926e62a553e5b567d8d88a3f2c73c171 WHIRLPOOL e3961ecd5e22e8d565c16d86b6043ba7f3d6c1c296047d196577ab25af4e50216d67d53e9690b4df262c5ae4486bf36f88d345110a54bada9d75c4ff0dfc5ff3 diff --git a/x11-misc/sddm/sddm-0.13.0.ebuild b/x11-misc/sddm/sddm-0.13.0.ebuild new file mode 100644 index 000000000000..71969d757a5e --- /dev/null +++ b/x11-misc/sddm/sddm-0.13.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit cmake-utils user + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" +KEYWORDS="~amd64 ~x86" + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +IUSE="consolekit +pam systemd" + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtdeclarative:5 + dev-qt/qtnetwork:5 + dev-qt/qttest:5 + >=x11-base/xorg-server-1.15.1 + x11-libs/libxcb[xkb(-)] + consolekit? ( >=sys-auth/consolekit-0.9.4 ) + pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd:= ) + !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" + +DEPEND="${RDEPEND} + dev-python/docutils + dev-qt/linguist-tools:5 + virtual/pkgconfig" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then + if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then + die 'The active compiler needs to be gcc 4.7 (or newer)' + fi + fi +} + +src_prepare() { + cmake-utils_src_prepare + + # fix for flags handling and bug 563108 + epatch "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" + use consolekit && epatch "${FILESDIR}/${PN}-0.11.0-consolekit.patch" +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_no pam PAM) + $(cmake-utils_use_no systemd SYSTEMD) + -DBUILD_MAN_PAGES=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + ) + + cmake-utils_src_configure +} + +pkg_postinst() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video +} diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index af968c0dfedd..18776afe34ff 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1,3 +1 @@ -DIST xscreensaver-5.32.tar.gz 10571502 SHA256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd SHA512 0d7f3d283998cdb2aec10c8f5e94c9cc6e28a72785c36759cee988f3592a5f8aae20ba593c8363eab8fe61f7caf325376a887cac42ecf300c60894bf20d2f75b WHIRLPOOL 1a99e36ac89cf7f3121d499da6bf06e02808465b7b500e0fc371a97df0d8e1b729bc20c57cd7fe560e151e1051e46dafc0b034cf72c343a185b1fddcf8fdb749 -DIST xscreensaver-5.33.tar.gz 10725482 SHA256 d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d SHA512 a8126b165e96d89ada38c4bce0b6c6ef5769667477301f5388633d22b9aed7fa6defcd07b8768c1197556c565b8f220f75c1937e0151d66c3b8e05fbadf37d1d WHIRLPOOL d9210589b1b8263b46740b27c6fc5a64b4d2d5c69c8a7267d4650cf7ed54de1dc927e007ecb37110ead5229e0f9742181ce40b104478c9e0ec488caec07d5231 DIST xscreensaver-5.34.tar.gz 10788657 SHA256 6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27 SHA512 58d0beb6556ee77122feb04090ceed80f9ffa67070f28305a00cc42adeae678305d43594c38d00539d2f13f2474311cb82cda6fdafc2bdc918a28438d6b51e75 WHIRLPOOL c7969e5b762cbeabd0564328aefdb895acfcd1c37e2b84c628718b613ca309f4c1222103c0d6ab0fd046eb355f02ee36b11fb57b55eb72e65944ea72e4fa7419 diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch deleted file mode 100644 index b69e19783200..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch +++ /dev/null @@ -1,106 +0,0 @@ ---- xscreensaver-5.21/driver/XScreenSaver.ad.in -+++ xscreensaver-5.21/driver/XScreenSaver.ad.in -@@ -31,21 +31,21 @@ - *mode: random - *timeout: 0:10:00 - *cycle: 0:10:00 --*lockTimeout: 0:00:00 -+*lockTimeout: 0:30:00 - *passwdTimeout: 0:00:30 --*dpmsEnabled: False -+*dpmsEnabled: True - *dpmsQuickoffEnabled: False - *dpmsStandby: 2:00:00 - *dpmsSuspend: 2:00:00 - *dpmsOff: 4:00:00 --*grabDesktopImages: True -+*grabDesktopImages: False - *grabVideoFrames: False - *chooseRandomImages: @DEFAULT_IMAGES_P@ - ! This can be a local directory name, or the URL of an RSS or Atom feed. - *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ - *nice: 10 - *memoryLimit: 0 --*lock: False -+*lock: True - *verbose: False - *timestamp: True - *fade: True -@@ -62,7 +62,7 @@ - *textLiteral: XScreenSaver - *textFile: @DEFAULT_TEXT_FILE@ - *textProgram: fortune --*textURL: http://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss -+*textURL: http://planet.gentoo.org/rss20.xml - - *overlayTextForeground: #FFFF00 - *overlayTextBackground: #000000 -@@ -122,7 +122,8 @@ - - ! The format used for printing the date and time in the password dialog box - ! (see the strftime(3) manual page for details.) --*dateFormat: %d-%b-%y (%a); %I:%M %p -+!*dateFormat: %d-%b-%y (%a); %I:%M %p -+*dateFormat: %x %X - ! To show the time only: - ! *dateFormat: %I:%M %p - ! For 24 hour time: ---- xscreensaver-5.21/hacks/barcode.c -+++ xscreensaver-5.21/hacks/barcode.c -@@ -131,7 +131,6 @@ - "children", - "chocolate", - "CLONE", -- "cock", - "constriction", - "contrition", - "cop", -@@ -265,7 +264,6 @@ - "punishment", - "punk rock", - "punk", -- "pussy", - "quagmire", - "quarantine", - "quartz", -@@ -333,8 +331,6 @@ - "vegetarian", - "venom", - "verifiability", -- "viagra", -- "vibrator", - "victim", - "vignette", - "villainy", ---- xscreensaver-5.21/hacks/glx/glsnake.c -+++ xscreensaver-5.21/hacks/glx/glsnake.c -@@ -565,17 +565,17 @@ - ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, - ZERO, PIN, ZERO } - }, -- { "erect penis", /* thanks benno */ -+ { "shuffle board", /* thanks benno */ - { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, - PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, - ZERO, ZERO } - }, -- { "flaccid penis", -+ { "flaccid anchor", - { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, - PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, - ZERO, ZERO } - }, -- { "vagina", -+ { "engagement ring", - { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, - LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, - PIN, RIGHT, ZERO } -@@ -995,7 +995,7 @@ - { "Parrot", - { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } - }, -- { "Penis", -+ { "Shuttle", - { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } - }, - { "PictureComingSoon", diff --git a/x11-misc/xscreensaver/xscreensaver-5.32.ebuild b/x11-misc/xscreensaver/xscreensaver-5.32.ebuild deleted file mode 100644 index 90786229102b..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.32.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils flag-o-matic multilib pam - -DESCRIPTION="A modular screen saver and locker for the X Window System" -HOMEPAGE="http://www.jwz.org/xscreensaver/" -SRC_URI=" - http://www.jwz.org/xscreensaver/${P}.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama" - -COMMON_DEPEND=" - >=gnome-base/libglade-2 - dev-libs/libxml2 - media-libs/netpbm - x11-apps/appres - x11-apps/xwininfo - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86misc - x11-libs/libXxf86vm - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( virtual/pam ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-proto/recordproto - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - xinerama? ( x11-proto/xineramaproto ) -" - -src_prepare() { - sed -i configure.in -e '/^ALL_LINGUAS=/d' || die - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.in} || die - fi - - epatch \ - "${FILESDIR}"/${PN}-5.21-gentoo.patch \ - "${FILESDIR}"/${PN}-5.05-interix.patch \ - "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \ - "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \ - "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \ - "${FILESDIR}"/${PN}-5.28-comment-style.patch \ - "${FILESDIR}"/${PN}-5.31-pragma.patch - - epatch_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - export RPM_PACKAGE_VERSION=no #368025 - - econf \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with xinerama xinerama-ext) \ - --enable-locking \ - --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ - --with-dpms-ext \ - --with-gtk \ - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-pixbuf \ - --with-proc-interrupts \ - --with-randr-ext \ - --with-text-file="${EPREFIX}"/etc/gentoo-release \ - --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - dodoc README{,.hacking} - - use pam && fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} diff --git a/x11-misc/xscreensaver/xscreensaver-5.33.ebuild b/x11-misc/xscreensaver/xscreensaver-5.33.ebuild deleted file mode 100644 index 3a4a844afcd6..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.33.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils flag-o-matic multilib pam - -DESCRIPTION="A modular screen saver and locker for the X Window System" -HOMEPAGE="http://www.jwz.org/xscreensaver/" -SRC_URI=" - http://www.jwz.org/xscreensaver/${P}.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama" - -COMMON_DEPEND=" - >=gnome-base/libglade-2 - dev-libs/libxml2 - media-libs/netpbm - x11-apps/appres - x11-apps/xwininfo - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86misc - x11-libs/libXxf86vm - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( virtual/pam ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-proto/recordproto - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - xinerama? ( x11-proto/xineramaproto ) -" - -src_prepare() { - sed -i configure.in -e '/^ALL_LINGUAS=/d' || die - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.in} || die - fi - - epatch \ - "${FILESDIR}"/${PN}-5.33-gentoo.patch \ - "${FILESDIR}"/${PN}-5.05-interix.patch \ - "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \ - "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \ - "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \ - "${FILESDIR}"/${PN}-5.28-comment-style.patch \ - "${FILESDIR}"/${PN}-5.31-pragma.patch - - epatch_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - export RPM_PACKAGE_VERSION=no #368025 - - econf \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with xinerama xinerama-ext) \ - --enable-locking \ - --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ - --with-dpms-ext \ - --with-gtk \ - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-pixbuf \ - --with-proc-interrupts \ - --with-randr-ext \ - --with-text-file="${EPREFIX}"/etc/gentoo-release \ - --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - dodoc README{,.hacking} - - use pam && fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} diff --git a/x11-misc/xscreensaver/xscreensaver-5.34.ebuild b/x11-misc/xscreensaver/xscreensaver-5.34.ebuild index b5c41ab78719..4fb794687c80 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.34.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.34.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama" COMMON_DEPEND=" diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest index 304ef9ab98b0..376dbc9be8e1 100644 --- a/x11-plugins/pidgin-sipe/Manifest +++ b/x11-plugins/pidgin-sipe/Manifest @@ -2,3 +2,4 @@ DIST pidgin-sipe-1.18.0.tar.gz 1090904 SHA256 f1388799e3d250fe43643ee8748a6769f6 DIST pidgin-sipe-1.19.0.tar.gz 1127851 SHA256 bc144de259e858c57d82ee7ac00a78cc3a0875ab67da6b25be05808ed274c856 SHA512 96fd7f852c7225d2ae71ec4916491c6c4facbddf9f19285334a47b6abbaa80ad7f2aa299fc1b453a7f5782f65b8f56557f5992ba8e3e2c386318d96f1f59824e WHIRLPOOL 90c1069b38e96f6bc2c39957f9c76635f404a3188abb59004fe3a83e177803db06b6c6bcfdef5cf5fb645d901751130b15e619bf2d8fac17fb70660cf2e2ff2c DIST pidgin-sipe-1.19.1.tar.gz 1134961 SHA256 92c8a4611f1594096fac3c5b983df49cb8d1612cab7352799c855fd9dda0454a SHA512 4ac85f5e2ae590677b73ec339051c210173a37c974076d696409c81680e91818d9a3b75a95b4ae556a61ec0246f0cd6fb2a644889bbbb02528d5ea75140efef0 WHIRLPOOL d31044889ae6d9d146e4a9e9bb9fd1ec84ded6597b783cfedb1f1a0478760aeca41fd574bbe8021223957fd6c84cc3082cc2cabdd0da245365573e35697d680f DIST pidgin-sipe-1.20.0.tar.gz 1141962 SHA256 3a6b81f40d7a80d5e467c36b92d550b3c5377b39b67953b576308ce257c2a891 SHA512 f0c9df51d3d16aeca5cf04a2cf68c1b61796a5c97ea444d86995d7034994d3e7fa66b8fa258a1fed765d6b055138b397641316c9b4f43b03b7f152ef5d66ecfd WHIRLPOOL eb100cac4714d4e7b830e7d50ccf034ec036b121a50348ea3148370fb5a54e130edd910ecdb010df1a23ad8b68b41a206c313ea7ee3f2f8bd37deb469853fcf4 +DIST pidgin-sipe-1.20.1.tar.gz 1142762 SHA256 a3538f3eed3a5e9a7f2e12622d9283ddbba88d752b4e6c3c2cd5774a3bc48717 SHA512 26363937ca4d2a3e3c759a4ba2e8039f0e90f25e9fa66f3e1a4cc976c037d9878a1c777a24ddea9d5ce308908e92cd5c80f0e90a574e03ff40e09f863e6d6755 WHIRLPOOL 40e043eca221e4bbd961bbfaf7c2369408f42b97cddf727e0e45ea516049a4fddd08a4481d75dea25870b87f2d367d01c578cbb3e4288c01af71ea0a145f8cbb diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.20.1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.20.1.ebuild new file mode 100644 index 000000000000..e145d21f65f2 --- /dev/null +++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.20.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools eutils + +DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)" +HOMEPAGE="http://sipe.sourceforge.net/" +SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice" + +RDEPEND=">=dev-libs/gmime-2.4.16 + dev-libs/libxml2 + openssl? ( dev-libs/openssl:= ) + !openssl? ( dev-libs/nss ) + kerberos? ( virtual/krb5 ) + voice? ( + >=dev-libs/glib-2.28.0 + >=net-libs/libnice-0.1.0 + media-libs/gstreamer:0.10 + >=net-im/pidgin-2.8.0 + ) + !voice? ( + >=dev-libs/glib-2.12.0:2 + net-im/pidgin + ) + telepathy? ( + >=sys-apps/dbus-1.1.0 + >=dev-libs/dbus-glib-0.61 + >=dev-libs/glib-2.28:2 + >=net-libs/telepathy-glib-0.18.0 + ) +" + +DEPEND="dev-util/intltool + virtual/pkgconfig + ${RDEPEND} +" + +src_prepare() { + eautoreconf +} + +src_configure() { + econf \ + --enable-purple \ + --disable-quality-check \ + $(use_enable telepathy) \ + $(use_enable debug) \ + $(use_enable ocs2005-message-hack) \ + $(use_with kerberos krb5) \ + $(use_with voice vv) \ + $(use_enable !openssl nss) \ + $(use_enable openssl) +} + +src_install() { + emake install DESTDIR="${D}" + dodoc AUTHORS ChangeLog NEWS TODO README +} diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild index 00dd75fe9f53..3e4ea9f84d65 100644 --- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild +++ b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="nls truetype debug" RDEPEND="x11-libs/libXft |