Added patch to remove obsolete developer-docs directory wrt bug #132824.

Package-Manager: portage-2.1.2_rc2-r2

4 files changed, 57 insertions, 30 deletions

diff --git a/net-misc/linphone/ChangeLog b/net-misc/linphone/ChangeLog
index b088d7772d1d..0cf1bb7af6d4 100644
--- a/net-misc/linphone/ChangeLog
+++ b/net-misc/linphone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/linphone
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.18 2006/11/26 16:36:18 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.19 2006/11/26 20:48:22 drizzt Exp $
+
+  26 Nov 2006; Timothy Redaelli <drizzt@gentoo.org>
+  +files/linphone-1.3.5-docs.diff, linphone-1.3.5.ebuild:
+  Added patch to remove obsolete developer-docs directory wrt bug #132824.
 
   26 Nov 2006; Timothy Redaelli <drizzt@gentoo.org>
   +files/linphone-1.5.1-pkgconfig.patch, linphone-1.5.1.ebuild:
diff --git a/net-misc/linphone/Manifest b/net-misc/linphone/Manifest
index ad7bbe8c9a6f..ba850e0deb7a 100644
--- a/net-misc/linphone/Manifest
+++ b/net-misc/linphone/Manifest
@@ -9,6 +9,10 @@ AUX linphone-1.0.1-ipv6-include.diff 340 RMD160 ae7348e9085bd1d9316ca9615e1ae95b
 MD5 09a1ce01898450b93c37d1021c5b4c7e files/linphone-1.0.1-ipv6-include.diff 340
 RMD160 ae7348e9085bd1d9316ca9615e1ae95b650fdd09 files/linphone-1.0.1-ipv6-include.diff 340
 SHA256 a50c156aaa331beb1c1bfe300ada81d18ee1532018d4fd33482ad6853878ae38 files/linphone-1.0.1-ipv6-include.diff 340
+AUX linphone-1.3.5-docs.diff 521 RMD160 b2a576b14d52c0798b4e23cc2e7db48c5b661632 SHA1 ab2026927fa2835a90ef620a5438868867300674 SHA256 884c132aded6a5375fd7857de38924ef5142ab2073d0d1eefafeabf2dfd27fb0
+MD5 59e6e206ca1f23cabfeaaf6d015f63f5 files/linphone-1.3.5-docs.diff 521
+RMD160 b2a576b14d52c0798b4e23cc2e7db48c5b661632 files/linphone-1.3.5-docs.diff 521
+SHA256 884c132aded6a5375fd7857de38924ef5142ab2073d0d1eefafeabf2dfd27fb0 files/linphone-1.3.5-docs.diff 521
 AUX linphone-1.5.1-pkgconfig.patch 382 RMD160 7e017402b5ae09e9599543b920cf4d59e0b31d77 SHA1 9637c5f066519473c813a50daba534830a501275 SHA256 e2c7d758905821d5b28d7a0b8298dc7254a89557835097df0b20452851d96805
 MD5 028f8a726199603e97f7b06cf641dc83 files/linphone-1.5.1-pkgconfig.patch 382
 RMD160 7e017402b5ae09e9599543b920cf4d59e0b31d77 files/linphone-1.5.1-pkgconfig.patch 382
@@ -21,18 +25,18 @@ EBUILD linphone-1.1.0.ebuild 1635 RMD160 2f8a956ce306f8b67a72989543cc99d9ce6f3b4
 MD5 46553f90e00cb1cef654ccc40a80f60f linphone-1.1.0.ebuild 1635
 RMD160 2f8a956ce306f8b67a72989543cc99d9ce6f3b4f linphone-1.1.0.ebuild 1635
 SHA256 c628d3a721127f39124a7e2ae94be430f971b8a9a8952ce71154ad355186ad9f linphone-1.1.0.ebuild 1635
