4 files changed, 102 insertions, 17 deletions
diff --git a/net-libs/ortp/ChangeLog b/net-libs/ortp/ChangeLog
index e37083617667..8c819f09099c 100644
--- a/net-libs/ortp/ChangeLog
+++ b/net-libs/ortp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/ortp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ChangeLog,v 1.82 2013/04/02 20:56:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ChangeLog,v 1.83 2013/10/09 15:09:05 hasufell Exp $
+
+*ortp-0.22.0 (09 Oct 2013)
+
+  09 Oct 2013; Julian Ospald <hasufell@gentoo.org> +ortp-0.22.0.ebuild,
+  metadata.xml:
+  version bump wrt #486498
 
   02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> ortp-0.20.0.ebuild:
   Stable for ppc64, wrt bug #462890
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index 54e965ed1460..adfda9e77876 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -5,26 +5,22 @@ DIST ortp-0.16.1.tar.gz 466365 SHA256 00043ee21852bc209192deaf66a6513968cd400761
 DIST ortp-0.16.3.tar.gz 470415 SHA256 13805ec34ee818408aa1b4571915ef8f9e544c838a0fca9dff8d2308de6574eb
 DIST ortp-0.16.5.tar.gz 472396 SHA256 3b655a79f9122afd298e9cd702e542908bbd6ea1337c02553110c57e0b3c5835 SHA512 b09ae7c2332e73586f13e79706e0f6fd34ccfb072b5a4df83bd7f08ba3a0cec6b1ca7401674ee9ae158f9b21510a520219c8c9c04db40ffa89950d3f96db8c5d WHIRLPOOL ff3c99e46e742e2cdba1f2539287fca7d350626b9ae5a5d59da85bef02aa2071798773728740e3385fb4eadab144249e849314b862b64a7775c5d677b6fc0818
 DIST ortp-0.20.0.tar.gz 515505 SHA256 f2a8263f8242756e2ce092c710ac068cd4b21051fc70c1937b275193a2bfb3d3 SHA512 a4d666be6b6825eeb28204001d5d1263c80ef3c07931586e753d3efa8c72d76e993335c4eeaa558209b5d10d5e991ba0c88e2f5c9a35aff46b36d6e76f92b706 WHIRLPOOL cc1a9473580748a76d26bde42f074bd9bbb1bd066a7b514b0016dd75d2d5b57ff29eba18e10139457acc406593bb566fdc8c256a4241a77718d965419ecd8b50
+DIST ortp-0.22.0.tar.gz 538024 SHA256 6e37e29b3c3559bac1f2ae0c977f6ceb4d4ce8dc713b691dea8bae57bda92d0b SHA512 0453f19fd3388c3dcd12f118dbfc1a460fae77e4f9e82b1b71f4014e3bbba4d480f811d07bc781dced1fb2685901eaea364c8276c0d083f5e8d6b7074f7c4fba WHIRLPOOL 00f31d4de912dcf29778e68f5c88001eb845653303048d5c29a3c1488b1fae42399292df91596cabe1a223a4171a409af452cee97a3f075230918b068212e99c
 EBUILD ortp-0.16.1.ebuild 2365 SHA256 a29e93d2cffb902f7765221aec1fa537abf8b0540f1bfc45f12cd61cf71c152b SHA512 2b1864ea3cfd48ca0fad8e3604d4faaa83f124abd548619e82a73a2b29e1c93217b75d51e5f10ba54ea33ae52e5373e7f174780831ba1941e979786b9fdd9b03 WHIRLPOOL db329f8589effa8c712f52468cf4ce4cb7000e569bf44fa4740bba1c863a45e6bac57a1bbe9b250989d32233ed0c4a149c92832d6eb23cee7d620afce9788c74
 EBUILD ortp-0.16.3.ebuild 2353 SHA256 7ff8fd5b4849ff7ba7b01f774b888066c61db8fc8b1508864907202a0f734fda SHA512 9c606acb6c048fc493dd3de444bdd0f3b5cf3b63a7786783370dacaa195f23105262118a387a7b7371b7637e093223e42725cea5b2c196986ee7162835b47bab WHIRLPOOL 382cd914b518c5c04193168419f4befc9fd51320b14f82767ce8ceb4a7a2a7b87aded9ae59dc828b96da563cae59ee98f05918361abeb5ede4ae9d99b32172a2
 EBUILD ortp-0.16.5.ebuild 2221 SHA256 9e4cdf64c0d1a3a7efbd031095f25b09c1f6c525eac29dde5443394a2d9ad699 SHA512 749703f20c96a3ca5e10c6f92699ffc12c4be12173a601848dfd2923ae635ccf50df8d1585d0a095c9ae606dbd89c7f4c3bab0ea9d1de4763d6d6f6746cf10aa WHIRLPOOL f47cb2bf7074116e7722b35979b54d6c7c7f9d262377334aaab439586e9f0a7476224a276f7f3071649494ceedaaea76fa1d0b02911958c149f63245f0743e00
 EBUILD ortp-0.20.0.ebuild 1963 SHA256 403f45bbea1a52683e64f294438d6ab60b46590181cf629f6b7a7c27cb2d7795 SHA512 246d67dfc257820799a734c031326c5a85b9cd2f64a880820213ea383ac24fd97c57382b7d540d9eefa1fe2d84f0a0ec046572fe6f11cb7952b47f266dda6f4e WHIRLPOOL a93df9f90eb5e5f93d4e7bd62a45c1d604b8daa21d89a17e725f237eeddfe020dab019d9d41518f850cfbc16d600f87eb573bb32b1bd0800056aab358483ce1c
