Fix pre-stripped files issue ( bug 251868 ) and respect LDFLAGS

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

5 files changed, 44 insertions, 7 deletions

diff --git a/app-office/plan/ChangeLog b/app-office/plan/ChangeLog
index 64357b54dc9b..a148395b21b9 100644
--- a/app-office/plan/ChangeLog
+++ b/app-office/plan/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/plan
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/plan/ChangeLog,v 1.19 2008/10/29 04:30:37 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/plan/ChangeLog,v 1.20 2009/11/12 20:29:57 hwoarang Exp $
+
+*plan-1.9-r1 (12 Nov 2009)
+
+  12 Nov 2009; Markos Chandras <hwoarang@gentoo.org> -plan-1.9.ebuild,
+  +plan-1.9-r1.ebuild, +files/ldflags.patch, +files/nostrip.patch:
+  Fix pre-stripped files issue ( bug 251868 ) and respect LDFLAGS. Remove
+  old
+  ebuild
 
   29 Oct 2008; Jeroen Roovers <jer@gentoo.org> plan-1.9.ebuild:
   Marked ~hppa too.
diff --git a/app-office/plan/Manifest b/app-office/plan/Manifest
index a7246582e276..b153c44b6450 100644
--- a/app-office/plan/Manifest
+++ b/app-office/plan/Manifest
@@ -1,6 +1,8 @@
+AUX ldflags.patch 617 RMD160 610da74e356b04fe0d4c55a7c65af145316e20ec SHA1 d859aa14188cf5ff0c5e45a3d74ff975a21e640d SHA256 296ce4b723fb2e4dc3f1ac86f4f0cca19385b960e24dfb973c64812f9373aa9f
 AUX makefile.patch 635 RMD160 79587919893961cb98977f39f401e4b08ee2de61 SHA1 12862ef159e53d2d6815bcbec7223780af62aeba SHA256 8ce6f02779c810e557e47538cebf89ec69b5072e2bf07709d381a516bf812c76
+AUX nostrip.patch 772 RMD160 316243001e67e5c691c0b523a1b7da0c124f052c SHA1 4478b5751f806725b0d8a37a2141d3fba4889c46 SHA256 a6c85e5927fecf47e7fe4a0e352e17d37755708f850be8c56db716d48b8cb8c4
 DIST plan-1.9-gentoo.tar.bz2 5642 RMD160 82268c128a33147667037184c753f950656a4bd5 SHA1 f8d45f58903cb7176fd8f6f7ae367b68c206108c SHA256 663f135b68e68359564862223d68098f4b97963c5100244e7d001d9f511c38bd
 DIST plan-1.9.tar.gz 441599 RMD160 7bed3f29c62341c264c9edeb60666d83092139ea SHA1 65afff961f801f888714993a9ed6e42a95b2d958 SHA256 08092cdacdc15ec78bdcfb5e51a598e9b32c52c93c97905cec578f1171e14cf3
-EBUILD plan-1.9.ebuild 1780 RMD160 69815749eda83413f5a226599a658d3751046b93 SHA1 baa521d4dcca2bf0af66e50247e93578f0d0dfb8 SHA256 9ee93c47296e45bddc4dd6ec5fecfe9454528a49eb21bd701dc646f624b16b3b
-MISC ChangeLog 2369 RMD160 fa1b5eb9b54cc8101cc002e87ab2d274c8850640 SHA1 a108a258b47444813f3b6e47164ec105dc112e8b SHA256 492dde2ed19dba058b4a87b4d39cf98cdf13c10ab2665d39f6ad8b9cc55bcd2a
+EBUILD plan-1.9-r1.ebuild 1861 RMD160 843972aa4d88ebc72eaae88d584ccf366ac1380c SHA1 0e4d3fe2ad3bcf6fa4cbdcf0ad868f02b59b8bf2 SHA256 480f595ff7e38e2ed143979cee26532b762535b7ab68d2c8e48c64c0b8d57f0a
+MISC ChangeLog 2630 RMD160 23c70e8b39d00a65e63b7d9ec996eef6297239b3 SHA1 ae5abd7ee4168e2f214adf5e11f3b781313f6499 SHA256 e416c27e1c6558ce76dee769d8ca80a113af7f8a8aec4c481ca8bbda26a40074
 MISC metadata.xml 381 RMD160 f7378987e0a80ff64647453655d6f6812d0bbb98 SHA1 5c804aa7893c895f1f8081b20390261841268df6 SHA256 566eb4eb834b58f753e9980c25b17af7de92c8a7136ce2947a48cdb1e097edd1
