Use newconfd instead of newins as per bug 174266.

Package-Manager: portage-2.1.2.4

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 1b7cf4749977690eab4853544db29b5d6ba8e8bd..a81851cfad143cc926f3d899dffbbdddb2932756 100644 (file)
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.253 2007/04/21 20:46:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.254 2007/04/21 22:35:06 philantrop Exp $
+
+  21 Apr 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  kdenetwork-3.5.5-r1.ebuild, kdenetwork-3.5.5-r2.ebuild,
+  kdenetwork-3.5.6.ebuild:
+  Use newconfd instead of newins as per bug 174266.
 
   21 Apr 2007; Raúl Porcel <armin76@gentoo.org> kdenetwork-3.5.5-r2.ebuild:
   ia64 stable

diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 33f29cbd2bd81b72985b0f8af3c33d3bc8191ce1..b55c37f070ec8e055139eacb8261b59e4de8146b 100644 (file)
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdenetwork-3.5.5-linux-headers-2.6.18.patch 799 RMD160 1e12373bef6f0a69d9b5d453c9a63b84f7b48645 SHA1 642a54568612c62543759eab4550b4db03a42bb0 SHA256 1e282677beb1bec1c32e12c2c289e498b487b9f0bd0fa9c7b38a4944d48d6e9a
 MD5 c4a46d3f1920fbef1afaf9d47f1edc6b files/kdenetwork-3.5.5-linux-headers-2.6.18.patch 799
 RMD160 1e12373bef6f0a69d9b5d453c9a63b84f7b48645 files/kdenetwork-3.5.5-linux-headers-2.6.18.patch 799
@@ -9,22 +12,22 @@ SHA256 e165e409343918ac49da0df867f7df34fffa5adfd550ca3079016d0b576a1987 files/ko
 DIST kdenetwork-3.5-patchset-01.tar.bz2 2986 RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf SHA1 cacc9ad8137e5c9e44bda1faa05e26cf2450f4e6 SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b
 DIST kdenetwork-3.5.5.tar.bz2 9235564 RMD160 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 SHA1 a95bac9de9770f551870fb73ce456d779ba36878 SHA256 c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f
 DIST kdenetwork-3.5.6.tar.bz2 9245468 RMD160 2f93badae14fab4d7911c74d2f427e85ca104827 SHA1 494c67139415e3b18a1d5d054d872e90b8289832 SHA256 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e
