Fixed installed of xinetd file, from using generic one in -> gentoo specific in , bug #198538

Package-Manager: portage-2.1.3.17

5 files changed, 29 insertions, 23 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 645be00ba5cf..23c236b5dcc4 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.80 2007/11/06 21:41:49 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.81 2007/11/09 15:21:43 wltjr Exp $
+
+  09 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  firebird-2.0.3.12981.0-r2.ebuild, firebird-2.0.3.12981.0-r3.ebuild,
+  firebird-2.1.0.16780_beta2-r1.ebuild:
+  Fixed installed of xinetd file, from using generic one in -> gentoo specific
+  in , bug #198538
 
   06 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   firebird-2.0.3.12981.0-r2.ebuild:
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index e3dfbb53a866..d0d743f60200 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -49,26 +49,26 @@ SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 files/fi
 DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 SHA1 8b6134ad1910ae0677e93c84279132f6c67e7862 SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e
 DIST Firebird-2.1.0.16780-Beta2.tar.bz2 13507524 RMD160 960ebaa83773020c0406a89a1b20982ea5eb669b SHA1 6b5369fd8a652e385621e0c9bf46e2ac1078bcc4 SHA256 7aaf8bbb0eb8af63f4e751f9ebcc9cc57a5c5e788bcc01f003b60771ffdf690a
 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
-EBUILD firebird-2.0.3.12981.0-r2.ebuild 6077 RMD160 832209599ca48d95a14de576390a5f4fb1118813 SHA1 2f44c2c8a9709eb7a789aa80391a428a9353ee47 SHA256 d14cdc915c0d27c39363c4b6c7d66c940304995e5d62b324e9cb5db811ad631b
-MD5 86b4ce651a489832c2d37de8edbb9585 firebird-2.0.3.12981.0-r2.ebuild 6077
-RMD160 832209599ca48d95a14de576390a5f4fb1118813 firebird-2.0.3.12981.0-r2.ebuild 6077
-SHA256 d14cdc915c0d27c39363c4b6c7d66c940304995e5d62b324e9cb5db811ad631b firebird-2.0.3.12981.0-r2.ebuild 6077
-EBUILD firebird-2.0.3.12981.0-r3.ebuild 6118 RMD160 83072e4085379b7a2e61b5b281d0dc2af1492efb SHA1 abbbf97007ebed62763eb397def6e31a95ff9441 SHA256 786d91ffca0b314541f1159a9d478cbf19f8963c22cf2cbd98ab8e01c7aa13e6
-MD5 09c0beeebf4c6d2f1d5fe45ae2a418dd firebird-2.0.3.12981.0-r3.ebuild 6118
-RMD160 83072e4085379b7a2e61b5b281d0dc2af1492efb firebird-2.0.3.12981.0-r3.ebuild 6118
-SHA256 786d91ffca0b314541f1159a9d478cbf19f8963c22cf2cbd98ab8e01c7aa13e6 firebird-2.0.3.12981.0-r3.ebuild 6118
+EBUILD firebird-2.0.3.12981.0-r2.ebuild 6067 RMD160 a1ec8f736e524d0ef8e4285664efea0be96d7bc0 SHA1 1adea1006034af52fbd8b9922a6dd65fab5a5af2 SHA256 7bfbfc0d231f29c5e6a9639f9cdce9f65fe172fc63762056a6ce48e6fbddc172
+MD5 9f14ff42633e3ba75a8e898c05d112aa firebird-2.0.3.12981.0-r2.ebuild 6067
+RMD160 a1ec8f736e524d0ef8e4285664efea0be96d7bc0 firebird-2.0.3.12981.0-r2.ebuild 6067
+SHA256 7bfbfc0d231f29c5e6a9639f9cdce9f65fe172fc63762056a6ce48e6fbddc172 firebird-2.0.3.12981.0-r2.ebuild 6067
+EBUILD firebird-2.0.3.12981.0-r3.ebuild 6108 RMD160 32d7972ed8facc0645dc48d744981b37e3ed69b2 SHA1 07712aa26529b2563fcf7b27bc23e1e427048731 SHA256 713f74fc90d41bd25eb8e2bd025fb5dc5af48f8e137b4b5e7f168d972493550c
+MD5 0a3ab5f2a573671b27dc97d075a32b74 firebird-2.0.3.12981.0-r3.ebuild 6108
+RMD160 32d7972ed8facc0645dc48d744981b37e3ed69b2 firebird-2.0.3.12981.0-r3.ebuild 6108
+SHA256 713f74fc90d41bd25eb8e2bd025fb5dc5af48f8e137b4b5e7f168d972493550c firebird-2.0.3.12981.0-r3.ebuild 6108
 EBUILD firebird-2.0.3.12981.0.ebuild 7124 RMD160 1bdc2d6ac6d0cfe52e6b0f84325b1b6a6876880c SHA1 56323977522ceae064b4ad5e375e0571cfae441d SHA256 9dbccfc1d0cb64efccf1cb6d308fba01c4fdf973816bb961b873f5b0f3115684
 MD5 ec533a35b8eadb0b72fea0b55e2400a5 firebird-2.0.3.12981.0.ebuild 7124
 RMD160 1bdc2d6ac6d0cfe52e6b0f84325b1b6a6876880c firebird-2.0.3.12981.0.ebuild 7124
 SHA256 9dbccfc1d0cb64efccf1cb6d308fba01c4fdf973816bb961b873f5b0f3115684 firebird-2.0.3.12981.0.ebuild 7124
