From 9fa03bf76fb71c652a42620f8daec3d8d13b5c5f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 1 Jan 2005 21:16:48 +0000 Subject: [PATCH] =?utf8?q?Clean=20up=20the=20patches=20#76230=20by=20Milus?= =?utf8?q?=20J=C3=A1nos.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- sys-apps/psmisc/ChangeLog | 9 ++- sys-apps/psmisc/Manifest | 15 ++-- .../files/psmisc-21.4-no-nls-selinux.patch | 72 ------------------ .../psmisc/files/psmisc-21.4-no-nls.patch | 57 ++++---------- .../psmisc/files/psmisc-21.4-selinux.diff.bz2 | Bin 7841 -> 7720 bytes sys-apps/psmisc/psmisc-21.4.ebuild | 24 +++--- 6 files changed, 39 insertions(+), 138 deletions(-) delete mode 100644 sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch diff --git a/sys-apps/psmisc/ChangeLog b/sys-apps/psmisc/ChangeLog index f9580e6861a6..b9df4c910348 100644 --- a/sys-apps/psmisc/ChangeLog +++ b/sys-apps/psmisc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/psmisc -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.43 2004/12/08 01:33:00 vapier Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.44 2005/01/01 21:16:48 vapier Exp $ + + 01 Jan 2005; Mike Frysinger + -files/psmisc-21.4-no-nls-selinux.patch, files/psmisc-21.4-no-nls.patch, + files/psmisc-21.4-selinux.diff.bz2, psmisc-21.4.ebuild: + Clean up the patches #76230 by Milus János. 07 Dec 2004; Mike Frysinger psmisc-21.4.ebuild: Remove C++ requirement #73632. diff --git a/sys-apps/psmisc/Manifest b/sys-apps/psmisc/Manifest index 5a6b5ab944a2..7be80f4e3e12 100644 --- a/sys-apps/psmisc/Manifest +++ b/sys-apps/psmisc/Manifest @@ -1,17 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 18c3cc750bc8114bdfbe04b5369f2bed ChangeLog 5598 +MD5 cea85e921fc6586f5e3eeb611590ad6e ChangeLog 5828 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 8602ac8d26453570399e4c3d7f379710 psmisc-21.4.ebuild 1483 +MD5 8cae3b05d354320805b8b9d112402fe1 psmisc-21.4.ebuild 1332 +MD5 f8a6de9ef42d405c6ac24373df5c5f74 files/psmisc-21.4-selinux.diff.bz2 7720 MD5 b27975d795b1253e70ef1133dde797d0 files/digest-psmisc-21.4 63 -MD5 5d788fbdf401f203822bee5d8dc8c504 files/psmisc-21.4-selinux.diff.bz2 7841 -MD5 329287c0414da4ba155403a97d65dbff files/psmisc-21.4-no-nls.patch 1594 -MD5 78083673f5555f5363baa0cf4d907a8b files/psmisc-21.4-no-nls-selinux.patch 1580 +MD5 429eeb81b4aaa5515cfa08f533e5123d files/psmisc-21.4-no-nls.patch 1360 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFB1w9GroRuSHgZdywRAlOkAJ4smGpbe/L85enUikhE6BWZQyshJACgiKRN -hxkKnhwfykJNOCPRQPLDuag= -=EwWf +iD8DBQFB1xNMroRuSHgZdywRAtpTAJ0W7ZeYzCA3qgLtH9u4OEKFXm6h/QCfQqPW +/eJwVxYHd4XIQmaaz5kazvs= +=wzSR -----END PGP SIGNATURE----- diff --git a/sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch b/sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch deleted file mode 100644 index 8485845f1d8e..000000000000 --- a/sys-apps/psmisc/files/psmisc-21.4-no-nls-selinux.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- src/fuser.c.mps 2004-06-08 18:21:33 +0200 -+++ src/fuser.c 2004-06-08 18:27:13 +0200 -@@ -31,9 +31,13 @@ - #include /* for MKDEV */ - #include /* for LOOP_MAJOR */ - #endif -+#ifdef USE_NLS - #include - #include - #define _(String) gettext (String) -+#else -+#define _(String) (String) -+#endif - - #include "comm.h" - #include "loop.h" /* for loop_info */ -@@ -1007,9 +1011,11 @@ main (int argc, char **argv) - no_files = 1; - - /* Setup the i18n */ -+#ifdef USE_NLS - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); -+#endif - - if (argc < 2) - usage (); ---- src/killall.c.mps 2004-06-08 18:21:38 +0200 -+++ src/killall.c 2004-06-08 18:26:51 +0200 -@@ -26,9 +26,13 @@ - #include - #endif /*WITH_SELINUX*/ - -+#ifdef USE_NLS - #include - #include - #define _(String) gettext (String) -+#else -+#define _(String) (String) -+#endif - - #include "comm.h" - #include "signals.h" -@@ -461,10 +465,12 @@ - pidof = strcmp (name, "killall"); - sig_num = SIGTERM; - -+#ifdef USE_NLS - /* Setup the i18n */ - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); -+#endif - - opterr = 0; - #ifdef WITH_SELINUX ---- src/pstree.c.mps 2004-06-08 18:27:39 +0200 -+++ src/pstree.c 2004-06-08 18:28:03 +0200 -@@ -22,8 +22,12 @@ - #include - #include - #include -+#ifdef USE_NLS - #include - #define _(String) gettext (String) -+#else -+#define _(String) (String) -+#endif - - #include "comm.h" - diff --git a/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch b/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch index 89546b3a072d..4832e73aae18 100644 --- a/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch +++ b/sys-apps/psmisc/files/psmisc-21.4-no-nls.patch @@ -1,9 +1,7 @@ ---- src/fuser.c.mps 2004-06-08 18:21:33 +0200 -+++ src/fuser.c 2004-06-08 18:27:13 +0200 -@@ -31,9 +31,13 @@ - #include /* for MKDEV */ - #include /* for LOOP_MAJOR */ - #endif +diff -ur psmisc-21.4.orig/src/fuser.c psmisc-21.4/src/fuser.c +--- psmisc-21.4.orig/src/fuser.c 2005-01-01 16:10:44.601397328 -0500 ++++ psmisc-21.4/src/fuser.c 2005-01-01 16:11:22.884577400 -0500 +@@ -31,3 +31,7 @@ +#ifdef USE_NLS #include #include @@ -11,27 +9,17 @@ +#else +#define _(String) (String) +#endif - - #include "comm.h" - #include "loop.h" /* for loop_info */ -@@ -1007,9 +1011,11 @@ main (int argc, char **argv) - no_files = 1; - - /* Setup the i18n */ +@@ -1006,4 +1010,6 @@ +#ifdef USE_NLS + /* Setup the i18n */ setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); +#endif - - if (argc < 2) - usage (); ---- src/killall.c.mps 2004-06-08 18:21:38 +0200 -+++ src/killall.c 2004-06-08 18:26:51 +0200 -@@ -25,9 +25,13 @@ - #include - #include - #endif /*FLASK_LINUX*/ +diff -ur psmisc-21.4.orig/src/killall.c psmisc-21.4/src/killall.c +--- psmisc-21.4.orig/src/killall.c 2005-01-01 16:10:44.602397176 -0500 ++++ psmisc-21.4/src/killall.c 2005-01-01 16:11:54.860716288 -0500 +@@ -25,3 +25,7 @@ +#ifdef USE_NLS #include #include @@ -39,33 +27,20 @@ +#else +#define _(String) (String) +#endif - - #include "comm.h" - #include "signals.h" -@@ -467,9 +471,11 @@ main (int argc, char **argv) - sig_num = SIGTERM; - - /* Setup the i18n */ +@@ -466,4 +470,6 @@ +#ifdef USE_NLS + /* Setup the i18n */ setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); +#endif - - opterr = 0; - #ifdef FLASK_LINUX ---- src/pstree.c.mps 2004-06-08 18:27:39 +0200 -+++ src/pstree.c 2004-06-08 18:28:03 +0200 -@@ -22,8 +22,12 @@ - #include - #include - #include +diff -ur psmisc-21.4.orig/src/pstree.c psmisc-21.4/src/pstree.c +--- psmisc-21.4.orig/src/pstree.c 2005-01-01 16:10:44.602397176 -0500 ++++ psmisc-21.4/src/pstree.c 2005-01-01 16:12:14.659706384 -0500 +@@ -22,2 +22,6 @@ +#ifdef USE_NLS #include #define _(String) gettext (String) +#else +#define _(String) (String) +#endif - - #include "comm.h" - diff --git a/sys-apps/psmisc/files/psmisc-21.4-selinux.diff.bz2 b/sys-apps/psmisc/files/psmisc-21.4-selinux.diff.bz2 index 689b09f5420dcae9cf1e99a1cb790555a5159b70..78b287f55d2dc85d7b1f54ed6e7af075e1986232 100644 GIT binary patch literal 7720 zcmV+@9@pVQT4*^jL0KkKS@cDu696MH|A2q}pn!k>|NsC0-~a#r|NdYkyx?iR%Amm)^y|-jYp!Gfb?;|SN_xBP-hJFt zUD`KFpb1SN6Cgy=WNLb8G|}lYWFezX1JnT1Pf%zKjR0r? zrX&+knNLkdnFglRdTKOi!T@N*(V%*O(V#R2fO>*WD2NayOp_$`jU@7Do}+0oFq&up zGy$f70MO6`N)Za5lO)vkg&wAlOp&shc}#%y4?`0uKU4;R>K>+npcw)rh$es&LSZIP zQ%ZhGjZ?)u6V*JB0MPXr0002c>&|0Yg;QQa-AzH9v0HhD zj@QW+O2#J2a$=%M2Z>XU;9NO(vXPH$urn)m58o3s>vh&)tZ77NOIcc{Zb(YmkazkU zcBGw>GGUQZ{Z$HhHU9|zH>k%zjZ=*;w^^_xky3$1HVr`{M4>1Uf-NXzrqD&WM_Cu7 zy)}LQ=7v;*&>}^CKKn`9OtTNB3`G01v7`LaMAzQ)Bo|56+jafqRXW*t`@8$kZkFEK zXSbRDwWJOWJNYD$RBFv#Ol*TtI1DR9SU!wURmCV@kuj=mK}z(ksu*=1IBQ78*EwC|3-kj4kZls~F=9R7hWP+V!Zx(U_q$5Pg-We#xsNq?>h@pTeC|4nc1T>+QYURql zyRml&?X+TOh7*QOyk3_5>7e|(4 z{QZwDZOz}W^lo2_L>>`BK#`GT5|Pq@E-#q-;QDYP|b_sI8~J>qlpedl?-d$IPhj{zRo2i(ILrf zIh?W@j2e_emEOtnJO&a5dAM{L@s=8YQ-9~-18juUpDy<96AtaP;T>*VMYS_b1;Ie6 zRdI_)0*fHq3Z^=8WSGq`B*rU23yWZ4+i@+pvBUVildrxjOHUyZSapJcDS^fJcDfw3 z@_x*aTBE`r@U{+Dz?I-s$6-arV&d?-6GzuZrHgxeQwk< zsK;%$f;2zY%59a?PdNlv){iwGw7mp;U73itAd2}2?ZpMhC0ipY(N+!aDisY+6mD|~?gI8D2nC$a+Kqd=>;=X$Kx)xO)|hVf z55nFCtn6}*LZ&2fkkIO#xCfmNf@w5WG@%MxVyY@Cj0ISwVNpaCBa`<1)^_i+a8A+? zDH1Rtk`gi}G1=ctJT<@fybaBiHJ09)0dm+E3%b z67}ZggI5d~Jn%2s>|cV=yFS(2U)fHkOr<2pWIQv5Lj`9WV#$vT?TFmY?r1?5R-(A> zfirE&m7b4zOsxYqImIwCFqo%d?R!b#_dVQujvL>_s`+u1b@Ju)G}wuqmoi|awKxss zJ!l~y2H9QWa*v2N3LhEbF5^0<8R49kvzUR%9f9_qY4#tm#qN#ptmq)8Irmb6i9&T@ zyk9Jq8d3umU;17_n2%S)`AC+T&U4gey(2)y1q5v|lok`1JIQaDp?HwSGu4>NB*>ct z$EV5hH%iUpAYn6SbH-se6$TS}75HiY2FO+H-#BNlbX`kpCz!7>pp4MSZy*TemV?HQ zJK`DJ7gy1fSI*c|CB|(@r-Z(pvAx&s_q=Yg^~OtR~)yhd-rarZNs(F}hhnH5(?vXs%^A72-V{oIEB9=_f6u zzY}GZ{SVK>QM?#(pBLfjvEk3T%WFW`-mR(mMI<34O!E$R0`=LvXGG73rn%ni(QG#( z5*wuMo@f-5NOlX^T15<)gh~9HT^Go{ZlkJAF3SWmJtrd_V(p0vdK{ryO5OWV?uuUh zj>Jj1c+7cwky<3h_Gm#SL#CrnH;)maPfV9~D(K%Qu)zlRUy37uS!YzpbArn+l*MX9 zzm49M%N|zy{@YHC+o!G1hV^I$#^^Nmdrs!z%`ROg@jBaKr{Xa^DQSB0-vQCQ3FTah zl4QV>CW>+ik_S*g&LkExpMT3FV9`mvcIMjAZfIP~z1vrNRq?A{weS0Cs;a81(beem z_m1H>mh*>E9cdw}#F-(a!po@P`VvdrIGPda()V!-XgY#%#S7tU+?Q}^U#@|n|%Y zJj4e{^XK~6tJwqo;ZQyqL}Pb^^qVsVu&){heE@Ip1{@I$!wHz`d8{Im$tXl=UGYp8R_Kth-KTdiw z&D=RK2d+FwtJ@E*S-qRnIDNRe?7NgqNDzh$4mno3qjsi_k$$!u*#ilLFu`R`q%qr} zbh2waz3iE_Y13|b?qfxtUJVYrG^5orK5gVr9@e*GZ6ha2r?{(RZ*5ui9z94%N zV@k7y;jOv+ftRs$JHuXx;b23ts7SP>D{S?9O`B;t%8ydN9nRTZ>&LF#c?B>~_SSsO zee;sWB?&Q;y5*xn8RdDGh2A*|QnsZwT9H?`Vd}(ql8$;2zyTltI)qk8MSchEGdhw; zP~otpWU-ih&>$z`BodSodI%@=*iLJA8hF;Cv zGVWimugi^8d@c6K$)?SPsY)27nj9|FvY@-%#RP4um9~zU*L>5l*}cRteUqox|C= z8c85YRPPhOJFo(h9(V@e5?DysCj^Q<=yDwoV_Pa!7lir}B>S4nJQx8kLPn3F4> zr(lvLIK?o91a7~zq2}E@^evDH_pT{ z2~&4AG9n^A^F%~P7a9VFq7@7mN+KdIr~B-ZO_F!}=YcV8^QYlKPoOX&2fv4FPIoUG zAyhWk1d@&)d<2%zM!^#TBaRwXA?gy3lXjUYw8%;}>bn~r zsS-YLfS+UziR(w#Jz{Ufb{=3c1}}Me;RKS4FmQwr)O>K9Z8^+oFs*lJ42Bl~CgmYW ziY03(V4TuQ6M57mlJ2M&$q&a7Ei0wA)vYr$>INLsR09cG#PJql6`*8ByH-$9_TucM z`KhKAqs?YETY5)q#t{wmwV|;L$TJ2+qn>{qBSPwT#CO>&r?ytcc7`&gVg!VcR&==} zAt5d=nvC&nSjb}FF%+ijLT@reqqMWgjKo7r60LL?xgFRPFKp)v<4OTTEMjz(?Ril} zl*N-x;d@ODMKhqMs+8_1GgdXChIBEpL{Hb8E|Gy`p+v`1VN(FgSE+61&37KDHhZv$4H6w1`@=AFK=ilgj9WmiOF8T=SQ$Yo)W}Td&3BbdwP9{_{)yiugs+?M$A{_@w1NDdp%)s{5 z0rJ6WBAp}7Ig!t4Vy#?YBk z_5%Uw1LY7%NOSlo1R{nLC{Rvu@U#TN5iEIF1iUtvAsp;$UL%o#3{3-LV((A~fH*5m zGH}#v4+6>4#L%!AnFI!p%LyFLppQVIFraZM5gUlGZe~a%W`f0X3ve0CY(#Tbna~>t z0^p7YMIeeEgCOl02gE_LIRO&s#oB5C99Ww980;OZT*41n85+T&Bf#%nN9P@86H~0z zXq%p=;Wd<)n2^qbhbP`%;NU^d>ABX&OC2vo?sn~WyUQI97Y5i{bF05)8wLUwW&b#X zh5_?(4o34l$qNRkS;>rh4;Iay1%&7~dIo@a7z%glGBMCS&uMh^xE-yS0d-W~_X3B$ z7;lf5ov#k|jF*wX%zPpP;d* zBNRukdA}mmScOo8gH_ZiffYw+ZFyvEFXYt$+(HpYLn5I?QAKp^_%JmWFMKf2sxY)( z)mw}rEP(<-KvjUC3m~ejgcSr4VLPK0P6mVnBZ-I`66MDo*tPq2cie%@B&$+EFEEqk%5q&E&^s;l6kv7%3ltBeOPGTpS#^l#fcCM(UPw0i?dR#3gx+Ud;-FNc=iJ^J0{^C72*VoxcWLY$F?QSU6S=Fv%T% zrk@UvM{$HQDOzBVUnNrtBLpC|^I9MEJO8d_kUtF4Av?@G%38YIi{=sruNK|#gK z0P`U>vKWap#Gn~u4cVR@hpo3z(S>WMo6fWl&}6a!V}s7l;BU!YLCo}7G~O}-!T=g+ z_kJN0hE|{qsCp6r{z4xC0_Hf+F@zv7gkj2zMoG(W_*;@wW)E4uEJI643iPU#* zI(3$weDaW3Zg1kgMnX=l1V*C#(4r#|AbdxNlmHdSAwb08g+wD0Du`l-EeTyO@|V?gRst+oMl!UmwZhNo1>+d!2Kkcx0iV9Qnm;}Q?mJ?4t9582Z*3+dK^^&`wZiX|_+@`=dB)WUbQifK+-d5Cik#Pbm z>UHatIaq}?7}%1{g`f)l2F7`<;xxFm7>!O+421>vPBQBaR?22-0dX=9p^8|;1oxbH z!-u#7hF(Gh0j>PW>hXfe#PqEUW0w;-rfr5S3rtWNBN9=T5d@WlsbOtB0>D7Q8!!w- zXKHypJ}wmTc)L~qaV`e=6D&O^9y{Z=C}+uB+}pEY<8T0E?tIl-3_fxIQV)Ib4xsp+ zN5)L9_dsiX1gcmg>yL@;L_IDxGW9E!1+0`?dX?u5r5X-F4*;-mW?+u7kzSS# zg-)axu^P+Qum#mGox7|NiWo8Qma^*yC?IjW8-B)Qt z_0oBF(0tD+XRZSK+G~?ngpU^lI$1}v7YvL}MsCEdM9)%%;RFm9>YsBYArAen;D3{7 zZR>{QLvaD{B<^8EBq<&C2E~??hLu4>PW$-b#PAA;!KWu?H_LB|VJU;9fX9bw;UnB- z!$4M|8E7WdAS4(O5=kV3&e*#0J*DexAa|ObUGdf`WF}pcn;Z?PpBF$+Gac^5kZ-W* ztIJ3M7!(AtM!z(;K)6E-=(vu{eb!DQMR5Wl!#{uo%Qz!p+&y$|c;=E)7DgQzse*?b zp@(~P(&(u(WibpC#ulF3giyd|22in#Nh1jhGeb~MJsd%p%R|R0u})^FP;VxtW!ee4 z-I-R*QxSv24LG#(vmVFKnRVHLI@b7E+CNT4W$SMrs??^Qy^(50u#_=Zp3D4VEqCYw+c0W#^2x8i^?#@iW(@UAt4;p zRLZto%q|-!rZ%y5f|Fh}@^b}#%R0G*6mcTLsgSZ0)^BKik1hf7@{`OY;BTAD-qnS8 z`Y;e%rQO!_(B3EI+Yy)~$|m50EU-8`jhNJW?AzKo(Z<=mD zL$7Bq6^_!z5hBJSTTh&j!K|jQhIDnR7Uy&_nP|sTq@^Lk_`pZ0+-yu$0(%v2;S@OccYM6f(m&3yKvC zC5ad_Gbl-zj$xkQmSz<_PHvz+91eiUX@X^%YONt;N+9jfd;;zVLCqK!O@XTg(Fps# z%-xP84EdgE>We*1Zq^F&njx5}sRX3Q6G+@!Vdx-IILWoKEn&rC zgYOYHT1!T&U8aa`K<>JD=4r6uxBhLt6*w+}AYpftV3k*vs3O{gSYbh0@eOYP#6U(N z$Pj@Kijt3Cw7;_J@x#oggi+juN_K5wN}0_xBfuT40}=;;11y<4vd2s=N7F8D7m0%} zZ?y-DJ#sq<=M_&tHcMe|WybnRh$bZz(B)c*p#ysF} z>BtJ;=YjXcsn##)0F-m^Z`^DLE&ZZeBZ;qI8;w>BFzR6o*)|DRQ&OkD4>A-$-n3RT)kBnu@`D7q^tJo`6*6rB@wjRLtAz9r{7LoF-UN$Xc(|rlOz^pdQ65E2t783Ri zLf~Auo5FzE5{<@<79eW~hM_DbMYlK?Tvvfer8=%-aRWU;d1?r0rh4=p!*T9{5-OH} zhAL5>&lofhwph5P2Ee1Uv(Q`Uwe6me2Z6JPR0J?%GKt0D%XZ#1bnM$fwIcWIN|BKUKR2>i%YP*og>B zT6Ka3{^O+*s)|0F3C`tn2Loqu!A}&0%1Z@j&SKTeTNk{cuR@*2st zer-0xz#?S;`8UzK3eF~k^0aZCAe@3OTd6?Bk}0GFE3}yRod$)Pxj!6Im}){HR1=J- zi!DJ+pnc~Oc!ivJ4-|6A^~vd@r=_K_14Kt!7Pa*WQSc9tcdjUq8}BFv{csShto5Aw iV;Ph(7b8UFps?DFV0cF~M~*=M#oUoj6eK+nX#~Lb#YeON literal 7841 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 diff --git a/sys-apps/psmisc/psmisc-21.4.ebuild b/sys-apps/psmisc/psmisc-21.4.ebuild index 6e531139bcf0..72e38cb557c2 100644 --- a/sys-apps/psmisc/psmisc-21.4.ebuild +++ b/sys-apps/psmisc/psmisc-21.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.4.ebuild,v 1.18 2004/12/08 01:33:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.4.ebuild,v 1.19 2005/01/01 21:16:48 vapier Exp $ inherit eutils gnuconfig @@ -25,28 +25,22 @@ src_unpack() { unpack ${A} cd ${S} - if use selinux; then - # Necessary selinux patch - epatch ${FILESDIR}/${SELINUX_PATCH} - use nls || epatch ${FILESDIR}/${P}-no-nls-selinux.patch - else - use nls || epatch ${FILESDIR}/${P}-no-nls.patch - fi + use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} + use nls || epatch ${FILESDIR}/${P}-no-nls.patch epunt_cxx #73632 } src_compile() { - local myconf="" - use nls || myconf="${myconf} --disable-nls" - use selinux && myconf="${myconf} --enable-flask" - - econf ${myconf} || die + econf \ + $(use_enable nls) \ + $(use_enable selinux flask) \ + || die emake || die } src_install() { - einstall || die + make install DESTDIR="${D}" || die dosym killall /usr/bin/pidof # Some packages expect these to use /usr, others to use / -- 2.26.2