Version bump, mostly packaging cleanup over previous version

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

2 files changed, 47 insertions, 63 deletions

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