-EBUILD kdenetwork-3.5.5-r1.ebuild 2522 RMD160 926e16c15095a2108c75cad91da7766fda95ca46 SHA1 14f4faba0683ce7de3f8ed80ea7651f59672e275 SHA256 0068cd3ec3b8e348837fce08987653e2a5a0c45515418b6d7cddd3cf3a865075
-MD5 ff8afd5dfe3281644105e1015db834c4 kdenetwork-3.5.5-r1.ebuild 2522
-RMD160 926e16c15095a2108c75cad91da7766fda95ca46 kdenetwork-3.5.5-r1.ebuild 2522
-SHA256 0068cd3ec3b8e348837fce08987653e2a5a0c45515418b6d7cddd3cf3a865075 kdenetwork-3.5.5-r1.ebuild 2522
-EBUILD kdenetwork-3.5.5-r2.ebuild 2520 RMD160 07b84700ad8173a56419c7d9d3041d5c363f1f13 SHA1 16603dcf7145cf8151e11d9bf3d235617a400e6e SHA256 65760270233b62b7bfe4e9cc49169683f68159b1b5bff730b1287b0dd52d987b
-MD5 1f1610c5db2f4f721bcb1309d7be7026 kdenetwork-3.5.5-r2.ebuild 2520
-RMD160 07b84700ad8173a56419c7d9d3041d5c363f1f13 kdenetwork-3.5.5-r2.ebuild 2520
-SHA256 65760270233b62b7bfe4e9cc49169683f68159b1b5bff730b1287b0dd52d987b kdenetwork-3.5.5-r2.ebuild 2520
-EBUILD kdenetwork-3.5.6.ebuild 2532 RMD160 3638382126f09e788c62fd907178a4306ad8c805 SHA1 246a6b551038b7989452d7b7e14e1a8458f260b9 SHA256 111df16dc52642274c80852035e958891ada934e886627d9c57e1faf1264b001
-MD5 e68a8663f54423002a170c031e828d6a kdenetwork-3.5.6.ebuild 2532
-RMD160 3638382126f09e788c62fd907178a4306ad8c805 kdenetwork-3.5.6.ebuild 2532
-SHA256 111df16dc52642274c80852035e958891ada934e886627d9c57e1faf1264b001 kdenetwork-3.5.6.ebuild 2532
-MISC ChangeLog 34368 RMD160 257c70b5173242fb242394d236539743d15f8510 SHA1 5621d6721dd1f0d4eaa7543d9e2b87c723fb6072 SHA256 c59d010d775cbc6836bcd78c1941eeb14243cb9fb736eabc8efec30c140bd92e
-MD5 763c87e2da0d0e80bc7025bcfcf73606 ChangeLog 34368
-RMD160 257c70b5173242fb242394d236539743d15f8510 ChangeLog 34368
-SHA256 c59d010d775cbc6836bcd78c1941eeb14243cb9fb736eabc8efec30c140bd92e ChangeLog 34368
+EBUILD kdenetwork-3.5.5-r1.ebuild 2503 RMD160 8c31dca03cf09acefa98d465e1623ebaa51c830d SHA1 4c02903b0b7d2a5da4444bbd79889517abb813d5 SHA256 f350e2d1b8c04af8602cb5ef965b2eeeac4c1f3cf072f69228f1a8d7132a7104
+MD5 64537a83bffd2eb1d698780113c7cb4a kdenetwork-3.5.5-r1.ebuild 2503
+RMD160 8c31dca03cf09acefa98d465e1623ebaa51c830d kdenetwork-3.5.5-r1.ebuild 2503
+SHA256 f350e2d1b8c04af8602cb5ef965b2eeeac4c1f3cf072f69228f1a8d7132a7104 kdenetwork-3.5.5-r1.ebuild 2503
+EBUILD kdenetwork-3.5.5-r2.ebuild 2503 RMD160 cc5b5e0842e7638ed3b5cc71deeddcf8c0acd8fa SHA1 551bc8093411b5450b4cda6b5f65756008c21395 SHA256 db8ae420f44cf27431805b68b7fcc2817dd42b5aabda29cf8cdc3b893511676b
+MD5 8cfbafe9bd7cc5ff49f794fc7411795f kdenetwork-3.5.5-r2.ebuild 2503
+RMD160 cc5b5e0842e7638ed3b5cc71deeddcf8c0acd8fa kdenetwork-3.5.5-r2.ebuild 2503
+SHA256 db8ae420f44cf27431805b68b7fcc2817dd42b5aabda29cf8cdc3b893511676b kdenetwork-3.5.5-r2.ebuild 2503
+EBUILD kdenetwork-3.5.6.ebuild 2517 RMD160 009058f7dfc8458f960413e651fc79275f3c0a73 SHA1 dec2b95ac8869a5dfe481feedc8fd33bb8dc7398 SHA256 bc43afe44093d7c357eda5bd95950fe493be30d2c6bc5b347ae683d012c6093d
+MD5 585c549b08b83f37ab3ab0fe1c7ddf32 kdenetwork-3.5.6.ebuild 2517
+RMD160 009058f7dfc8458f960413e651fc79275f3c0a73 kdenetwork-3.5.6.ebuild 2517
+SHA256 bc43afe44093d7c357eda5bd95950fe493be30d2c6bc5b347ae683d012c6093d kdenetwork-3.5.6.ebuild 2517
+MISC ChangeLog 34564 RMD160 b25ec41a47c4e2f5526b70f70e1230b3acd4c43b SHA1 be1a3daf55217f5da50627381f3cc4aa951630fc SHA256 2e23ade7790dbabe8ec255285c8aa27d04b2a9beac8a5bac16922b818772c6ac
+MD5 92c60882f7a1b1a84bf06ce9810921f8 ChangeLog 34564
+RMD160 b25ec41a47c4e2f5526b70f70e1230b3acd4c43b ChangeLog 34564
+SHA256 2e23ade7790dbabe8ec255285c8aa27d04b2a9beac8a5bac16922b818772c6ac ChangeLog 34564
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -38,3 +41,10 @@ SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/di
 MD5 9c271bcadc2cafa882bd69b0f27b357c files/digest-kdenetwork-3.5.6 533
 RMD160 115da1fd5d1202b1ee40a5cdfb2dd8aecbf7553b files/digest-kdenetwork-3.5.6 533
 SHA256 ecaf8d329908f4d5793e6d91319908764cafce446759c0f51fe509f877cd8219 files/digest-kdenetwork-3.5.6 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGKpGmCkvF58q80IkRApjMAJ9pULih0AWhGEHFdviUAWOqB2JxjwCeMCK4
