From: a Date: Wed, 21 Mar 2018 20:28:18 +0000 (+0100) Subject: Update ebuild X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=903603b3399dde9e6c4c109d0140c834e21b2d98;p=pinky-bar%2Fpinky-bar.git Update ebuild --- diff --git a/extra/Gentoo/app-admin/pinky-curses/pinky-curses-9999.ebuild b/extra/Gentoo/app-admin/pinky-curses/pinky-curses-9999.ebuild deleted file mode 100644 index c7452b3..0000000 --- a/extra/Gentoo/app-admin/pinky-curses/pinky-curses-9999.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -EGIT_REPO_URI="https://gitlab.com/void0/pinky-bar.git" - -inherit git-r3 - -DESCRIPTION="Standalone statusbar program utilizing ncurses" -HOMEPAGE="https://gitlab.com/void0/pinky-bar" - -LICENSE="GPL-2" -SLOT="0" - -DEPEND=" - sys-devel/m4 - sys-apps/gawk - sys-devel/autoconf - >=sys-devel/automake-1.14.1 -" -RDEPEND=" - sys-libs/ncurses -" - -src_prepare() { - default - - einfo 'Generating Makefiles' - chmod +x bootstrap - ./bootstrap 'gentoo' -} - -src_configure() { - econf \ - --without-alsa \ - --without-x11 \ - --without-mpd \ - --without-net \ - --without-pci \ - --without-dvd \ - --without-sensors \ - --without-weather \ - --with-ncurses \ - --with-colours -} - -src_compile() { - emake 'ncurses' -} - -src_install() { - newbin "${S}"/src/ncurses pinky-curses -} - -pkg_postinst() { - einfo 'The program is not tied to pinky-bar. Heres some short introduction:' - einfo 'Depending whether you enabled the colours: ^B - Blue , ^M - Magenta , ^Y - Yellow' - einfo 'And here is the complete usage, copy and paste ready. Press CTRL + C to stop the program.' - einfo 'while true; do echo "^BOh ^Mhello ^Ydear";sleep 1;done | /usr/bin/pinky-curses' -} diff --git a/extra/Gentoo/app-admin/pinky/metadata.xml b/extra/Gentoo/app-admin/pinky/metadata.xml index d82fc32..bc9fcb5 100644 --- a/extra/Gentoo/app-admin/pinky/metadata.xml +++ b/extra/Gentoo/app-admin/pinky/metadata.xml @@ -2,11 +2,11 @@ - office@gentoo.org - Gentoo Office project + a@b.com + pinky-bar - pinky-bar + pinky-bar Enable it if you are using dwm. @@ -25,5 +25,11 @@ Read the drive temperature from S.M.A.R.T Extend pinkybar with your own crafted scripts written in perl, stored in /usr/share/pinkysc/pinky.pl Extend pinkybar with your own crafted scripts written in python, stored in /usr/share/pinkysc/pinky.py + Extend pinkybar with your own crafted scripts written in ruby, stored in /usr/share/pinkysc/pinky.rb + Extend pinkybar with your own crafted scripts written in R, stored in /usr/share/pinkysc/pinky.R + Extend pinkybar with your own crafted scripts written in lisp, stored in /usr/share/pinkysc/pinky.lisp + Extend pinkybar with your own crafted scripts written in slang, stored in /usr/share/pinkysc/pinky.sl + Extend pinkybar with your own crafted scripts written in tcl, stored in /usr/share/pinkysc/pinky.tcl + Extend pinkybar with cpp diff --git a/extra/Gentoo/app-admin/pinky/pinky-bar-9999.ebuild b/extra/Gentoo/app-admin/pinky/pinky-bar-9999.ebuild index 6244270..5bfc264 100644 --- a/extra/Gentoo/app-admin/pinky/pinky-bar-9999.ebuild +++ b/extra/Gentoo/app-admin/pinky/pinky-bar-9999.ebuild @@ -4,22 +4,23 @@ EAPI=6 -EGIT_REPO_URI="https://gitlab.com/void0/pinky-bar.git" +EGIT_REPO_URI="https://github.com/su8/pinky-bar.git" inherit git-r3 DESCRIPTION="Gather some system information and show it in this statusbar program" -HOMEPAGE="https://gitlab.com/void0/pinky-bar" +HOMEPAGE="https://github.com/su8/pinky-bar" LICENSE="GPL-2" SLOT="0" -IUSE="x11 alsa +net libnl +pci dvd sensors ncurses colours weather mpd drivetemp drivetemp-light smartemp perl python2" +IUSE="x11 alsa +net libnl +pci dvd sensors ncurses colours weather mpd drivetemp drivetemp-light smartemp perl python2 lua ruby R lisp slang tcl cpp" DEPEND=" sys-devel/m4 sys-apps/gawk sys-devel/autoconf >=sys-devel/automake-1.14.1 + dev-lang/perl " RDEPEND=" alsa? ( media-libs/alsa-lib ) @@ -36,6 +37,12 @@ RDEPEND=" drivetemp-light? ( app-admin/hddtemp ) smartemp? ( sys-apps/smartmontools ) python2? ( dev-lang/python:2.7= ) + lua? ( dev-lang/lua ) + ruby? ( dev-lang/ruby ) + R? ( dev-lang/R ) + lisp? ( dev-lips/ecls ) + slang? ( sys-libs/slang ) + tcl? ( dev-lang/tcl ) " REQUIRED_USE=" x11? ( !ncurses ) @@ -58,8 +65,8 @@ src_prepare() { default einfo 'Generating Makefiles' - chmod +x bootstrap - ./bootstrap 'gentoo' + perl set.pl 'gentoo' + autoreconf -if } src_configure() { @@ -67,6 +74,14 @@ src_configure() { econf \ $(use_with x11) \ + $(use_with lua) \ + $(use_with ruby) \ + $(use_with R) \ + $(use_with lisp) \ + $(use_with slang) \ + $(use_with tcl) \ + $(use_with cpp) \ + $(use_with x11) \ $(use_with alsa) \ $(use_with net) \ $(use_with libnl) \ @@ -100,10 +115,12 @@ src_install() { doins "${S}"/extra/xbm_icons/* fi - if use perl || use python2 + if use perl || use python2 || use lua || \ + use R || use ruby || use rust || use tcl \ + use slang || use lisp then insinto /usr/share/pinkysc - doins "${S}"/extra/scripts/pinky.{py,pl} + doins "${S}"/extra/scripts/pinky.{py,pl,R,rb,sl,tcl,lua,lisp} fi emake DESTDIR="${D}" install @@ -113,11 +130,10 @@ pkg_postinst() { use ncurses && \ einfo 'You can combine the output from this program with pinky-curses' - use perl && \ - einfo 'The perl script resides in /usr/share/pinkysc/pinky.pl' - - use python2 && \ - einfo 'The python2 script resides in /usr/share/pinkysc/pinky.py' + use perl || use python2 || use lua || \ + use R || use ruby || use tcl \ + use slang || use lisp && \ + einfo 'The script resides in /usr/share/pinkysc/' einfo 'Please read the program man page' }