Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
merged:

  funtoo-overlay: 57ad3677f6a893e3624627fb3682c0bd337c8520
  • Loading branch information
box committed Mar 21, 2015
1 parent b88dd69 commit 5d6c1da
Show file tree
Hide file tree
Showing 30,658 changed files with 36,104 additions and 37,009 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions app-admin/haskell-updater/Manifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ DIST haskell-updater-1.2.3.tar.gz 24126 SHA256 ceeb713a817fddc0e6e7423f8e15c59f2
DIST haskell-updater-1.2.6.tar.gz 24857 SHA256 74fa71b530e3c88f944d3f4013a4c41c95af5e42ac0ec2ac25716578e1965a9e SHA512 1be777b40fcad2cfdfe461c8bce8ffed0449dbd6bfb665881da1cf763699626d9183a5affbdaba0e8243cf4ce956caab1d54a9c4637d10d1642e8da3764bcedf WHIRLPOOL 0af59cbd5a937cbf7261fd02e6a39bf6006e484532883381fdb6818fe993bb3ae0fd0993b9d32620341872f7e02d9e40e5816f4c97928508128f72dbfc6cc38e
DIST haskell-updater-1.2.7.tar.gz 25065 SHA256 eb00acc19070a3c1ad4d92f9c3ec22ceec8e2a758deb5d05e4a0d64ccef9d271 SHA512 d8f73967fd22182d62c57cf71af18dd123ac6439a5436ba5639f5c9ce2df72e2f3d1382d3f23219ec89848175426df68cf67474d5b7db8194f0c868f9e504f1a WHIRLPOOL a0b118cd8376dd57ef7929cc212c88eedf45909f68d9cbda89da8e97907f7937e6eb90d88516dfa2540d75145b8d88a85dfda65c61e01e77c531030e1253a8c4
DIST haskell-updater-1.2.8.tar.gz 25192 SHA256 fddc7dcad9bb65fc8b6caef393a6657028dae54b4cf4c37a08ef8da047207776 SHA512 6bfd101c5f6de3b4ddf4a4f485a2a60df218c11778fa8ae9b7245972a666f05aa17c3c093e922233d7f3243a87e3401ff7902d5b8ad7dc43018ac5627458de8d WHIRLPOOL 840284831300581fa2809cd9f1394891ae4381fd1e67c26dfb2938d0be0daf639313ac3b97b1521ed070623ff97ba327cfcc3f2eb02c39dbb74a56e25d83c0e0
DIST haskell-updater-1.2.9.tar.gz 26675 SHA256 eafc441bad4f15d60c8686c189d6dd49ea9e87bdddf09a24cef2a3eca9eca859 SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da WHIRLPOOL e28c55e9bd2d9033b42fb42e2db6ff2911a2fb50a5d1ad276d6344ca29b4b05abf73d746604ced6766b983d8a7e6e688534be28ba61f0c62f8aca20d9a46c669
46 changes: 46 additions & 0 deletions app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild,v 1.2 2015/03/20 23:09:07 slyfox Exp $

EAPI=5

CABAL_FEATURES="bin nocabaldep"
inherit eutils haskell-cabal

DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""

DEPEND=">=dev-lang/ghc-6.12.1"

# Need a lower version for portage to get --keep-going
RDEPEND="|| ( >=sys-apps/portage-2.1.6
sys-apps/pkgcore
sys-apps/paludis )"

src_prepare() {
if use prefix; then
sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
"${S}/Distribution/Gentoo/Packages.hs" || die

sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
"${S}/Distribution/Gentoo/GHC.hs" || die
fi
}

src_configure() {
cabal_src_configure \
--bindir="${EPREFIX}/usr/sbin" \
--constraint="Cabal == $(cabal-version)"
}