-EBUILD linphone-1.3.5.ebuild 2558 RMD160 ea0966fd0d91c079e189fe7e5ff4cf58542dbce7 SHA1 eccd131e104ad59f95a976c997e7e29e408db4da SHA256 367b5d9dbbf19d8a4ed93887f67605bec3c696a3b53ec50001803a95025ceacf
-MD5 632a9f25c0ea028effba95b892e5c950 linphone-1.3.5.ebuild 2558
-RMD160 ea0966fd0d91c079e189fe7e5ff4cf58542dbce7 linphone-1.3.5.ebuild 2558
-SHA256 367b5d9dbbf19d8a4ed93887f67605bec3c696a3b53ec50001803a95025ceacf linphone-1.3.5.ebuild 2558
+EBUILD linphone-1.3.5.ebuild 2691 RMD160 71d708512254bf6420d73f1b33537267837bfc93 SHA1 1462a3ce763e25728fae24d425dffcc64129d448 SHA256 d445fd4ead39afa5b982de2635572be51be501ac2ef3aef55a99ec677efd3f6c
+MD5 0081764abdc592bfca1714059d50610a linphone-1.3.5.ebuild 2691
+RMD160 71d708512254bf6420d73f1b33537267837bfc93 linphone-1.3.5.ebuild 2691
+SHA256 d445fd4ead39afa5b982de2635572be51be501ac2ef3aef55a99ec677efd3f6c linphone-1.3.5.ebuild 2691
 EBUILD linphone-1.5.1.ebuild 2002 RMD160 e88f3141689870c1c3b6aabdbfef6d47243148a7 SHA1 fcfa64ab181382f0b08ca9811332492e7c0a18ae SHA256 f9b5e6b4a57a9cca7f214b71184a8512d12ea51d78da5b9cfe1fea0f1a7df8ef
 MD5 5e1e5265b77a489d69fc55e8b0c467fc linphone-1.5.1.ebuild 2002
 RMD160 e88f3141689870c1c3b6aabdbfef6d47243148a7 linphone-1.5.1.ebuild 2002
 SHA256 f9b5e6b4a57a9cca7f214b71184a8512d12ea51d78da5b9cfe1fea0f1a7df8ef linphone-1.5.1.ebuild 2002
-MISC ChangeLog 5302 RMD160 465000cc8ad909e7caee69439c9cf8c9051daa45 SHA1 dc7dcfcabaefbf0a39db22fdd01ea146054b5c2f SHA256 0206adf8abcf666230b2299617e7ddb631cf9e5f28d7374a74df392baaaf6d06
-MD5 61a69cc44169eddeb7ebd43f7f62ff15 ChangeLog 5302
-RMD160 465000cc8ad909e7caee69439c9cf8c9051daa45 ChangeLog 5302
-SHA256 0206adf8abcf666230b2299617e7ddb631cf9e5f28d7374a74df392baaaf6d06 ChangeLog 5302
+MISC ChangeLog 5488 RMD160 cc63f1ca95c32579151d7881e58ca88df5d9f560 SHA1 4719de14216990a6e6f80bf1f79223214980d735 SHA256 662750f64adbd811243457ef2a3f84733e1211061004d7c04fbfa4bc86268df7
+MD5 01bc2f68cf5e0304f6d263fa783e9022 ChangeLog 5488
+RMD160 cc63f1ca95c32579151d7881e58ca88df5d9f560 ChangeLog 5488
+SHA256 662750f64adbd811243457ef2a3f84733e1211061004d7c04fbfa4bc86268df7 ChangeLog 5488
 MISC metadata.xml 315 RMD160 5904ff296ee18dd6f9e9b3ab4794879fb14d94a6 SHA1 ebcb6e1b5a6023d682b7b0ae34b35b481b7de7d0 SHA256 776755752503a4051438c6c0c20c10ac7f0943898a1d476fa1d0477a1a50001e
 MD5 bf329e2b298c08082a3ff4dfe6c236b3 metadata.xml 315
 RMD160 5904ff296ee18dd6f9e9b3ab4794879fb14d94a6 metadata.xml 315
