Respect CFLAGS (bug #241552), LDFLAGS, CC. Do not strip (bug #241488). Install man pages properly (bug #248591).

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 44 insertions, 12 deletions

diff --git a/x11-misc/xrootconsole/ChangeLog b/x11-misc/xrootconsole/ChangeLog
index 4c15f680cbc1..71d3cba204ad 100644
--- a/x11-misc/xrootconsole/ChangeLog
+++ b/x11-misc/xrootconsole/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xrootconsole
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/ChangeLog,v 1.22 2007/07/22 03:18:33 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/ChangeLog,v 1.23 2010/02/08 11:10:28 jer Exp $
+
+  08 Feb 2010; Jeroen Roovers <jer@gentoo.org> xrootconsole-0.6.ebuild,
+  files/xrootconsole-0.6.makefile.patch:
+  Respect CFLAGS (bug #241552), LDFLAGS, CC. Do not strip (bug #241488).
+  Install man pages properly (bug #248591).
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   xrootconsole-0.4-r1.ebuild:
diff --git a/x11-misc/xrootconsole/Manifest b/x11-misc/xrootconsole/Manifest
index 106b01d644e2..11a309b00e0c 100644
--- a/x11-misc/xrootconsole/Manifest
+++ b/x11-misc/xrootconsole/Manifest
@@ -1,10 +1,10 @@
 AUX xrootconsole-0.4.parse-color.patch 840 RMD160 87c1776701f22a9e6003c1432aed18952b13debe SHA1 f416cecc899405adce99d75246c1e29716579021 SHA256 3c65a902ef7ae2036045d35ac19310df8a57048566b486b4e7db5319e433e488
-AUX xrootconsole-0.6.makefile.patch 323 RMD160 19f2f2251f423680e56ac694a336286381569d1d SHA1 711a1e553f5ce066c3c8560feab3078505777360 SHA256 ed96f37e0c5446a03b98bbfd3d508cb061689ef11422452a3c589d21ea88b173
+AUX xrootconsole-0.6.makefile.patch 945 RMD160 45398811c5efbd4bc869993cb1e9f826e99117f7 SHA1 a9fcacfea4785718a40892f15e931f72bada4014 SHA256 7795c186c3aed75a2191d2c1df366ae433b2fb8943300b0aa8d321fa703c3f1c
 AUX xrootconsole-0.6.manpage.patch 1034 RMD160 35cdbf17a85911c2ae5372bc3cc9e94631696cb7 SHA1 42ccb182ea6fd0e6776cf27f6983922594109fc7 SHA256 e9bb10b38b5b84f04906309428b84ffb4f7bc26f613a2ec9baec60140d15c629
 AUX xrootconsole-0.6.noversion.patch 1776 RMD160 7937db54ad8d38773cafafbfae33e68a247c0c04 SHA1 68229cdeb434ea95bac67853296e0185e61209a2 SHA256 609d3952c207159bd701d0f637896d958c08c0e332527c940f00bf70c8a46042
 DIST xrootconsole-0.4.tar.gz 15397 RMD160 fd77dd338153bc8fbd48148dc1888c38c513eecd SHA1 cd10e96e3cc0783de63e70c08f09cda6769f5c18 SHA256 0543dc39e0ce9980620214d4885644d18ad249f2a1c8367b93a00bf538df425d
 DIST xrootconsole-0.6.tar.gz 15951 RMD160 3dd6058316fd72f428fbef9fd5385e75c82a9683 SHA1 6c4bdbe979ce15d00c2e1efde672a6a99228ceb4 SHA256 8306de6f4d3f39677334ee65214e46729cf2dd89aeff1705df3c499738a4076d
 EBUILD xrootconsole-0.4-r1.ebuild 750 RMD160 fdd27e78309578fdbd8c82cf5eea8787163911cb SHA1 2171a6501c047ec83a9b31479664993387ec3c9e SHA256 9084f803730470336a677e5466860e6773f49f4f2ca1273adfbaaf6a9cfe010a
-EBUILD xrootconsole-0.6.ebuild 903 RMD160 e149a2293f7324699602bce6d17aa212939bada2 SHA1 3cd84ad374dae2cbdec895f3e019bfdf174fb1fb SHA256 a248425b316c5bb3d6f0ab18c2774066605debe48c0c9ffcaf18c7e9376d5e71
-MISC ChangeLog 2637 RMD160 79c117b09238aab178ea62b2b142c4c6ec272522 SHA1 ccfc6d175fcf5c276eeb399e6f84cbadffed0c2c SHA256 7999afd5b8b522b6196bdebc3004df5d0670b5c1bbca1a5b8d530c979adbb33b
+EBUILD xrootconsole-0.6.ebuild 966 RMD160 bf963be91e1343f0fdc803342afab2212b617009 SHA1 ed03016f2dbfd115777bd547dbcaa4dff15fc67a SHA256 3a678f50ab0a727a4349cd4ad48e46f64f5809c3795f57c457f8ae31fc85fe52
+MISC ChangeLog 2862 RMD160 1297ee68421c81da134a0ed9953a91dbf1fbce2b SHA1 e81f85a5d5f011e66e317d1a56fe108c60c15a14 SHA256 120d749dd7a852cc9e9ed2733fca1b9b711d1901a27a25f8c75af1a16f8ddb1f
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch b/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch
index ce74eb115e96..37fd4fb074a9 100644
--- a/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch
+++ b/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch
@@ -1,6 +1,30 @@
---- Makefile.orig	2005-03-06 16:46:36.325616480 +0900
-+++ Makefile	2005-03-06 16:46:55.140756144 +0900
-@@ -76,5 +76,7 @@
+--- xrootconsole-0.6/Makefile.org	2004-02-20 22:53:28.000000000 +0100
++++ xrootconsole-0.6/Makefile	2010-02-08 12:01:11.000000000 +0100
+@@ -43,20 +43,16 @@
+             else echo Bleeding Edge Version; \
+         fi;)
+ 
+-CC = gcc
+-CPPFLAGS =
+-
+ # for production
+-CFLAGS = -O2 -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \
+-    -I /usr/X11R6/include
+-LDFLAGS = -s
++CFLAGS += -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \
++    $(shell pkg-config --cflags x11)
+ 
+ # for testing
+ #CFLAGS = -g -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION) (debug build)\"" \
+     -I /usr/X11R6/include
+ #LDFLAGS = 
+ 
+-LIBS = -L/usr/X11R6/lib -lX11 -lutil
++LIBS = $(shell pkg-config --libs x11) -lutil
+ 
+ OBJS = main.o util.o
+ 
+@@ -76,5 +72,7 @@
  	rm -f $(EXEC) *.o core *~
  
  install: $(EXEC)
diff --git a/x11-misc/xrootconsole/xrootconsole-0.6.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6.ebuild
index 0a07cb8be445..1834e9a4fcdc 100644
--- a/x11-misc/xrootconsole/xrootconsole-0.6.ebuild
+++ b/x11-misc/xrootconsole/xrootconsole-0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/xrootconsole-0.6.ebuild,v 1.3 2006/10/21 21:25:52 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrootconsole/xrootconsole-0.6.ebuild,v 1.4 2010/02/08 11:10:28 jer Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A utility that displays its input in a text box on your root window"
 HOMEPAGE="http://de-fac.to/book/view/17"
@@ -27,6 +27,7 @@ src_unpack() {
 }
 
 src_compile() {
+	tc-export CC
 	emake || die "emake failed"
 }
 
@@ -34,7 +35,9 @@ src_install() {
 	dodir /usr/bin
 
 	make \
-		MANDIR="${D}usr/man/man1" \
+		MANDIR="${D}usr/share/man/man1" \
 		BINDIR="${D}usr/bin/" \
 		install || die "make install failed"
+	
+	dodoc TODO NEWS CREDITS
 }