src_install() {
cabal_src_install

dodoc TODO
}
1 change: 1 addition & 0 deletions app-admin/logstash-forwarder/Manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DIST logstash-forwarder-0.4.0.tar.gz 35189 SHA256 d930cd33747b2826c7358238a25e690324751d1b098e7c00de1357944766b3c3 SHA512 1f89b065d1b26a6f5b18da6215bdaed5a312af12fa721835f5e1a77248dd67f398f5af08b5d93c0c4c5ef9623eb1ddb58449b52039c0db0241d5ca61872102ef WHIRLPOOL 7715c723f8b8712b5cccc1e678017b2d733f243ea936d312ab31938fba73934a66d552656516bc72b65a3541945401f99463d8346fdf6a00372e9b3a0ed67655
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LOGSTASH_FORWARDER_ARGS="-quiet -syslog=true"
63 changes: 63 additions & 0 deletions app-admin/logstash-forwarder/files/logstash-forwarder.initd
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
#!/sbin/runscript
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/files/logstash-forwarder.initd,v 1.2 2015/03/20 19:43:26 aidecoe Exp $

create_tmpdir() {
local tmpdir="$(mktemp -d -p /tmp logstash-forwarder.XXXXXXXXXX)"

chown logstash:logstash "$tmpdir" || return 1
chmod 0750 "$tmpdir" || return 1

echo "$tmpdir"
}

remove_tmpdir() {
local d=''
local tmpdir=''

for d in /tmp/logstash-forwarder.??????????; do
[[ -e $d ]] || return 0
[[ -d $d ]] || continue

if ! [[ $tmpdir ]]; then
tmpdir="$d"
else
# There are more directories like that, so better keep them all.
return 1
fi
done

rm -r "$tmpdir"
}

start() {
local config_file=/etc/logstash-forwarder/logstash-forwarder.conf
local tmpdir="$(create_tmpdir)"

if ! [[ -d $tmpdir ]]; then
eend 1 "Failed to create tmp directory for logstash-forwarder"
return 1
fi

ebegin "Starting logstash-forwarder"
start-stop-daemon --start --exec /usr/bin/logstash-forwarder \
--make-pidfile --pidfile /run/logstash-forwarder.pid \
--background --wait 100 --chdir "$tmpdir" \
--user logstash --group logstash \
-- -config="${config_file}" ${LOGSTASH_FORWARDER_ARGS}
eend $?
}

stop() {
ebegin "Stopping logstash-forwarder"
start-stop-daemon --stop --exec /usr/bin/logstash-forwarder \
--pidfile /run/logstash-forwarder.pid --user logstash --group logstash
local rc=$?

if ! remove_tmpdir; then
ewarn "Failed to remove logstash-forwarder tmp directory"
fi

eend $rc
}
44 changes: 44 additions & 0 deletions app-admin/logstash-forwarder/logstash-forwarder-0.4.0.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/logstash-forwarder/logstash-forwarder-0.4.0.ebuild,v 1.1 2015/03/20 16:06:41 aidecoe Exp $

EAPI=5

inherit user

DESCRIPTION="Collects logs locally in preparation for processing elsewhere"
HOMEPAGE="https://github.com/elastic/logstash-forwarder"
SRC_URI="https://github.com/elastic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""

DEPEND="dev-lang/go"
RDEPEND="${DEPEND}"

pkg_setup() {
enewgroup logstash
enewuser logstash -1 -1 -1 logstash
}

src_install() {
dobin "${PN}"
dodir "/etc/${PN}"
dodoc "${PN}".conf.example CHANGELOG README.md
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
}