@@ -49,7 +53,7 @@ SHA256 617a94dc2e02bf23a608b9ffdda330783593d26e99a5d6fdf56629b9d4dab667 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFacK9GDyatLGpTbYRAkNJAKCD3ggU9oPTvM4udX4BMrvZnZ494ACgkChk
-IvWkr1LLn8ZeZMHnNZmMzjw=
-=BuT/
+iD8DBQFFaf2iGDyatLGpTbYRAvP8AJ42ozWwcjrliYgMmNi7yUFzxDZxlgCePZwf
+DhwYT1+ORF8U84+m1qakr0w=
+=S6hZ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/linphone/files/linphone-1.3.5-docs.diff b/net-misc/linphone/files/linphone-1.3.5-docs.diff
new file mode 100644
index 000000000000..928597abf3bb
--- /dev/null
+++ b/net-misc/linphone/files/linphone-1.3.5-docs.diff
@@ -0,0 +1,12 @@
+diff -Naur linphone-1.3.5.old/Makefile.am linphone-1.3.5/Makefile.am
+--- linphone-1.3.5.old/Makefile.am	2006-05-14 22:05:56.000000000 -0400
++++ linphone-1.3.5/Makefile.am	2006-05-14 22:06:02.000000000 -0400
+@@ -7,7 +7,7 @@
+ 
+ SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
+                 $(WIN32ACM_DIR) mediastreamer mediastreamer2\
+-		media_api exosip coreapi console gnome share developer-docs
++		media_api exosip coreapi console gnome share 
+ 
+ 
+ EXTRA_DIST =  linphone2.glade BUGS linphone.kdevprj \
diff --git a/net-misc/linphone/linphone-1.3.5.ebuild b/net-misc/linphone/linphone-1.3.5.ebuild
index df34a3ac74a7..d096bd304542 100644
--- a/net-misc/linphone/linphone-1.3.5.ebuild
+++ b/net-misc/linphone/linphone-1.3.5.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.3.5.ebuild,v 1.9 2006/07/01 11:08:57 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.3.5.ebuild,v 1.10 2006/11/26 20:48:22 drizzt Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
 
 inherit eutils autotools
 
@@ -36,19 +39,21 @@ S_ILBC="${WORKDIR}/${PN}-plugin-ilbc-1.2.0"
 
 src_unpack() {
 	unpack ${A}
-	grep " \-Werror" * -Rl | xargs sed -i "s: -Werror::"
+	grep -Rl --null " \-Werror" . | xargs -0 sed -i "s: -Werror::"
 
-	cd ${S}
+	cd "${S}"
 	# fix #99083
-	epatch ${FILESDIR}/${PN}-1.0.1-ipv6-include.diff
+	epatch "${FILESDIR}"/${PN}-1.0.1-ipv6-include.diff
+	# fix #132824
+	epatch "${FILESDIR}"/${P}-docs.diff
 
 	if use ilbc; then
-		cd ${S_ILBC}
+		cd "${S_ILBC}"
 		# add -fPIC and custom cflags to ilbc makefile
-		epatch ${FILESDIR}/ilbc-1.2.0-makefile.diff
-		cd ${S}
+		epatch "${FILESDIR}"/ilbc-1.2.0-makefile.diff
+		cd "${S}"
 	fi
-	AT_M4DIR="${S}/m4" eautoreconf
+	./autogen.sh
 }
 
 src_compile() {
@@ -75,26 +80,28 @@ src_compile() {
 
 	emake || die "Unable to make"
 
-	use ilbc && \
-		emake LINPHONE_SOURCE=${S} \
+	if use ilbc; then
+		emake LINPHONE_SOURCE="${S}" \
 		PLUGINS_INSTALL_PATH=/usr/$(get_libdir)/linphone/plugins/mediastreamer \
-		-C ${S_ILBC} || die
+		-C "${S_ILBC}" || die
+	fi
 }
 
 src_install () {
-	make DESTDIR=${D} install || die "Failed to install"
+	emake DESTDIR="${D}" install || die "Failed to install"
 
-	use ilbc && \
-		make LINPHONE_SOURCE=${S} \
+	if use ilbc; then
+		emake LINPHONE_SOURCE="${S}" \
 		PLUGINS_INSTALL_PATH=/usr/$(get_libdir)/linphone/plugins/mediastreamer \
-		DESTDIR=${D} -C ${S_ILBC} install || die
+		DESTDIR="${D}" -C "${S_ILBC}" install || die
+	fi
 
 	dodoc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README
 	dodoc README.arm TODO
 
 	# don't install ortp includes, docs and pkgconfig files
 	# to avoid conflicts with net-libs/ortp
-	rm -rf ${D}/usr/include/ortp
-	rm -rf ${D}/usr/share/gtk-doc/html/ortp
-	rm -rf ${D}/usr/$(get_libdir)/linphone/pkgconfig
+	rm -rf "${D}"/usr/include/ortp
+	rm -rf "${D}"/usr/share/gtk-doc/html/ortp
+	rm -rf "${D}"/usr/$(get_libdir)/linphone/pkgconfig
 }