From 11e5121a62262ee7b3743b9c49f8405c217c73fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 3 Jun 2017 12:47:35 +0200 Subject: Revert "Try Lutris" This reverts commit 0620aebabb6a67b976a55db5180115be0f362dc0. --- profiles/desktop/packages | 3 --- 1 file changed, 3 deletions(-) diff --git a/profiles/desktop/packages b/profiles/desktop/packages index 7234386..4e3c876 100644 --- a/profiles/desktop/packages +++ b/profiles/desktop/packages @@ -88,9 +88,6 @@ media-sound/audacity media-gfx/gimp media-gfx/inkscape -# Gaming -games-util/lutris - # Themes x11-themes/clearlooks-phenix x11-themes/gnome-icon-theme -- cgit v1.2.3 From a705ae38c946d56dda7543a756c026267bc0261a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 3 Jun 2017 16:18:53 +0200 Subject: Accept ncmpcpp --- profiles/desktop/package.accept_keywords | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/profiles/desktop/package.accept_keywords b/profiles/desktop/package.accept_keywords index 09f57a1..1eb7617 100644 --- a/profiles/desktop/package.accept_keywords +++ b/profiles/desktop/package.accept_keywords @@ -16,7 +16,8 @@ www-client/surf ~amd64 # For firefox dev-libs/nss ~amd64 -# mpv +# Media media-video/mpv ~amd64 +media-sound/ncmpcpp ~amd64 x11-libs/libdrm ~amd64 -- cgit v1.2.3 From 904e2619fab957de1a906955b120e89e17cd231c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 10 Jun 2017 20:56:42 +0200 Subject: Update Linux to version 4.11.4 --- sys-kernel/linux/Manifest | 2 +- sys-kernel/linux/linux-4.11.3-r2.ebuild | 74 --------------------------------- sys-kernel/linux/linux-4.11.4-r1.ebuild | 74 +++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 sys-kernel/linux/linux-4.11.3-r2.ebuild create mode 100644 sys-kernel/linux/linux-4.11.4-r1.ebuild diff --git a/sys-kernel/linux/Manifest b/sys-kernel/linux/Manifest index 092cb44..59bfe90 100644 --- a/sys-kernel/linux/Manifest +++ b/sys-kernel/linux/Manifest @@ -1 +1 @@ -DIST linux-4.11.3.tar.gz 147155032 SHA256 b70c23f6c14d4b2ba8827bcc50b78201e399be7ed39dff92b24a27f82a2d59ee SHA512 9a681dd9dee31419359e1d102644d0180240522df171631c575f0f4becbb8ea8d8589b4972b885fbf8fe971856a1e9ad6736df5db23f471e04c0d9e0c4784380 WHIRLPOOL 4020cf15ae7eb2f341dcce0e07bf8382bf4fb6ca94ba1b20abd66784f84d527868058870f2ac6ec9259c5ed582e68411b74587bba2a55fe8ea717f79ca528309 +DIST linux-4.11.4.tar.gz 147165069 SHA256 b9cd9ad8e65265fd9ffe237b49e10f6b2fb1d048800f70ce2dc3537a646b61cf SHA512 ac87f85a013d4e7215408b6d2d386e3254eb8fa09d3462cd63c2b394ec2dddc119b14b6aed8ed0f846c86fedf33f4fa8273acfe5a6ef5f58c18ec4d8b12beb1d WHIRLPOOL 16910143ed1f2e8286af7d2108607a9c1468f5af5017cf97fcf3924789083433d9f1236e4728a69c252fa09bd8cad0098ce4353b95adcd404714710c15afaae9 diff --git a/sys-kernel/linux/linux-4.11.3-r2.ebuild b/sys-kernel/linux/linux-4.11.3-r2.ebuild deleted file mode 100644 index 0dcdd3e..0000000 --- a/sys-kernel/linux/linux-4.11.3-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -VER="${PV%-r*}" -REV="r${PV##*-r}" - -DESCRIPTION="Linux kernel" -HOMEPAGE="http://kernel.org/" -SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/snapshot/linux-stable-${VER}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/linux-stable-${VER}" - -LICENSE="GPLv2" -SLOT="${PV}" -KEYWORDS="amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - sys-boot/myinitramfs" - -src_configure() { - # Fix ARCH variable - [ "$ARCH" = "amd64" ] && ARCH="x86" - - "${FILESDIR}"/config_prepare.sh || die "Configuration application failed" -} - -src_install() { - emake modules_install INSTALL_MOD_PATH="${D}" INSTALL_FW_PATH="${D}/lib/firmware/${PV}" - - dodir /boot - insinto /boot - newins "${S}/arch/$ARCH/boot/bzImage" "bzlinux-${PV}" - - # Package source (kind of annoying because of some packages expecting it) - emake clean - dodir /usr/src - cp -a "${S}" "${D}/usr/src/linux-${PV}" -} - -# Link /usr/src/linux to newest kernel -src_link() { - ( - cd "${ROOT}/usr/src" - rm -f linux - ln -s $(ls | grep "linux-" | sort | tail -1) linux - ) -} - -pkg_postinst() { - # Add label to syslinux config if there is non yet - SYSLINUX="${ROOT}/boot/syslinux/syslinux.cfg" - if ! grep -q "^LABEL gentoo-${PV}$" "${SYSLINUX}"; then - ARGS="$(grep -E "^# ARGS: " "${SYSLINUX}" | sed 's/^# ARGS: //')" - if [ -n "$ARGS" ]; then - sed -i "/^## Dynamic labels ##$/a LABEL gentoo-${PV}\n\tMENU LABEL Gentoo ${PV}\n\tLINUX ../bzlinux-${PV}\n\tAPPEND ${ARGS}\n\tINITRD ../initramfs-gentoo\n" "${SYSLINUX}" || eerror "Adding label to syslinux configuration failed!" - sed -i "/^## Dynamic recovery labels ##$/a LABEL gentoo-${PV}\n\tMENU LABEL Gentoo ${PV} - Recovery\n\tLINUX ../bzlinux-${PV}\n\tAPPEND ${ARGS} recovery\n\tINITRD ../initramfs-gentoo\n" "${SYSLINUX}" || eerror "Adding recovery label to syslinux configuration failed!" - else - eerror "Adding label to syslinux configuration failed as there are no arguments" - fi - fi - src_link -} - -pkg_prerm() { - # Remove label from syslinux config - sed -i "/^LABEL gentoo-${PV}(|-recovery)$/,/^$/d" /boot/syslinux/syslinux.cfg || eerror "Removing label from syslinux fonfiguration failed!" -} - -pkg_postrm() { - src_link -} diff --git a/sys-kernel/linux/linux-4.11.4-r1.ebuild b/sys-kernel/linux/linux-4.11.4-r1.ebuild new file mode 100644 index 0000000..0dcdd3e --- /dev/null +++ b/sys-kernel/linux/linux-4.11.4-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +VER="${PV%-r*}" +REV="r${PV##*-r}" + +DESCRIPTION="Linux kernel" +HOMEPAGE="http://kernel.org/" +SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/snapshot/linux-stable-${VER}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/linux-stable-${VER}" + +LICENSE="GPLv2" +SLOT="${PV}" +KEYWORDS="amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + sys-boot/myinitramfs" + +src_configure() { + # Fix ARCH variable + [ "$ARCH" = "amd64" ] && ARCH="x86" + + "${FILESDIR}"/config_prepare.sh || die "Configuration application failed" +} + +src_install() { + emake modules_install INSTALL_MOD_PATH="${D}" INSTALL_FW_PATH="${D}/lib/firmware/${PV}" + + dodir /boot + insinto /boot + newins "${S}/arch/$ARCH/boot/bzImage" "bzlinux-${PV}" + + # Package source (kind of annoying because of some packages expecting it) + emake clean + dodir /usr/src + cp -a "${S}" "${D}/usr/src/linux-${PV}" +} + +# Link /usr/src/linux to newest kernel +src_link() { + ( + cd "${ROOT}/usr/src" + rm -f linux + ln -s $(ls | grep "linux-" | sort | tail -1) linux + ) +} + +pkg_postinst() { + # Add label to syslinux config if there is non yet + SYSLINUX="${ROOT}/boot/syslinux/syslinux.cfg" + if ! grep -q "^LABEL gentoo-${PV}$" "${SYSLINUX}"; then + ARGS="$(grep -E "^# ARGS: " "${SYSLINUX}" | sed 's/^# ARGS: //')" + if [ -n "$ARGS" ]; then + sed -i "/^## Dynamic labels ##$/a LABEL gentoo-${PV}\n\tMENU LABEL Gentoo ${PV}\n\tLINUX ../bzlinux-${PV}\n\tAPPEND ${ARGS}\n\tINITRD ../initramfs-gentoo\n" "${SYSLINUX}" || eerror "Adding label to syslinux configuration failed!" + sed -i "/^## Dynamic recovery labels ##$/a LABEL gentoo-${PV}\n\tMENU LABEL Gentoo ${PV} - Recovery\n\tLINUX ../bzlinux-${PV}\n\tAPPEND ${ARGS} recovery\n\tINITRD ../initramfs-gentoo\n" "${SYSLINUX}" || eerror "Adding recovery label to syslinux configuration failed!" + else + eerror "Adding label to syslinux configuration failed as there are no arguments" + fi + fi + src_link +} + +pkg_prerm() { + # Remove label from syslinux config + sed -i "/^LABEL gentoo-${PV}(|-recovery)$/,/^$/d" /boot/syslinux/syslinux.cfg || eerror "Removing label from syslinux fonfiguration failed!" +} + +pkg_postrm() { + src_link +} -- cgit v1.2.3 From 257bf4556c063cd62c261fe120c789b40a9f8797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Fri, 16 Jun 2017 17:28:19 +0200 Subject: Drop latex --- profiles/cynerd-laptop/parent | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/cynerd-laptop/parent b/profiles/cynerd-laptop/parent index a9a880b..7a68153 100644 --- a/profiles/cynerd-laptop/parent +++ b/profiles/cynerd-laptop/parent @@ -3,5 +3,4 @@ ../laptop ../qemu ../devel -../latex ../steam -- cgit v1.2.3 From e65c163df6d0a1f6c2e7e4218bf39bd7863ee8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 18 Jun 2017 20:53:54 +0200 Subject: Drop surf (problems with webkit dependency) --- profiles/cynerd-laptop/packages | 3 --- profiles/cynerd-pc/packages | 3 --- profiles/desktop/packages | 1 - 3 files changed, 7 deletions(-) diff --git a/profiles/cynerd-laptop/packages b/profiles/cynerd-laptop/packages index 7df11ba..381b3d6 100644 --- a/profiles/cynerd-laptop/packages +++ b/profiles/cynerd-laptop/packages @@ -1,5 +1,2 @@ # For now let's use chrome www-client/google-chrome - -# Testing new browser -www-client/surf diff --git a/profiles/cynerd-pc/packages b/profiles/cynerd-pc/packages index 947c723..259c948 100644 --- a/profiles/cynerd-pc/packages +++ b/profiles/cynerd-pc/packages @@ -1,4 +1 @@ www-client/chromium - -# Testing new browser -www-client/surf diff --git a/profiles/desktop/packages b/profiles/desktop/packages index 4e3c876..bb2e3c9 100644 --- a/profiles/desktop/packages +++ b/profiles/desktop/packages @@ -50,7 +50,6 @@ dev-python/python-daemon # Web www-client/conkeror -www-client/surf # Media media-sound/pulseaudio -- cgit v1.2.3 From b09968c7baa8ea53e213f894b81e38c94da17c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 18 Jun 2017 21:03:33 +0200 Subject: Remove obsolate font vera --- profiles/desktop/packages | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/desktop/packages b/profiles/desktop/packages index bb2e3c9..d474e4e 100644 --- a/profiles/desktop/packages +++ b/profiles/desktop/packages @@ -121,7 +121,6 @@ media-fonts/sil-gentium media-fonts/symbola media-fonts/takao-fonts media-fonts/terminus-font -media-fonts/ttf-bitstream-vera media-fonts/ubuntu-font-family media-fonts/unifont media-fonts/urw-fonts -- cgit v1.2.3