+yTxG4lTvyNtTOyOgOwtalxc=
+=zAE1
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
index 86938a8b7e047cb1edff44ab16c0f270e959e715..e836f2a4de38fb18556f5bebf2d63191bd947bfb 100644 (file)
--- a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.14 2006/12/29 19:34:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.15 2007/04/21 22:35:06 philantrop Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -61,9 +61,9 @@ src_compile() {
        export BINDNOW_FLAGS="$(bindnow-flags)"
 
        local myconf="--with-libidn
-                                 $(use_enable sametime sametime-plugin)
-                                 $(use_enable slp) $(use_with wifi) $(use_enable jingle)
-                                 --without-xmms --without-external-libgadu"
+                                       $(use_enable sametime sametime-plugin)
+                                       $(use_enable slp) $(use_with wifi) $(use_enable jingle)
+                                       --without-xmms --without-external-libgadu"
 
        kde_src_compile
 }
@@ -83,7 +83,6 @@ src_install() {
        exeinto /etc/init.d
        doexe "${T}/lisa" "${T}/reslisa"
 
-       insinto /etc/conf.d
-       newins "${WORKDIR}/patches/lisa.conf" lisa
-       newins "${WORKDIR}/patches/reslisa.conf" reslisa
+       newconfd "${WORKDIR}/patches/lisa.conf" lisa
+       newconfd "${WORKDIR}/patches/reslisa.conf" reslisa
 }

diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
index a0cc0c0d627bbe730c954bad5675a5166bdfeef8..439cfcc5bc5fb08bf598d68c6d9b4e99e8995c4d 100644 (file)
--- a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.5-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/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.10 2007/04/21 20:46:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.11 2007/04/21 22:35:06 philantrop Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -61,9 +61,9 @@ src_compile() {
        export BINDNOW_FLAGS="$(bindnow-flags)"
 
        local myconf="--with-libidn
-                                 $(use_enable sametime sametime-plugin)
-                                 $(use_enable slp) $(use_with wifi) $(use_enable jingle)
-                                 --without-xmms --without-external-libgadu"
+                                       $(use_enable sametime sametime-plugin)
+                                       $(use_enable slp) $(use_with wifi) $(use_enable jingle)
+                                       --without-xmms --without-external-libgadu"
 
        kde_src_compile
 }
@@ -83,7 +83,6 @@ src_install() {
        exeinto /etc/init.d
        doexe "${T}/lisa" "${T}/reslisa"
 
-       insinto /etc/conf.d
-       newins "${WORKDIR}/patches/lisa.conf" lisa
-       newins "${WORKDIR}/patches/reslisa.conf" reslisa
+       newconfd "${WORKDIR}/patches/lisa.conf" lisa
+       newconfd "${WORKDIR}/patches/reslisa.conf" reslisa
 }

diff --git a/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild
index eba35f266b191f2650e45036afc5b35ff5c2156b..33a7377102f72deb04924490dd80b3a1f354716c 100644 (file)
--- a/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.6.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/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild,v 1.6 2007/04/06 09:20:43 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild,v 1.7 2007/04/21 22:35:06 philantrop Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -62,9 +62,9 @@ src_compile() {
        export BINDNOW_FLAGS="$(bindnow-flags)"
 
        local myconf="--with-libidn
-                                 $(use_enable sametime sametime-plugin)
-                                 $(use_enable slp) $(use_with wifi) $(use_enable jingle)
-                                 --without-xmms --without-external-libgadu"
+                                       $(use_enable sametime sametime-plugin)
+                                       $(use_enable slp) $(use_with wifi) $(use_enable jingle)
+                                       --without-xmms --without-external-libgadu"
 
        kde_src_compile
 }
@@ -84,7 +84,6 @@ src_install() {
        exeinto /etc/init.d
        doexe "${T}/lisa" "${T}/reslisa"
 
-       insinto /etc/conf.d
-       newins "${WORKDIR}/patches/lisa.conf" lisa
-       newins "${WORKDIR}/patches/reslisa.conf" reslisa
+       newconfd "${WORKDIR}/patches/lisa.conf" lisa
+       newconfd "${WORKDIR}/patches/reslisa.conf" reslisa
 }