summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2015-01-12 10:34:11 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2015-01-12 10:34:11 +0000
commit18f77752eb0b44ee68874a07234342424f968e29 (patch)
tree3af0ac778ff86e3fb0b55016bb4192c572b78b6e /x11-plugins/wmacpi
parentStable for HPPA (bug #536086). (diff)
downloadgentoo-2-18f77752eb0b44ee68874a07234342424f968e29.tar.gz
gentoo-2-18f77752eb0b44ee68874a07234342424f968e29.tar.bz2
gentoo-2-18f77752eb0b44ee68874a07234342424f968e29.zip
Version bump, mostly packaging cleanup over previous version
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C74525F2)
Diffstat (limited to 'x11-plugins/wmacpi')
-rw-r--r--x11-plugins/wmacpi/ChangeLog11
-rw-r--r--x11-plugins/wmacpi/files/wmacpi-2.2-makefile.patch63
-rw-r--r--x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch47
-rw-r--r--x11-plugins/wmacpi/wmacpi-2.3.ebuild (renamed from x11-plugins/wmacpi/wmacpi-2.2.ebuild)4
4 files changed, 58 insertions, 67 deletions
diff --git a/x11-plugins/wmacpi/ChangeLog b/x11-plugins/wmacpi/ChangeLog
index 76df0d0e8c65..ba7870c76eed 100644
--- a/x11-plugins/wmacpi/ChangeLog
+++ b/x11-plugins/wmacpi/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-plugins/wmacpi
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.26 2014/11/05 13:04:39 voyageur Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.27 2015/01/12 10:34:11 voyageur Exp $
+
+*wmacpi-2.3 (12 Jan 2015)
+
+ 12 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org> -wmacpi-2.2.ebuild,
+ +wmacpi-2.3.ebuild, -files/wmacpi-2.2-makefile.patch,
+ +files/wmacpi-2.3-makefile.patch:
+ Version bump, mostly packaging cleanup over previous version
05 Nov 2014; Bernard Cafarelli <voyageur@gentoo.org> wmacpi-2.2.ebuild:
Host tarball on my devspace, bug #527610
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.2-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.2-makefile.patch
deleted file mode 100644
index 930f83459ced..000000000000
--- a/x11-plugins/wmacpi/files/wmacpi-2.2-makefile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- Makefile.orig 2014-10-10 14:37:55.000000000 +0200
-+++ Makefile 2014-10-10 15:00:33.348752026 +0200
-@@ -13,8 +13,8 @@
- #OPT = -pg -g
-
- CC := gcc
--CFLAGS += $(OPT) -Wall -W -g -ansi -I/usr/X11R6/include
--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,8 @@
- doc_targets += wmacpi-cli.1
- endif
-
--PREFIX := /usr/local
-+PREFIX := /usr
-+MANDIR := $(PREFIX)/share/man
-
- all: $(targets)
-
-@@ -37,7 +38,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 +48,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
-@@ -62,10 +63,10 @@
- rm -f *.d $(targets)
-
- install: $(targets)
-- install -d $(PREFIX)/bin/
-- install -pc $(targets) $(PREFIX)/bin/
-- install -d $(PREFIX)/share/man/man1/
-- install -pc $(doc_targets) $(PREFIX)/share/man/man1/
-+ install -d $(DESTDIR)$(PREFIX)/bin/
-+ install -pc $(targets) $(DESTDIR)$(PREFIX)/bin/
-+ install -d $(DESTDIR)$(MANDIR)/man1/
-+ install -pc $(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/wmacpi-2.2.ebuild b/x11-plugins/wmacpi/wmacpi-2.3.ebuild
index 70c8c841272e..f03e26b90e2a 100644
--- a/x11-plugins/wmacpi/wmacpi-2.2.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.3.ebuild
@@ -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/x11-plugins/wmacpi/wmacpi-2.2.ebuild,v 1.2 2014/11/05 13:04:39 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-2.3.ebuild,v 1.1 2015/01/12 10:34:11 voyageur Exp $
EAPI=5
inherit eutils toolchain-funcs