From: Samuli Suominen <ssuominen@gentoo.org>
Date: Tue, 13 Sep 2011 18:19:57 +0000 (+0000)
Subject: [This is a placeholder. Please ignore.]
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d55aaf940ed2e201518d21d8e2e279d8dcea21b9;p=gentoo.git

[This is a placeholder. Please ignore.]

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64
---

diff --git a/net-libs/ptlib/ChangeLog b/net-libs/ptlib/ChangeLog
index 7477e32a3fa1..8802d123485d 100644
--- a/net-libs/ptlib/ChangeLog
+++ b/net-libs/ptlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/ptlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.25 2011/09/13 18:18:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.26 2011/09/13 18:19:57 ssuominen Exp $
+
+  13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> -ptlib-2.6.7.ebuild:
+  [This is a placeholder. Please ignore.]
 
   13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> ptlib-2.6.7-r1.ebuild:
   Remove <media-libs/libdc1394-2 and v4l1 support wrt #367085 by Steve Williams
diff --git a/net-libs/ptlib/Manifest b/net-libs/ptlib/Manifest
index fabe3326a2a3..897ccc8d7964 100644
--- a/net-libs/ptlib/Manifest
+++ b/net-libs/ptlib/Manifest
@@ -5,13 +5,12 @@ AUX ptlib-2.6.4-vxml-ptones.patch 250 RMD160 b7eddb71af5d331ab104045c47d763bec19
 DIST ptlib-2.6.6-htmldoc.tar.bz2 2089135 RMD160 1fa6671316c69942b00830627f9dbe34772a5f6a SHA1 b77782bbfcc7de38515e17cacd1ec886c4a8c274 SHA256 b72ce069519850c76e943a7c38f09181028792e449a60e5b0b09ed2aed5c99c7
 DIST ptlib-2.6.7.tar.bz2 3275152 RMD160 b9f0048057f53bb1869979be865f5baea8280162 SHA1 fb37538665995820a714e2fe5e268553995474e8 SHA256 7dd28225fedd21154d34899b21ee4b6d27c88eb1a9f9931c8e6ced28e8f3b97f
 EBUILD ptlib-2.6.7-r1.ebuild 7380 RMD160 611cfe47726fc434e2576fda87b362244b793037 SHA1 401da50b1c5c155ad17a02272f24e489d1be0dc3 SHA256 15b10968127f08f398b95293a61b7e576795c3a9598b3821031358e901baaf1b
-EBUILD ptlib-2.6.7.ebuild 7363 RMD160 4aa62bf26d537d0df73ce41c8aaa80bc6215d2ff SHA1 59d95403cc208bc68d979d0ff9d5b2711b27f3a5 SHA256 683a0f989e0822633f13126b919082277c56831ec4833e15dec1e64c223a9bc6
-MISC ChangeLog 3788 RMD160 1e9dbfae4b7d3502cd19257b6ca63701365d2377 SHA1 5b31808a9f9ab76d72df116d0d8be35097b6103c SHA256 6305b31e49112ff4e8203cbfb26d069239e3125e831bec58561a0ced0b0b1a7a
+MISC ChangeLog 3906 RMD160 90779663ae82986f63ed94920fd56a07f9c5f60a SHA1 f545dff46c1e3e85a4b39bcbead24783f28ab142 SHA256 22eab0c585628f884b969823d72c6dd6a6d36420ae3519e400825be31ee254c7
 MISC metadata.xml 1160 RMD160 b259b8631049719fe5c9aed02f15b95232860d41 SHA1 78af21a8a19d1d988329da8a70babd744a4e0e6c SHA256 91aa203d63993f44e881c8ee7908d49596ddd1c03b89ea5b041ac86e2877fdb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5vnroACgkQXkR9YqOcLPGfZAD/Vn+X/fQfTZ9j4SBkdxGc4Xdf
-lJMpr/jfzZbjAiv0S/wA/ir697H701Rfi5oTeW1FCS4Q5xE6S09v/1PNMN1iLBwb
-=Ut/A
+iF4EAREIAAYFAk5vnwIACgkQXkR9YqOcLPGjtAD7BmE7UaYcTJRWqylQN9TNh0sB
+x4p0eR07klw4es6ZmcEA/jKgX0FFl85TsjHMrwRIntVt4x5102Q3zJ4qe6fx6ydA
+=MysD
 -----END PGP SIGNATURE-----