diff --git a/app-office/plan/files/ldflags.patch b/app-office/plan/files/ldflags.patch
new file mode 100644
index 000000000000..5394f9cb7b27
--- /dev/null
+++ b/app-office/plan/files/ldflags.patch
@@ -0,0 +1,13 @@
+Index: plan-1.9/src/Makefile
+===================================================================
+--- plan-1.9.orig/src/Makefile
++++ plan-1.9/src/Makefile
+@@ -142,7 +142,7 @@ FBSD_C	= -ansi -I/usr/X11R6/include -DBS
+ 	  -DSTDLIBMALLOC
+ OBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
+ 	  -DNO_MOTIF -DSTDLIBMALLOC
+-LINUX_C	= -W -Wall -I/usr/X11R6/include -DNOLOCK -DLINUX
++LINUX_C	= ${LDFLAGS} -I/usr/X11R6/include -DNOLOCK -DLINUX
+ SVR4_C	= -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP
+ NEWS_C	= -DNEWSOS4 -DNOMSEP -DSUN -DBSD -DRABBITS -DNGROUPS_MAX=16\
+ 	  -DPID_T="int" -Dconst=""
diff --git a/app-office/plan/files/nostrip.patch b/app-office/plan/files/nostrip.patch
new file mode 100644
index 000000000000..51043c37dcb4
--- /dev/null
+++ b/app-office/plan/files/nostrip.patch
@@ -0,0 +1,12 @@
+Index: plan-1.9/src/Makefile
+===================================================================
+--- plan-1.9.orig/src/Makefile
++++ plan-1.9/src/Makefile
+@@ -562,7 +562,6 @@ install:
+ 	cp ../misc/plan_cal.ps ../language/* $(DESTDIR)$(SHARE)
+ 	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(SHARE)) || exit 0
+ 	cp ../language/plan.help $(DESTDIR)$(SHARE)
+-	-strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(DIR)/netplan
+ 	-chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(DIR)/netplan
+ 	-chmod 644 $(DESTDIR)$(SHARE)/plan.help $(DESTDIR)$(SHARE)/plan_cal.ps $(DESTDIR)$(SHARE)/plan.lang.*
+ 	-(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(SHARE)/plan_calSJ.ps) || exit 0
diff --git a/app-office/plan/plan-1.9.ebuild b/app-office/plan/plan-1.9-r1.ebuild
index 0458f71fb7f1..90174c48098d 100644
--- a/app-office/plan/plan-1.9.ebuild
+++ b/app-office/plan/plan-1.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/plan/plan-1.9.ebuild,v 1.7 2008/10/29 04:30:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/plan/plan-1.9-r1.ebuild,v 1.1 2009/11/12 20:29:57 hwoarang Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.fu-berlin.de/unix/X11/apps/plan/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="x11-libs/openmotif"
@@ -24,6 +24,8 @@ src_unpack() {
 	epatch "${WORKDIR}"/${P}-gentoo.patch
 	epatch "${WORKDIR}"/${P}-webplan.patch
 	epatch "${FILESDIR}"/makefile.patch
+	epatch "${FILESDIR}"/nostrip.patch
+	epatch "${FILESDIR}"/ldflags.patch
 }
 
 src_compile() {