summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-plugins/wmacpi
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-plugins/wmacpi')
-rw-r--r--x11-plugins/wmacpi/Manifest3
-rw-r--r--x11-plugins/wmacpi/files/1.34-acpi.patch17
-rw-r--r--x11-plugins/wmacpi/files/1.34-apm.patch17
-rw-r--r--x11-plugins/wmacpi/files/2.1rc1-nodeps.patch20
-rw-r--r--x11-plugins/wmacpi/files/2.1rc1-windowed.patch29
-rw-r--r--x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch71
-rw-r--r--x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch47
-rw-r--r--x11-plugins/wmacpi/metadata.xml8
-rw-r--r--x11-plugins/wmacpi/wmacpi-1.34.ebuild37
-rw-r--r--x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild43
-rw-r--r--x11-plugins/wmacpi/wmacpi-2.3.ebuild34
11 files changed, 326 insertions, 0 deletions
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
new file mode 100644
index 000000000000..d7511807aeeb
--- /dev/null
+++ b/x11-plugins/wmacpi/Manifest
@@ -0,0 +1,3 @@
+DIST wmacpi-1.34.tar.gz 15509 SHA256 65f7a1da06fd3489ed97391d1c9b77b570bc30c14b1f846007028353d0fa51e2
+DIST wmacpi-2.2rc1.tar.bz2 30233 SHA256 25fc405e6e653caf9cfd90104b184cb4ed73114e710e229ed012ec155083a11f
+DIST wmacpi-2.3.tar.gz 39374 SHA256 5ae0ae6ca447e29acaf206f2321a50207509eb2a17ccb98ed196adf734263105 SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9 WHIRLPOOL 0735582a3ee47144ab6ae57a5f6095a2adb006e62b536620b1036dab9ccee4b3ef6e581fde314440398cfc622f4db1ff150ec6c64ce08e791c2559397ef7cb8d
diff --git a/x11-plugins/wmacpi/files/1.34-acpi.patch b/x11-plugins/wmacpi/files/1.34-acpi.patch
new file mode 100644
index 000000000000..76a94e57f77e
--- /dev/null
+++ b/x11-plugins/wmacpi/files/1.34-acpi.patch
@@ -0,0 +1,17 @@
+--- Makefile.orig 2003-09-04 13:00:48.784055072 -0400
++++ Makefile 2003-09-04 13:03:41.399813488 -0400
+@@ -11,11 +11,11 @@
+ #OPT = -pg -g -DPRO -DACPI
+
+ CC = gcc
+-CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include
++CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include -DACPI
+ LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
+
+-SRCS = wmacpi.c libapm.c libacpi.c
+-OBJS = wmacpi.o libapm.o libacpi.o
++SRCS = wmacpi.c libacpi.c
++OBJS = wmacpi.o libacpi.o
+
+ all: wmacpi
+
diff --git a/x11-plugins/wmacpi/files/1.34-apm.patch b/x11-plugins/wmacpi/files/1.34-apm.patch
new file mode 100644
index 000000000000..6b640b781b13
--- /dev/null
+++ b/x11-plugins/wmacpi/files/1.34-apm.patch
@@ -0,0 +1,17 @@
+--- Makefile.orig 2003-09-04 13:00:48.784055072 -0400
++++ Makefile 2003-09-04 13:04:23.297444080 -0400
+@@ -11,11 +11,11 @@
+ #OPT = -pg -g -DPRO -DACPI
+
+ CC = gcc
+-CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include
++CFLAGS = $(OPT) -Wall -ansi -I/usr/X11R6/include -DAPM
+ LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
+
+-SRCS = wmacpi.c libapm.c libacpi.c
+-OBJS = wmacpi.o libapm.o libacpi.o
++SRCS = wmacpi.c libapm.c
++OBJS = wmacpi.o libapm.o
+
+ all: wmacpi
+
diff --git a/x11-plugins/wmacpi/files/2.1rc1-nodeps.patch b/x11-plugins/wmacpi/files/2.1rc1-nodeps.patch
new file mode 100644
index 000000000000..60c29ace2543
--- /dev/null
+++ b/x11-plugins/wmacpi/files/2.1rc1-nodeps.patch
@@ -0,0 +1,20 @@
+--- wmacpi-2.1rc1/Makefile.orig 2005-01-25 09:55:01.637030220 +0100
++++ wmacpi-2.1rc1/Makefile 2005-01-25 09:55:19.265329634 +0100
+@@ -34,7 +34,7 @@
+ WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC)))
+
+ # include per-file dependencies
+-include $(WMOBJ:.o=.d)
++#include $(WMOBJ:.o=.d)
+
+ wmacpi: $(WMOBJ)
+ $(CC) $(LDFLAGS) -o $@ $^
+@@ -44,7 +44,7 @@
+ ifdef BUILD_CLI
+ CLSRC := acpi.c libacpi.c
+ CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC)))
+-include $(CLOBJ:.o=.d)
++#include $(CLOBJ:.o=.d)
+
+ acpi: $(CLOBJ)
+ $(CC) $(LDFLAGS) -o $@ $^
diff --git a/x11-plugins/wmacpi/files/2.1rc1-windowed.patch b/x11-plugins/wmacpi/files/2.1rc1-windowed.patch
new file mode 100644
index 000000000000..844183727eec
--- /dev/null
+++ b/x11-plugins/wmacpi/files/2.1rc1-windowed.patch
@@ -0,0 +1,29 @@
+--- wmacpi-2.1rc1/wmacpi.c.orig 2005-01-05 07:16:09.000000000 +0100
++++ wmacpi-2.1rc1/wmacpi.c 2005-01-25 10:03:47.933403683 +0100
+@@ -574,7 +574,8 @@
+ "\t\t\tdefault 20 (once every three seconds)\n"
+ "-f\t\t\tforce the use of capacity mode for calculating time remaining\n"
+ "-n\t\t\tdo not blink\n"
+- "-w\t\t\trun in command line mode\n"
++ "-w\t\t\trun in windowed mode\n"
++ "-x\t\t\trun in command line mode\n"
+ "-a <samples>\t\tsamples to average over (cli mode only)\n"
+ "-v\t\t\tincrease verbosity\n"
+ "\t\t\tcan be used multiple times to increase verbosity further\n"
+@@ -728,9 +729,15 @@
+ case 'n':
+ dockapp->blink = 0;
+ break;
+- case 'w':
++ case 'x':
+ cli = 1;
+ break;
++ case 'w':
++ {
++ char *args[] = { "", "-w" };
++ DAParseArguments(2, args, NULL, 0, "", "");
++ }
++ break;
+ case 'a':
+ if(optarg != NULL) {
+ samples = atoi(optarg);
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch
new file mode 100644
index 000000000000..af142fd574ee
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch
@@ -0,0 +1,71 @@
+--- Makefile.orig 2007-07-13 17:26:30.000000000 +0200
++++ Makefile 2008-01-28 16:36:41.000000000 +0100
+@@ -13,8 +13,8 @@
+ #OPT = -pg -g
+
+ CC := gcc
+-CFLAGS := $(OPT) -Wall -W -g -ansi -I/usr/X11R6/include
+-LDFLAGS := $(OPT) -lX11 -ldockapp
++CFLAGS := $(OPT) -Wall -W -g -ansi -I/usr/include
++LDFLAGS += -lX11 -ldockapp
+
+ WMSRC := wmacpi.c libacpi.c
+ HEADERS := libacpi.h wmacpi.h
+@@ -22,11 +22,12 @@
+ doc_targets := wmacpi.1
+
+ ifdef BUILD_CLI
+-targets += acpi
+-doc_targets += acpi.1
++targets += acpi-batt-status
++doc_targets += acpi-batt-status.1
+ endif
+
+-PREFIX := /usr/local
++PREFIX := /usr
++MANDIR := $(PREFIX)/share/man
+
+ all: $(targets)
+
+@@ -34,20 +35,20 @@
+ WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC)))
+
+ # include per-file dependencies
+--include $(WMOBJ:.o=.d)
++#-include $(WMOBJ:.o=.d)
+
+ wmacpi: $(WMOBJ)
+- $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+ # for the Debian package, we want to make building the command line tools
+ # optional. So, we hide all the necessary stuff here . . .
+ ifdef BUILD_CLI
+-CLSRC := acpi.c libacpi.c
++CLSRC := acpi-batt-status.c libacpi.c
+ CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC)))
+--include $(CLOBJ:.o=.d)
++#-include $(CLOBJ:.o=.d)
+
+-acpi: $(CLOBJ)
+- $(CC) $(LDFLAGS) -o $@ $^
++acpi-batt-status: $(CLOBJ)
++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ endif
+
+ # build per-file dependencies - note that -MM may not be supported
+@@ -62,10 +63,10 @@
+ rm -f *.d $(targets)
+
+ install: $(targets)
+- install -d $(PREFIX)/bin/
+- install -pc $(targets) $(PREFIX)/bin/
+- install -d $(PREFIX)/man/man1/
+- install -pc $(doc_targets) $(PREFIX)/man/man1/
++ install -d $(DESTDIR)$(PREFIX)/bin/
++ install -pc $(targets) $(DESTDIR)$(PREFIX)/bin/
++ install -d $(DESTDIR)$(MANDIR)/man1/
++ install -p -m 0644 $(doc_targets) $(DESTDIR)$(MANDIR)/man1/
+
+ tags:
+ etags $(WMSRC) $(CLSRC) $(HEADERS)
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
new file mode 100644
index 000000000000..d1ec49689060
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
@@ -0,0 +1,47 @@
+--- Makefile.orig 2015-01-12 11:27:07.396319323 +0100
++++ Makefile 2015-01-12 11:29:21.531298827 +0100
+@@ -13,8 +13,8 @@
+ #OPT = -pg -g
+
+ CC := gcc
+-CFLAGS += $(OPT) -Wall -W -g -ansi
+-LDFLAGS += $(OPT) -lX11 -ldockapp
++CFLAGS := -Wall -W -g -ansi
++LIBS := -lX11 -ldockapp
+
+ WMSRC := wmacpi.c libacpi.c
+ HEADERS := libacpi.h wmacpi.h
+@@ -26,7 +26,7 @@
+ doc_targets += wmacpi-cli.1
+ endif
+
+-PREFIX := /usr/local
++PREFIX := /usr
+
+ all: $(targets)
+
+@@ -37,7 +37,7 @@
+ -include $(WMOBJ:.o=.d)
+
+ wmacpi: $(WMOBJ)
+- $(CC) -o $@ $^ $(LDFLAGS)
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ # for the Debian package, we want to make building the command line tools
+ # optional. So, we hide all the necessary stuff here . . .
+@@ -47,13 +47,13 @@
+ -include $(CLOBJ:.o=.d)
+
+ wmacpi-cli: $(CLOBJ)
+- $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ endif
+
+ # build per-file dependencies - note that -MM may not be supported
+ # in gcc versions older than 2.95.4, but most likely is.
+ %.d: %.c
+- gcc -MM $(CFLAGS) $< > $@
++ $(CC) -MM $(CFLAGS) $< > $@
+
+ clean:
+ rm -f TAGS *.o *~ trace *.out *.bb *.bbg
diff --git a/x11-plugins/wmacpi/metadata.xml b/x11-plugins/wmacpi/metadata.xml
new file mode 100644
index 000000000000..f1e1deaf8395
--- /dev/null
+++ b/x11-plugins/wmacpi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-dock</herd>
+<longdescription>
+WMaker DockApp: ACPI status monitor for laptops
+</longdescription>
+</pkgmetadata>
diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
new file mode 100644
index 000000000000..d1e6e1dd8fa7
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc -sparc x86"
+IUSE="acpi apm"
+
+DEPEND="x11-libs/libdockapp"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ use apm && use acpi && eerror "APM and ACPI are in USE ... defaulting to ACPI"
+ use apm || use acpi || eerror "Neither APM or ACPI are in USE ... defaulting to ACPI"
+ if use acpi || ! use apm ; then
+ epatch "${FILESDIR}"/${PV}-acpi.patch
+ else
+ epatch "${FILESDIR}"/${PV}-apm.patch
+ fi
+}
+
+src_compile() {
+ emake OPT="${CFLAGS}" || die "emake failed."
+}
+
+src_install() {
+ dobin wmacpi || die "dobin failed."
+ dodoc AUTHORS ChangeLog README
+}
diff --git a/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild b/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild
new file mode 100644
index 000000000000..4963b2f2e7ef
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
+HOMEPAGE="http://himi.org/wmacpi/"
+MY_PV="${PV/_}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://himi.org/wmacpi/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 -ppc -sparc x86"
+IUSE=""
+
+DEPEND="x11-libs/libdockapp
+ x11-libs/libX11"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ # acpi and acpi.1 conflict with sys-power/acpi - Bug #60685
+ mv acpi.c acpi-batt-status.c
+ mv acpi.1 acpi-batt-status.1
+ epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" OPT="${CFLAGS}" || die "compile failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "install failed"
+ dodoc AUTHORS ChangeLog README TODO
+}
+
+pkg_postinst() {
+ elog "The command-line utility are corresponding manpage are installed"
+ elog "as acpi-batt-status to prevent collisions with sys-power/acpi"
+}
diff --git a/x11-plugins/wmacpi/wmacpi-2.3.ebuild b/x11-plugins/wmacpi/wmacpi-2.3.ebuild
new file mode 100644
index 000000000000..9ec5c98b617f
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-2.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="DockApp ACPI status monitor for laptops"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmacpi"
+# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
+SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libdockapp
+ x11-libs/libX11"
+
+S=${WORKDIR}/dockapps
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog README TODO
+}