pkg_postinst() {
if ! [[ -e /etc/${PN}/${PN}.conf ]]; then
elog "Before starting logstash-forwarder create config file at"
elog
elog " /etc/${PN}/${PN}.conf"
elog
elog "See example in /usr/share/doc/${PVR} directory. You can remove"
elog "-quiet from logstash-forward arguments in /etc/conf.d/${PN} to"
elog "until you get working configuration. Search syslog for errors."
fi
}
15 changes: 15 additions & 0 deletions app-admin/logstash-forwarder/metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>[email protected]</email>
<name>Amadeusz Żołnowski</name>
</maintainer>
<longdescription lang="en">
logstash-forwarder is a lightweight replacement for logstash when you
only need to collect logs locally in preparation for processing
elsewhere. It is written in Go and uses not much memory. For
transmission lumberjack protocol is used. It is is secure, low
latency, low resource usage, and reliable.
</longdescription>
</pkgmetadata>
2 changes: 1 addition & 1 deletion app-admin/webalizer/Manifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
DIST webalizer-2.21-02-src.tar.bz2 304926 SHA256 f2663d67f5820644a0b1c0b7dee4a5c764d829166fa28d5880442c28886729d9 SHA512 5bca43a36523d246d39338df22c25e554185863c54bc8a06018c1c20bf4292ad62ea122cb99b4a64fd72c43c9403e8e7119a3aac2898dba851c059dbda6a3780 WHIRLPOOL 9ed8131a8a4fa9706d2d5af23ff7b5f917aad4aa153b9967f6017f410fa83a02e2217f0f061b6c529498988ffc0a19476f6e0fbb73bc05630a4101f3d8526349
DIST webalizer-2.23-05-RB29-patch.tar.gz 45853 SHA256 e212d1928315805b655bcb2614cf9e128373c80601ed6b7ee82ae6d050232a44 SHA512 967a5418e858adb5be8b64bac7edb52ac6eca8bce567269866f2ae7ac6e34c09d2d0ab1d7e7cfcbd92972cf5ea05ac2abaea2058e6fa9273e27cf10aacfb4759 WHIRLPOOL 2ac54d38f160e4311b240e00e6b33c0523341418a32190a3fdd2ba13a226fd53c986ea6d8e127f3444dec03c2801d984964f08141ee8e329e198dde520a6e76c
DIST webalizer-2.23-05-src.tar.bz2 308238 SHA256 afc88b8ee0927d9ed004962cb7e3d3054ef7628c7bc8a7b2e3ea1d758a47885a SHA512 4840c2ba25e34d5e276c724c311d2c2d7a0223dcbf6dec567960f56bc4cdfe4f6a1e412e3fcab53395d6357377f4f8d2b3bcc4b23c46a3ec6a895813a681cd4b WHIRLPOOL 82e092ae6e21e3bd3f70cd53a2dc6b71ed3903f640d7e4d2aa5be81ad43cf8aea54f0dd1d3fc02f55a615b1b9208ec339ccadcfa342737e61ebb0404f7fddfe1
DIST webalizer-2.23-08-RB30-patch.tar.gz 45723 SHA256 cfd12f33a869e6eb2cf94165a75f733f205d85ba78345ce35b0b1bbce1a6aa93 SHA512 142674cb7de6e1833ed9bf7587d5d3b1fce64eb95b7448392d0e8ec6e89dcd69cdb6900b75db9c283b19e5423392f76565b5ad279748da656ed2061fb180c949 WHIRLPOOL 639be013978da35219f06866475268a89ae098d9ad10d43e4d03d8610c0d485c9ea47ed61ee41182d012841aa093babae334ec83ff5b941081c1afe3e0e545f2
DIST webalizer-2.23-08-src.tar.bz2 308090 SHA256 b37524fbd98e97052a80d59f75e69f857468752cf74cc0eb0972e5fab02eb6f7 SHA512 23fe6e3ef1c85aa527ffafef16c31c13ad8e1f9feb774557c07a5c8fd6c67986b98180ef16d6cebe62d59c5f7ca214b8292e94ce8f195fa0541de9c5438fb9bd WHIRLPOOL 78f16d7a0bc0eda3cc03b2f9e62d5a722d9aa0935ed17b7ce102f3b3634e3b20476c80305dc887cfcc6a858fd0898e1e456d2cf9bf3275a854c8ab7ee126f779
DIST webalizer-geodb-20140201.tgz 733070 SHA256 27abf8f48c76e63deae2ea86cd2c2ebe8ddd41a493d57289ae3a56ba1c7e5aaf SHA512 c31bbf39ab2a27712f83e7c1cf4297bc26850ed72e68bb4b47233b062055cf26931e859cdbc70dfa7737e17a3c05d4858b4e9c9c3a0492b0b285f92c0f992223 WHIRLPOOL 33ee071e70219abee3c794e3b60d18a1cfe7ed83495b41355b270398c696e8688f25155ee8e5b9d37f92da41904367d904ab91f565ba5005d32f401350a3b93d
DIST webalizer-geodb-latest.tgz 639447 SHA256 f2a1bd7fcc9c93ed6a627bd15f2c31866d5a6c6b7dd48852d84a129386327218 SHA512 0f32d1249902e17f37cd0e7680004262bbe5b4a34a00d882319258c6aed80503e89ed192d8365731ab507fa54560082ae16c7023d0bc2232350709106be24117 WHIRLPOOL 26f1edf87ea6102c5047b41702fd273d40360bde7c481183a3303e2c89af3d6ba7470cd942d4af1574bed8822b776a26ea13c2388b7654fffccee856cc99e571
Expand Down
11 changes: 0 additions & 11 deletions app-admin/webalizer/files/webalizer-2.21.02-gcc-4.4.patch

