Use proper helper functions for bug #173884.

Package-Manager: portage-2.1.2.3

diff --git a/www-servers/jetty/ChangeLog b/www-servers/jetty/ChangeLog
index c6021977a23fd42af67d26cf718a1dc58170e42a..d95ff3ad6e3c805c135bc932cc5bf3a831f14490 100644 (file)
--- a/www-servers/jetty/ChangeLog
+++ b/www-servers/jetty/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/jetty
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/jetty/ChangeLog,v 1.7 2007/01/09 15:45:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/jetty/ChangeLog,v 1.8 2007/04/09 11:54:34 betelgeuse Exp $
+
+  09 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> jetty-4.2.19.ebuild:
+  Use proper helper functions for bug #173884.
 
   09 Jan 2007; Vlastimil Babka <caster@gentoo.org> jetty-4.2.19.ebuild:
   Convert einfo to elog where appropriate.

diff --git a/www-servers/jetty/Manifest b/www-servers/jetty/Manifest
index 9496930449ae174fd29f45cb0df12257f9f53206..e948a682360f75be20c03755a1ff339660e9ae95 100644 (file)
--- a/www-servers/jetty/Manifest
+++ b/www-servers/jetty/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 4.2.19/21jetty 52 RMD160 5d619f173e810381a42fce95b27fc91a10459371 SHA1 6c66b299c7da535d0f282bd64359bc48221dc033 SHA256 5ef9d25fcda2f7898cadebfe3aa6d50ba4a93a80c8ea755b75d9857efce60ffd
 MD5 c06bb0261951f980b4c2609682d49972 files/4.2.19/21jetty 52
 RMD160 5d619f173e810381a42fce95b27fc91a10459371 files/4.2.19/21jetty 52
@@ -15,14 +18,14 @@ MD5 caf753222734bd35add3089fea047e1a files/4.2.19/jetty.init 1112
 RMD160 b75f71d70063ed641f56b323ea938f3c469b0b76 files/4.2.19/jetty.init 1112
 SHA256 20f6ee6b6a62fa6b3dea886a314994811d12d84380b51a587c1726f0dcf41948 files/4.2.19/jetty.init 1112
 DIST Jetty-4.2.19-all.tar.gz 12177690 RMD160 18f82dffcae4e6692581a7603a8bd68b41fceb78 SHA1 6fb533040af8b6bbcf1f60b134e62352f998d522 SHA256 21c753281020da8a9798a55b63171765df28a745c54c96c20b51481d820c7ea3
-EBUILD jetty-4.2.19.ebuild 2636 RMD160 257089a013fbbc81aea378313a042b62acc444dc SHA1 bb146240dcb45a60d97e42bb1203f40333f67e7e SHA256 f14d212f4e207b85f85ece09d22a3ed51504cdf331d921214e029de4f22b1952
-MD5 d9c8c946db840b0855c2a3f5dad42b5c jetty-4.2.19.ebuild 2636
-RMD160 257089a013fbbc81aea378313a042b62acc444dc jetty-4.2.19.ebuild 2636
-SHA256 f14d212f4e207b85f85ece09d22a3ed51504cdf331d921214e029de4f22b1952 jetty-4.2.19.ebuild 2636
-MISC ChangeLog 1807 RMD160 d9f6abfdbf343e83e9c74f587245cdaea0ce8758 SHA1 8537af4e50f61b8609f6d06f236d2322dc064604 SHA256 c48de6407011bbaae161713ae1d70e0e482e64bbc700b778a516a570cdce166b
-MD5 cdfb01c7ef5b437a64c72831434ee678 ChangeLog 1807
-RMD160 d9f6abfdbf343e83e9c74f587245cdaea0ce8758 ChangeLog 1807
-SHA256 c48de6407011bbaae161713ae1d70e0e482e64bbc700b778a516a570cdce166b ChangeLog 1807
+EBUILD jetty-4.2.19.ebuild 2535 RMD160 26910044d9b6bfa79b7a66929b8199abcf95e0db SHA1 12df34592eb20ce2aeb66fdccdec36d3d12a80d6 SHA256 b72240ff47352ee094e305f7d03183c9390e78d97216d140668f1089b4601913
+MD5 2850961568709b3a6ee808351b67a8e7 jetty-4.2.19.ebuild 2535
+RMD160 26910044d9b6bfa79b7a66929b8199abcf95e0db jetty-4.2.19.ebuild 2535
+SHA256 b72240ff47352ee094e305f7d03183c9390e78d97216d140668f1089b4601913 jetty-4.2.19.ebuild 2535
+MISC ChangeLog 1933 RMD160 5c5756a75065bd4cad6374c8fc79020fef9d21d7 SHA1 40be26a5d3a7a378453e99552e4d7262e1afdb0d SHA256 123d16ff43a7c9b5138796ff13c973a8817bbd8e9a67b2c4f4546d7647be660a
+MD5 895d53c23d8dbbf33adfa89069133f21 ChangeLog 1933
+RMD160 5c5756a75065bd4cad6374c8fc79020fef9d21d7 ChangeLog 1933
+SHA256 123d16ff43a7c9b5138796ff13c973a8817bbd8e9a67b2c4f4546d7647be660a ChangeLog 1933
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -30,3 +33,10 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 b4b73878a3174d9fa1bafc42170b75ba files/digest-jetty-4.2.19 256
 RMD160 eedddf2e18d424945bb35746248efb6129adcaf0 files/digest-jetty-4.2.19 256
 SHA256 6f2fe2a36211795ae7da33d4b3934ca39b703405f6966b4ea5405e1f1478edb2 files/digest-jetty-4.2.19 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGGil/cxLzpIGCsLQRArV+AJ4yazYTaDKu4yRE22PjWssdd2BjlACeNihR
+d24clf65oRD45cG48wY5rno=
+=/vFV
+-----END PGP SIGNATURE-----

diff --git a/www-servers/jetty/jetty-4.2.19.ebuild b/www-servers/jetty/jetty-4.2.19.ebuild
index 1bd0ee4b75596c0b5892fdd0bed1d5b8fe6779f1..19816d998f118749c623c078cf827501fc86926f 100644 (file)
--- a/www-servers/jetty/jetty-4.2.19.ebuild
+++ b/www-servers/jetty/jetty-4.2.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/jetty/jetty-4.2.19.ebuild,v 1.7 2007/01/09 15:45:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/jetty/jetty-4.2.19.ebuild,v 1.8 2007/04/09 11:54:34 betelgeuse Exp $
 
 inherit eutils
 
@@ -36,21 +36,15 @@ src_install() {
        keepdir /var/log/${PN}
 
        # INIT SCRIPTS AND ENV
-       insinto /etc/init.d
-       insopts -m0750
-       newins ${FILESDIR}/${PV}/jetty.init jetty
+       newinitd ${FILESDIR}/${PV}/jetty.init jetty
 
-       insinto /etc/env.d
-       insopts -m0750
-       doins ${FILESDIR}/${PV}/21jetty
+       doenvd ${FILESDIR}/${PV}/21jetty
 
        insinto /etc/
        insopts -m0644
        doins ${FILESDIR}/${PV}/jetty.conf
 
-       insinto /etc/conf.d
-       insopts -m0644
-       doins ${FILESDIR}/${PV}/jetty
+       doconfd ${FILESDIR}/${PV}/jetty
 
        dodoc *.TXT
        dohtml *.html