misdn and capi (remove capi too)

Package-Manager: portage-2.1.2_pre2-r5

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 9062ff486e797be0bc21d091774edaf5e51d81b3..b226a7af20c475958202380542d4c240d6eec7a6 100644 (file)
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.128 2006/10/08 00:38:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.129 2006/10/08 00:46:27 genstef Exp $
 
   08 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
   asterisk-1.2.12.1.ebuild:
-  make sure chan_misdn is not getting installed
+  make sure chan_misdn/capi is not getting installed
 
   06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   asterisk-1.2.12.1.ebuild:

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 4bdd10fc9b1f2b6ca8aa5d4faf4534b349d07251..baf2743fdbd75e8637ad60cbafe651bb96fd38e8 100644 (file)
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -140,14 +140,14 @@ EBUILD asterisk-1.2.11.ebuild 12066 RMD160 08ce42b4c9f5b5836fe78039b010afa93742b
 MD5 2519cd005fdf60fa77f0bd0e1ba65dcf asterisk-1.2.11.ebuild 12066
 RMD160 08ce42b4c9f5b5836fe78039b010afa93742bcb4 asterisk-1.2.11.ebuild 12066
 SHA256 53214cb0dadfad7c7f68db64f271b94e6bbb3cfcf13427691ed493c8a4800e81 asterisk-1.2.11.ebuild 12066
-EBUILD asterisk-1.2.12.1.ebuild 12657 RMD160 c5e6522e072f7c74adbc032ee95e25a958d87fe0 SHA1 0b0ff039db5383b1b4e090e87491a3181a0b5af2 SHA256 b54bb83bd0125aa5629bbc34107edb0625f58841a5ffd659a50ee1e6744cad00
-MD5 257e2613fddc880f032dec9f4896ab7c asterisk-1.2.12.1.ebuild 12657
-RMD160 c5e6522e072f7c74adbc032ee95e25a958d87fe0 asterisk-1.2.12.1.ebuild 12657
-SHA256 b54bb83bd0125aa5629bbc34107edb0625f58841a5ffd659a50ee1e6744cad00 asterisk-1.2.12.1.ebuild 12657
-MISC ChangeLog 25794 RMD160 1aca12e942d1505b56b232ca8c47f9636ac01944 SHA1 0e97e974280c5f8db324a1e95d0809fe764e666f SHA256 29c54d45af33f50397484cef2fa58dfd5f84bbdbb1eee0a3ff6c7fa759582aa1
-MD5 833be01b31968d9d87055b78aaf0fadd ChangeLog 25794
-RMD160 1aca12e942d1505b56b232ca8c47f9636ac01944 ChangeLog 25794
-SHA256 29c54d45af33f50397484cef2fa58dfd5f84bbdbb1eee0a3ff6c7fa759582aa1 ChangeLog 25794
+EBUILD asterisk-1.2.12.1.ebuild 12715 RMD160 820a816b7abe13a4725dd708829ad2f37337edda SHA1 1ede16c43c150a1e14f69b6f9ad8e3d7d008e0f3 SHA256 099aff0be9975f8c222a512bee1a9a4c9365e8958ff8d5568a11fcea7eb02b4c
+MD5 b9e92b5368ccf88afeb96b84979f305b asterisk-1.2.12.1.ebuild 12715
+RMD160 820a816b7abe13a4725dd708829ad2f37337edda asterisk-1.2.12.1.ebuild 12715
+SHA256 099aff0be9975f8c222a512bee1a9a4c9365e8958ff8d5568a11fcea7eb02b4c asterisk-1.2.12.1.ebuild 12715
+MISC ChangeLog 25799 RMD160 b05dec4b00cc8c8f999c54759f65a4e9c2df9eca SHA1 29fd46fca62f88d7c9befba5aac4d39982716b8a SHA256 456e9bad9b4183f4876d9d16d8e8f23b3736eaf03dcb60b1afc1d358aa1abe33
+MD5 4794c93889d12c388e471b4a9e09bebf ChangeLog 25799
+RMD160 b05dec4b00cc8c8f999c54759f65a4e9c2df9eca ChangeLog 25799
+SHA256 456e9bad9b4183f4876d9d16d8e8f23b3736eaf03dcb60b1afc1d358aa1abe33 ChangeLog 25799
 MISC metadata.xml 384 RMD160 f5de78add5676233b8e0b9e111eab08970443582 SHA1 0441844fb3a715d6979e6c548147ada23d73fec2 SHA256 674224368cb2be6f72655cd67ee19d4d2d0f3425d560aff22b698269e0adc6d8
 MD5 488aea6fbdb7537394cc049b0ff9e5d5 metadata.xml 384
 RMD160 f5de78add5676233b8e0b9e111eab08970443582 metadata.xml 384

diff --git a/net-misc/asterisk/asterisk-1.2.12.1.ebuild b/net-misc/asterisk/asterisk-1.2.12.1.ebuild
index 30587e38b8e903a9669510e919b62e706e2f4648..5c8539b603c0ef17e6cf2039d9fb1412785a2e47 100644 (file)
--- a/net-misc/asterisk/asterisk-1.2.12.1.ebuild
+++ b/net-misc/asterisk/asterisk-1.2.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.12.1.ebuild,v 1.5 2006/10/08 00:38:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.12.1.ebuild,v 1.6 2006/10/08 00:46:27 genstef Exp $
 
 inherit eutils multilib
 
@@ -408,12 +408,12 @@ src_install() {
        # install asterisk-updater
        dosbin ${FILESDIR}/1.2.0/asterisk-updater
 
-       # make sure misdn stuff is not installed, provided by asterisk-chan_misdn
-       rm -f ${D}/etc/asterisk/misdn.conf
-       rm -f ${D}/usr/lib/asterisk/modules/chan_misdn.so
-       rm -f ${D}/usr/share/doc/${PF}/configs/misdn.conf.sample.gz
-       rm -f ${D}/usr/share/doc/${PF}/README.misdn.gz
-       rm -f ${D}/usr/share/doc/${PF}/conf/misdn.conf
+       # make sure misdn/capi stuff is not installed, provided by asterisk-chan_..
+       rm -f ${D}/etc/asterisk/misdn.conf ${D}/usr/lib/asterisk/modules/chan_misdn.so \
+               ${D}/usr/share/doc/${PF}/{conf/misdn.conf,configs/misdn.conf.sample.gz,README.misdn.gz}
+       rm -f ${D}/usr/include/asterisk/chan_capi{,_app}.h \
+               ${D}/usr/share/doc/${PF}/{conf/capi.conf,configs/capi.conf.sample.gz}
+       
 }
 
 pkg_preinst() {