-MISC ChangeLog 9987 SHA256 c1da0de3b68acc1108df67bf430628fd9a514f00ec71605e09ce18b36d134e09 SHA512 e614e1a879f546f9aa9a128c759b4a11d817264bd31256b30f5e87b707a5a01031486c9cf9772b75fc79d200cc7e05633aaccb98c64464cf1e47e145ce424ce4 WHIRLPOOL 6d3b98fcef2e1b888469c8d710291c3653c552e258d6dd4c51135be08943d239a0a5bb7a226178f9de1ba3519297dd91b6a6cd64706c23493dd2469bac12a1d2
-MISC metadata.xml 300 SHA256 4bb75bd1fa1480f23cfc0f5cbbc2123289978ae96c66d71665089702e3037e23 SHA512 fa2bf8b5e1f9cfe88a30df09a675c927a9321678c5da340e6ee23231d0bc666fbb685bf12bed2acdc4831238f9249b721c3d1bdf96a1b160e236fef5792a0a65 WHIRLPOOL bd2c36bada6eed9d629d044756b6bc7282128ddb84235f1d32093493765685a60999680872d50b759e143ad443c8df429b8546c211e5c40bb249d9a0ec5e84dd
+EBUILD ortp-0.22.0.ebuild 2126 SHA256 05da36c05d1489e6179c6f258ce42a2c3e951343044da28d324a0ca858c7d58b SHA512 4257f12d3f4322fb878938f71970a16ce5cb1a946241c6b829adef0d96865dd739388ee6305538e9ce3ef313da5516d871ddc9f1b6208a85c3f6728b93667c3f WHIRLPOOL 9abd5c4606c7c3e1ff472eb9f7a5a79b1b7f136d95ab82547d76627f644886e606c25d72f501c42c34595d7cdf23b510981a3d4d77934db16fe4ccf9e8e4c007
+MISC ChangeLog 10136 SHA256 297f7443c333befa7f134d32023a285266411f07a0df06d8d583e113c334eed7 SHA512 c77372fcdfaedbcfd4eb27eec1342c2334141481133576792b077f939116174945a9450c647745a5a73240cf090759a43eac4eb0dc5af10e07aea6f27f3f3961 WHIRLPOOL 493a64426d364303b083c6c59b6e104a93b848bc51589edaa41bca333faa2358847b2887f8eba338633c15ea2940c0d9ac66c0346598eb2f6ee783fb651430c7
+MISC metadata.xml 380 SHA256 88f3e88f9f259b1314d9bd75f7efef9af9cfd458a5227dc7e4be49d4a293641c SHA512 5b00ff66073618ce571f481075b190b442df9f76c295cb4dc7dcfd098b98d3252fcb03d89c6fe89e824d84dc0a59b75083d2f98e8b5d9b99c98601614ab71bae WHIRLPOOL 8a1af9fe641c106a2d0d650845bb2824d56480de11a792afb7c8c379a5c66c6a6802bd07da71257972dbd4b1bfb9477b1be64010229688cdbc051149a9caacea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRW0YXAAoJELp701BxlEWfjygP/0NT3zXxCSPD5Ki5wJMTkSS/
-T0adzjOmwXC18jCWoB+DBrrL9KF/PbNXhYLXqQ5NW4ngD0ZYGdjHzZ9d6U6mDONn
-HK8S+bLWCMVgpz3h4GSqEjVGBqxAE/dSmvEETMBgTbRl0C5EE498Am/hU+RK+7GT
-3OQ++uNpxZQs7mT7GXJPORMaueucoWkQjqAxYOTRdeR5YcMGDzL3SdmZvqkC88w6
-tbcqyzcGZt64m/p65U0hafUOuIz4/Gqz4m16OrmlGSWf//S6rKFPnIWH7Zp3eS1r
-VClBSrntrK+u29LxTjBoAI9zQ2483A8mmDHUjjseIyyr7TTOtx8aP27GEP0h8so2
-+48FMyjWVF0knCsmWf0XKjMuLwBchlPM1ewbFbrPJ7KuChz7l7wzZ5JZuCjrBUH2
-5RsyG09WGJ3AXRMKu67En105/O81qFbmPYzrKq0m6r8CanxmNBrs5KgbjzaMYcVt
-ELbbZ0BLzxE7RHMe8l0LoPi3XLmZAkbe/YWh10Z/6ImGuiLv5Ywy+tLAYOEtVCy8
-XLh866HmjyKSp7mch7TwBTKJHUU07UvyESc3iP6mnB2Qa6OONJ5RwGKGk1yFtNno
-3CClf7neSDOxE5hQfDAxit3pqUYH9SpARZOhkWgqMpZAB4VIFMi1ya2CfOcOLzE4
-G3e9CxNogePwZCuJXt9U
-=mQdW
+iQEcBAEBCAAGBQJSVXGXAAoJEFpvPKfnPDWzPKIH/0pLCu1PYLO1XQRkVuwebtmt
+gfHexCUp+k0isHD+sf1ge8+JKAucTQ9sDyxRVzvXBoSWUINebQ0tbW9/uI6kGclA
+T83U/UkN44bapmCGNUKpYNlA7KGjZTfp24H33PSMs5R8MIEDOvtAiU9WdYrWcJil
+hN+ZW2MVwb4WrhMrro1opUNJgEVayZjXdm/Jw8/2WEDKQF5+9de1AoEUhFgVppA9
+pPKUybciaAAHvNArNVrdIuIdtbL391w5ZRvWAaEbhZL0KezBtO7REoq3dngLfWDy
+V/UV+ufwmGS6ZKE5Ijq47lduPtJf63pr7pWnmN4PH6RbUoJ9JQpjyeet+Za6oQ0=
+=QAu7
 -----END PGP SIGNATURE-----