diff --git a/net-libs/ptlib/ptlib-2.6.7.ebuild b/net-libs/ptlib/ptlib-2.6.7.ebuild
deleted file mode 100644
index 5ce93e86dd30..000000000000
--- a/net-libs/ptlib/ptlib-2.6.7.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.7.ebuild,v 1.2 2011/04/04 20:44:52 scarabeus Exp $
-
-EAPI="2"
-
-inherit eutils
-
-HTMLV="2.6.6" # There no 2.6.7 release of htmldoc
-DESCRIPTION="Network focused portable C++ class library providing high level functions"
-HOMEPAGE="http://www.opalvoip.org/"
-SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
-	doc? ( mirror://sourceforge/opalvoip/${PN}-${HTMLV}-htmldoc.tar.bz2 )"
-
-LICENSE="MPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-# default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn +audio debug doc dtmf esd examples ffmpeg ftp http ieee1394 ipv6
-jabber ldap mail odbc oss pch qos remote sasl sdl serial shmvideo snmp soap
-socks ssl +stun telnet tts v4l v4l2 +video vxml wav xml xmlrpc"
-
-CDEPEND="
-	audio? ( alsa? ( media-libs/alsa-lib )
-		esd? ( media-sound/esound ) )
-	ldap? ( net-nds/openldap )
-	odbc? ( dev-db/unixODBC )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	sdl? ( media-libs/libsdl )
-	ssl? ( dev-libs/openssl )
-	video? ( ieee1394? ( media-libs/libdc1394:1
-				media-libs/libdv
-				sys-libs/libavc1394
-				sys-libs/libraw1394 )
-		v4l2? ( media-libs/libv4l ) )
-	xml? ( dev-libs/expat )"
-RDEPEND="${CDEPEND}
-	ffmpeg? ( virtual/ffmpeg )"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
-	video? ( v4l? ( sys-kernel/linux-headers )
-		v4l2? ( sys-kernel/linux-headers ) )
-	!!dev-libs/pwlib"
-
-# NOTES:
-# media-libs/libdc1394:2 should be supported but headers location have changed
-# tools/ directory is ignored
-# looks to have an auto-magic dep with medialibs, but not in the tree so...
-#	upstream bug 2794736
-# avc plugin is disabled to fix bug 276514, see upstream bug 2821744
-
-# TODO:
-# manage in a better way the conditional use flags (with eapi-3 ?)
-# libv4l is an automagic dep for v4l2 plugin, see upstream bug 2867383
-
-conditional_use_warn_msg() {
-	ewarn "To enable ${1} USE flag, you need ${2} USE flag to be enabled"
-	ewarn "Please, enable ${2} or disable ${1}"
-}
-
-pkg_setup() {
-	local use_warn=false
-
-	if use sdl && ! use video; then
-		conditional_use_warn_msg "sdl" "video"
-		use_warn=true
-	fi
-
-	if use jabber && ! use xml; then
-		conditional_use_warn_msg "jabber" "xml"
-		use_warn=true
-	fi
-
-	if use vxml; then
-		if ! use xml; then
-			conditional_use_warn_msg "vxml" "xml"
-			use_warn=true
-		fi
-		if ! use http; then
-			conditional_use_warn_msg "vxml" "http"
-			use_warn=true
-		fi
-	fi
-
-	if use xmlrpc; then
-		if ! use xml; then
-			conditional_use_warn_msg "xmlrpc" "xml"
-			use_warn=true
-		fi
-		# configure script tells it needs http but it fails, see bug 277385
-		# the bug has been reported at upstream bug 2820814
-		if ! use http; then
-			conditional_use_warn_msg "xmlrpc" "http"
-			use_warn=true
-		fi
-	fi
-
-	if use soap; then
-		if ! use xml; then
-			conditional_use_warn_msg "soap" "xml"
-			use_warn=true
-		fi
-		# fix bug 280850, see upstream bug 2844915
-		if ! use http; then
-			conditional_use_warn_msg "soap" "http"
-			use_warn=true
-		fi
-	fi
-
-	if ${use_warn}; then
-		echo
-		ewarn "Please look at previous messages and re-emerge accordingly if needed."
-		ebeep
-		epause 5
-	fi
-}
-
-src_prepare() {
-	# remove visual studio related files from samples/
-	if use examples; then
-		rm -f samples/*/*.vcproj
-		rm -f samples/*/*.sln
-		rm -f samples/*/*.dsp
-		rm -f samples/*/*.dsw
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	# plugins are disabled only if ! audio and ! video
-	if ! use audio && ! use video; then
-		myconf="${myconf} --disable-plugins"
-	else
-		myconf="${myconf} --enable-plugins"
-	fi
-
-	# minsize, openh323, opal: presets of features (overwritten by use flags)
-	# ansi-bool, atomicity: there is no reason to disable those features
-	# internalregex: we want to use system one
-	# sunaudio and bsdvideo are respectively for SunOS and BSD's
-	# appshare, vfw: only for windows
-	# samples: no need to build samples
-	# avc: disabled, bug 276514, upstream bug 2821744
-	# pipechan, configfile, resolver, url: force enabling
-	econf ${myconf} \
-		--disable-minsize \
-		--disable-openh323 \
-		--disable-opal \
-		--enable-ansi-bool \
-		--enable-atomicity \
-		--disable-internalregex \
-		--disable-sunaudio \
-		--disable-bsdvideo \
-		--disable-appshare \
-		--disable-vfw \
-		--disable-samples \
-		--disable-avc \
-		--enable-configfile \
-		--enable-pipechan \
-		--enable-resolver \
-		--enable-url \
-		$(use_enable audio) \
-		$(use_enable alsa) \
-		$(use_enable asn) \
-		$(use_enable debug exceptions) \
-		$(use_enable debug memcheck) \
-		$(use_enable debug tracing) \
-		$(use_enable dtmf) \
-		$(use_enable esd) \
-		$(use_enable ffmpeg ffvdev) \
-		$(use_enable ftp) \
-		$(use_enable http) \
-		$(use_enable http httpforms) \
-		$(use_enable http httpsvc) \
-		$(use_enable ieee1394 dc) \
-		$(use_enable ipv6) \
-		$(use_enable jabber) \
-		$(use_enable ldap openldap) \
-		$(use_enable mail pop3smtp) \
-		$(use_enable odbc) \
-		$(use_enable oss) \
-		$(use_enable pch) \
-		$(use_enable qos) \
-		$(use_enable remote remconn) \
-		$(use_enable sasl) \
-		$(use_enable sdl) \
-		$(use_enable serial) \
-		$(use_enable shmvideo) \
-		$(use_enable snmp) \
-		$(use_enable soap) \
-		$(use_enable socks) \
-		$(use_enable ssl openssl) \
-		$(use_enable stun) \
-		$(use_enable telnet) \
-		$(use_enable tts) \
-		$(use_enable v4l) \
-		$(use_enable v4l2) \
-		$(use_enable video) $(use_enable video vidfile) \
-		$(use_enable vxml) \
-		$(use_enable wav wavfile) \
-		$(use_enable xml expat) \
-		$(use_enable xmlrpc)
-}
-
-src_compile() {
-	local makeopts=""
-
-	use debug && makeopts="debug"
-
-	emake ${makeopts} || die "emake failed"
-}
-
-src_install() {
-	local makeopts=""
-
-	use debug && makeopts="DEBUG=1"
-
-	emake DESTDIR="${D}" ${makeopts} install || die "emake install failed"
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/* || die "dohtml failed"
-	fi
-
-	dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
-
-	# ChangeLog is not standard
-	#dodoc ChangeLog-${PN}-v${PV//./_}.txt || die "dodoc failed"
-
-	if use audio || use video; then
-		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt || die "newdoc failed"
-	fi
-
-	if use examples; then
-		local exampledir="/usr/share/doc/${PF}/examples"
-		local basedir="samples"
-		local sampledirs="`ls samples --hide=Makefile`"
-
-		# first, install Makefile
-		insinto ${exampledir}/
-		doins ${basedir}/Makefile || die "doins failed"
-
-		# now, all examples
-		for x in ${sampledirs}; do
-			insinto ${exampledir}/${x}/
-			doins ${basedir}/${x}/* || die "doins failed"
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use examples; then
-		ewarn "All examples have been installed, some of them will not work on your system"
-		ewarn "it will depend of the enabled USE flags."
-		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
-	fi
-
-	if ! use audio || ! use video; then
-		ewarn "You have disabled audio or video USE flags."
-		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
-		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
-	fi
-
-	ewarn "If you've just removed pwlib to install ptlib, some packages will be broken."
-	ewarn "Please use 'revdep-rebuild' from app-portage/gentoolkit to check."
-	ewarn "If some packages need pwlib, consider removing ptlib and re-installing pwlib"
-	ewarn "or help us to make them live together."
-}