This file was deleted.

116 changes: 0 additions & 116 deletions app-admin/webalizer/webalizer-2.21.02.ebuild

This file was deleted.

26 changes: 23 additions & 3 deletions app-admin/webalizer/webalizer-2.23.08.ebuild
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.23.08.ebuild,v 1.2 2014/06/30 00:46:02 blueness Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.23.08.ebuild,v 1.3 2015/03/20 19:15:47 blueness Exp $

# uses webapp.eclass to create directories with right permissions
# probably slight overkill but works well
Expand All @@ -10,6 +10,8 @@ EAPI="5"
inherit versionator eutils webapp db-use

WEBAPP_MANUAL_SLOT="yes"
XTENDED_VER="RB30"
XTENDED_URL="rb30"

MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
MY_P="${PN}-${MY_PV}"
Expand All @@ -21,12 +23,13 @@ GEODB_DIR="/usr/share/webalizer/geodb"
DESCRIPTION="Webserver log file analyzer"
HOMEPAGE="http://www.webalizer.org/"
SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
http://dev.gentoo.org/~blueness/webalizer/webalizer.conf.gz
${GEODB_URL}/webalizer-geodb-${GEODB_DATE}.tgz"

LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="bzip2 geoip nls"
IUSE="bzip2 xtended geoip nls"
SLOT="0"

DEPEND=">=sys-libs/db-4.2
Expand All @@ -50,6 +53,12 @@ pkg_setup() {
fi
}

src_prepare() {
if use xtended; then
epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
fi
}

src_configure() {
# really dirty hack; necessary due to a really gross ./configure
# basically, it just sets the natural language the program uses
Expand Down Expand Up @@ -115,6 +124,17 @@ pkg_postinst() {
ewarn
fi

if use xtended; then
ewarn
ewarn "If you are upgrading webalizer from USE=-xtended to USE=xtended"
ewarn "you will need to delete webalizer.current and process all previous"
ewarn "days in the same month using 'webalizer /path/to/access_log.1'."
ewarn "For more information about using XTENDED webalizer, see:"
ewarn
ewarn " http://www.patrickfrei.ch/webalizer/rb30/INSTALL"
ewarn
fi

if use geoip; then
elog
elog "Note: we have installed the GeoDB.dat dated ${GEODB_DATE}."
Expand Down
1 change: 0 additions & 1 deletion app-emulation/open-vm-tools/files/open-vm-tools.desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Exec=vmware-user-suid-wrapper
Name=VMware User Agent
Expand Down
3 changes: 1 addition & 2 deletions app-misc/rox-filer/files/rox.desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Rox-Filer
Comment=The Rox File Manager
Icon=rox
Exec=rox
Categories=GTK;Utility;System;Core;
Categories=GTK;System;Core;
StartupNotify=true
Terminal=false
Loading

0 comments on commit 5d6c1da

Please sign in to comment.