diff --git a/net-libs/ortp/metadata.xml b/net-libs/ortp/metadata.xml
index d54c696e5433..d98424b06d1c 100644
--- a/net-libs/ortp/metadata.xml
+++ b/net-libs/ortp/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>voip</herd>
 	<use>
+		<flag name='ntp-timestamp'>Turn on NTP timestamping on received packet</flag>
 		<flag name='srtp'>Add support for Secure RTP</flag>
 		<!-- <flag name='zrtp'>Add support for ZRTP key negotiation</flag> -->
 	</use>
diff --git a/net-libs/ortp/ortp-0.22.0.ebuild b/net-libs/ortp/ortp-0.22.0.ebuild
new file mode 100644
index 000000000000..2adcbaabe16c
--- /dev/null
+++ b/net-libs/ortp/ortp-0.22.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ortp-0.22.0.ebuild,v 1.1 2013/10/09 15:09:05 hasufell Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc examples ipv6 minimal ntp-timestamp ssl" # srtp zrtp"
+
+# Note:
+# This package supposedly requires libzrtpcpp-2.0.0
+# but it is incompatible with its API...
+#
+# This package supposedly requires libsrtp
+# but it is incompatible with its API...
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+#	srtp? ( net-libs/libsrtp )
+#	zrtp? ( >=net-libs/libzrtpcpp-2.0.0 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+#REQUIRED_USE="zrtp? ( srtp )"
+
+src_prepare() {
+	# ${P} is added after ${docdir}
+	if use doc; then
+		sed -i -e 's/$(docdir)\/$(PACKAGE)-$(VERSION)/$(docdir)/' Makefile.in \
+			|| die "patching Makefile.in failed"
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		# memcheck is for HP-UX only
+		--disable-memcheck
+		# mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX
+		--disable-mode64bit
+		# strict adds -Werror, don't want it
+		--disable-strict
+		# they seriously failed to understand AC_ARG_ENABLE...
+		--disable-tests_enabled
+		--enable-fast-install
+		--enable-libtool-lock
+
+		$(use_enable debug)
+		$(use_enable ipv6)
+		$(use_enable minimal perf)
+		$(use_enable ntp-timestamp)
+		$(use_enable ssl ssl-hmac)
+#		$(use_enable zrtp)
+		--disable-zrtp
+
+#		"--with-srtp=$(usex srtp "${EPREFIX}"/usr none)"
+		--with-srtp=none
+		$(use doc || echo ac_cv_path_DOXYGEN=false)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	prune_libtool_files
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/tests/*.c
+	fi
+}