-EBUILD firebird-2.1.0.16780_beta2-r1.ebuild 6036 RMD160 6e57563d2f51760426395305162a17cb1e691a5c SHA1 7b07e647cce52895884261f9e968a817a97024b9 SHA256 9bc1108ad42b21eb7a1ca152c0b63682cd3031beef763b94f8501b25ccb678be
-MD5 4b69c98efd11699489a34ad0685150bc firebird-2.1.0.16780_beta2-r1.ebuild 6036
-RMD160 6e57563d2f51760426395305162a17cb1e691a5c firebird-2.1.0.16780_beta2-r1.ebuild 6036
-SHA256 9bc1108ad42b21eb7a1ca152c0b63682cd3031beef763b94f8501b25ccb678be firebird-2.1.0.16780_beta2-r1.ebuild 6036
-MISC ChangeLog 15323 RMD160 0c74f3f6b29034bc6ec88a7353f836c7e3d08a3f SHA1 b3e6d9d6af678ca62495faf36add2b519481431e SHA256 31a29265ddcde83866b91c967de4752d9ec7263d7a24596ae41f0a8953668aa7
-MD5 83a2640aff9450274842832c5d41e340 ChangeLog 15323
-RMD160 0c74f3f6b29034bc6ec88a7353f836c7e3d08a3f ChangeLog 15323
-SHA256 31a29265ddcde83866b91c967de4752d9ec7263d7a24596ae41f0a8953668aa7 ChangeLog 15323
+EBUILD firebird-2.1.0.16780_beta2-r1.ebuild 6026 RMD160 d417106cade8b8f31ab86ac8ea65308d9a2ef426 SHA1 c79a7ad2d54af8de8a5724cfc88bb7b5cd52b8cf SHA256 91e9aa232745e2e8e3c16051cecd3e4b4c9cd636788817269e92064740094bc5
+MD5 fcb5ef9cab01408f2c336edb56f7ecbf firebird-2.1.0.16780_beta2-r1.ebuild 6026
+RMD160 d417106cade8b8f31ab86ac8ea65308d9a2ef426 firebird-2.1.0.16780_beta2-r1.ebuild 6026
+SHA256 91e9aa232745e2e8e3c16051cecd3e4b4c9cd636788817269e92064740094bc5 firebird-2.1.0.16780_beta2-r1.ebuild 6026
+MISC ChangeLog 15589 RMD160 e340f3b2b83bf6056a2307285b2187816f5be875 SHA1 41652cf8e357a9ffbb2e6d25b3599108241769c0 SHA256 018944f7154a92b1e412d65a165909c4a73f587d7858dfd2030a02c5087d52f9
+MD5 c444bdf9eec2f9c0fdd7c13396a997b8 ChangeLog 15589
+RMD160 e340f3b2b83bf6056a2307285b2187816f5be875 ChangeLog 15589
+SHA256 018944f7154a92b1e412d65a165909c4a73f587d7858dfd2030a02c5087d52f9 ChangeLog 15589
 MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63
 MD5 bf38ebc9198cc6b2bfc486bc9328c943 metadata.xml 611
 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 metadata.xml 611
diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild
index 2051c966c59c..6558eb8af2df 100644
--- a/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r2.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/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild,v 1.5 2007/11/06 21:41:49 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild,v 1.6 2007/11/09 15:21:43 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -129,7 +129,7 @@ src_install() {
 
 	if use xinetd ; then
 		insinto /etc/xinetd.d
-		newins "${S}/gen/install/misc/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
+		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
 	else
 		newinitd "${FILESDIR}/${PN}.init.d.2" ${PN}
 		newconfd "${FILESDIR}/firebird.conf.d.2" ${PN}
diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild
index 9e239e243ebf..23eec1a70849 100644
--- a/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r3.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/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild,v 1.2 2007/11/06 05:58:57 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild,v 1.3 2007/11/09 15:21:43 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -130,7 +130,7 @@ src_install() {
 
 	if use xinetd ; then
 		insinto /etc/xinetd.d
-		newins "${S}/gen/install/misc/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
+		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
 	else
 		newinitd "${FILESDIR}/${PN}.init.d.2" ${PN}
 		newconfd "${FILESDIR}/firebird.conf.d.2" ${PN}
diff --git a/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild b/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild
index 93dc314f31a8..f722a64327af 100644
--- a/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild
+++ b/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.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/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild,v 1.2 2007/11/06 05:58:57 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild,v 1.3 2007/11/09 15:21:43 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -128,7 +128,7 @@ src_install() {
 
 	if use xinetd ; then
 		insinto /etc/xinetd.d
-		newins "${S}/gen/install/misc/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
+		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
 	else
 		newinitd "${FILESDIR}/${PN}.init.d.2" ${PN}
 		newconfd "${FILESDIR}/firebird.conf.d.2" ${PN}