Commit 34204395 authored by John Johnson's avatar John Johnson

Merge branch 'master' into gnome-libpeas

parents 46cecef6 0c96aeae
DIST chruby-0.3.9.tar.gz 20911 SHA256 7220a96e355b8a613929881c091ca85ec809153988d7d691299e0a16806b42fd SHA512 7d9565dc5285ba53d5c3a9e87a70079d16d7933353d31ea8eca9de21eb59f3bd5134f1883e72019e002bf2eaab5b562bdcd20a154663590fc97e8b8506956f3c WHIRLPOOL c39b683aa9c06add831d5d584ad4b64c48747133491c95f4bb93d531f2ea2c5a93d4bdf1c77efc0b9782a221f04b3876d833c3fef1b44c4e47d14527880b5781
DIST v0.3.9.tar.gz 20911 SHA256 7220a96e355b8a613929881c091ca85ec809153988d7d691299e0a16806b42fd SHA512 7d9565dc5285ba53d5c3a9e87a70079d16d7933353d31ea8eca9de21eb59f3bd5134f1883e72019e002bf2eaab5b562bdcd20a154663590fc97e8b8506956f3c WHIRLPOOL c39b683aa9c06add831d5d584ad4b64c48747133491c95f4bb93d531f2ea2c5a93d4bdf1c77efc0b9782a221f04b3876d833c3fef1b44c4e47d14527880b5781
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=7
MY_PV=$(ver_cut 1-3)
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Small script for changing current Ruby version in shell."
HOMEPAGE="https://github.com/postmodern/chruby"
SRC_URI="https://github.com/postmodern/chruby/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="|| ( app-shells/bash app-shells/zsh )"
RDEPEND="${DEPEND}"
src_prepare() {
default
sed -i 's/DOC_DIR=/DOC_DIR?=/' Makefile
}
src_install() {
# The default, with changed prefix only
if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
emake PREFIX="${D}/usr" DESTDIR="${D}" install
fi
insinto /etc/profile.d
newins "${FILESDIR}/${PN}env.sh" "${PN}"
}
pkg_postinst() {
elog " "
elog "chruby aims to be a project-specific Ruby version changer. "
elog "For changing system default Ruby version, please use "
elog "app-eselect/eselect-ruby."
elog " "
}
# Global shell setup for chruby
# Restrict to interactive shell only
# [[ $- == *i* ]] || return 0
if [ -n \"\$BASH_VERSION\" ] || [ -n \"\$ZSH_VERSION\" ]; then
source "/usr/share/chruby/chruby.sh"
source "/usr/share/chruby/auto.sh"
# else
# return 0
fi
DIST ruby-install-0.6.1.tar.gz 27203 SHA256 b3adf199f8cd8f8d4a6176ab605db9ddd8521df8dbb2212f58f7b8273ed85e73 SHA512 30c421b0d67fbcba3b989399cadbe43b5373ef77f548ef4b9692fd2f8fe6bf653d036e485636ba73512f2f3529bafde377109b8b705647f40f275888290fc2f7 WHIRLPOOL e6e0041ef3da26b9fe2d25accc1e1a8279806c134e5eecbb7b2cb3636ecb7731a344428748fc483c5353335821e08f550720770e79942d69962258df2fa7c0da
DIST ruby-install-0.7.0.tar.gz 28533 SHA256 500a8ac84b8f65455958a02bcefd1ed4bfcaeaa2bb97b8f31e61ded5cd0fd70b SHA512 c52cafb1f9015d169c834a720451ae2fdf6e4ead1852e439521b1bd7fc90a21b21504a0561d040628216865e54587d48137d86b0a86a0da12fb9f873f53ab1ef WHIRLPOOL daeb7ce0688961daa9e52d6b55033bcad473a0aadab1c530f906d95f7ae3b1a545e4d9e7dba31183a6e0eb9cb7d040146964f256b67365d82be6628a42d705e3
diff --git a/Makefile b/Makefile
index 8378d7c..0e90adb 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ PKG_NAME=$(NAME)-$(VERSION)
PKG=$(PKG_DIR)/$(PKG_NAME).tar.gz
SIG=$(PKG_DIR)/$(PKG_NAME).asc
-PREFIX?=/usr/local
+PREFIX?=/usr
SHARE_DIR=$(PREFIX)/share
DOC_DIR=$(SHARE_DIR)/doc/$(PKG_NAME)
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=7
DESCRIPTION="Installs [Ruby], [JRuby], [Rubinius], [MagLev] or [mruby]."
HOMEPAGE="https://github.com/postmodern/ruby-install"
SRC_URI="https://github.com/postmodern/ruby-install/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
PATCHES=(
"${FILESDIR}/${PN}-prefix.patch"
)
DEPEND="( app-shells/bash )
|| ( >=sys-devel/gcc-4.2 sys-devel/clang )
|| ( >=net-misc/wget-1.12 net-misc/curl )"
RDEPEND="${DEPEND}"
DIST torguard-3.90.0.tar.gz 29414546 SHA256 710481abbee583a74394a0a95d0e6440e6b79532361ba4e5831e43ca02686bdb SHA512 9c445837efbef80885b57d29286f80d45526d4cb0af7f905ef5c8bd3efac8cb81ffb975e26d82ce4fec5039078b4d9f270f9a5ea293b8318b566eac21733062f WHIRLPOOL 70e96b817afbc9fff3bc695f90addc0a3089149156d947ef8c258c4dd83e91a10e0dc2ed608b2787d57f98e00740d81ec78ec63401ce2977ebe1d7ca8f9fc4a1
u torguard - "TorGuard VPN Software"
# Copyright 1999-2019 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit systemd toolchain-funcs user
DESCRIPTION="torguard anonymous VPN - NOT related to TOR project"
HOMEPAGE="https://torguard.net"
SRC_URI="https://updates.torguard.biz/Software/Linux/torguard-latest-amd64-arch.tar.gz -> ${P}.tar.gz
x86? ( https://updates.torguard.biz/Software/Linux/torguard-latest-i386-arch.tar.gz -> ${P}.tar.gz )"
LICENSE="custom"
SLOT="0"
# KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64"
IUSE="sudo"
RDEPEND="sys-apps/iproute2
net-vpn/openvpn[iproute2]
dev-qt/qtwidgets
dev-qt/qtnetwork[libproxy]
net-proxy/shadowsocks-libev
sudo? ( lxqt-base/lxqt-sudo )"
DEPEND="${RDEPEND}"
# S=${WORKDIR}/${PN}-v${PV}-amd64-arch
S="${WORKDIR}/${PN}-v${PV}-amd64-arch/${PN}-v${PV}-amd64-arch"
# S=${WORKDIR}/${PN}-v${PV}-amd64-arch
pkg_setup() {
# enewgroup <name> [gid]
enewgroup ${PN}
# enewuser <user> [uid] [shell] [homedir] [groups]
enewuser ${PN} -1 -1 -1 ${PN}
}
src_unpack() {
default
# cd "${S}" || die "Couldn't cd into the source directory ${S}"
cd "${WORKDIR}/${PN}-v${PV}-amd64-arch" || die "Couldn't cd into the source directory ${S}"
# TODO: fix x86 installation :(
# tar xpf ${PN}-v${PV}-amd64-arch.tar || die "tar failed"
unpack ./${PN}-v${PV}-amd64-arch.tar || die "tar failed"
}
src_prepare() {
default
# We are not using the bundled libs
sed -i 's/^export.*$//' "${S}/opt/${PN}/bin/${PN}-wrapper"
}
src_install() {
doins -r "${S}/usr"
newbin "${S}/opt/${PN}/bin/${PN}-wrapper" "${PN}"
insinto /opt/${PN}/bin/
insopts -m755
doins -r "${S}/opt/${PN}/bin/${PN}"
doins "${S}/opt/${PN}/bin/openconnect"
doins "${S}/opt/${PN}/bin/vpnc-script"
# torguard sysusers conf
insinto /usr/lib/sysusers.d
newins "${FILESDIR}/${PN}.sysusers" "${PN}.conf"
# Let's use the system implementation of openvpn
dosym "/usr/sbin/openvpn" "${EROOT}/opt/${PN}/bin/openvpn_v2_4"
# 20181219 - using the wrapper instead of using the binary directly
# dosym "${EROOT}/opt/${PN}/bin/${PN}" "${EROOT}/usr/bin/${PN}"
}
#pkg_postrm() {
# default
# userdel -r ${PN}
# groupdel ${PN}
#}
diff --git a/module/Makefile b/module/Makefile
index 6994666..b9255ee 100644
index 6994666..4ef8a25 100644
--- a/module/Makefile
+++ b/module/Makefile
@@ -2,12 +2,13 @@
@@ -1,13 +1,14 @@
# Makefile for linking kernel modules
MYMODULE = netatop
KERNDIR = /lib/modules/$(shell uname -r)/build
-KERNDIR = /lib/modules/$(shell uname -r)/build
+KERNDIR = $(KERN_DIR)
THISDIR = $(shell pwd)
+ARCH = $(shell uname -m)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment