cleanup, SRC_URI changed, see ChangeLog and ebuild for details

4 files changed, 37 insertions, 29 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index a1277d6c3b82..ced949259520 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for net-libs/openh323
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.54 2004/12/29 03:22:36 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.55 2004/12/29 03:46:38 stkn Exp $
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
 
+  29 Dec 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.15.2.ebuild:
+  cleanup, SRC_URI changed, some parts taken from #69233 submitted by
+  Stefan Schweizer <genstef@gentoo.org>
+
 *openh323-1.15.2 (28 Dec 2004)
 
   28 Dec 2004; Stefan Knoblich <stkn@gentoo.org>
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 1fd175e9eb12..0e85502fcc0c 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,31 +1,31 @@
-MD5 ac4ea2adff91762288ef0246d7446f48 openh323-1.12.2-r1.ebuild 3106
-MD5 a2d7e2c4e27da19ecf4dd9ef303a184f openh323-1.15.2.ebuild 3393
-MD5 55c46d89fbc85b9e9f4f696b8d5db2aa ChangeLog 9105
-MD5 cba34a1ddf5939fc027e879871a633c7 openh323-1.12.0-r1.ebuild 2821
-MD5 2b323f821a82d94ecaaad482405ac025 openh323-1.13.2.ebuild 3705
-MD5 bc1d3d9e9dfe4dea1ee2195db7e2cd04 openh323-1.11.7.ebuild 1826
 MD5 03ffce610d4d5c1bad37d71290ce3a7b openh323-1.12.2-r2.ebuild 3723
-MD5 af3a69233933d2f0e342bbee7f6b5a59 openh323-1.13.2-r1.ebuild 4098
 MD5 a849ad67e89640b6553a759c07a60c69 openh323-1.13.5.ebuild 4062
-MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
+MD5 98267a6d9140b3d60cbb992c67a3560e openh323-1.15.2.ebuild 3595
 MD5 12403060d8b2aab0cf2256cb868512fc openh323-1.9.10-r1.ebuild 1103
-MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
-MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
-MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r1 68
+MD5 cba34a1ddf5939fc027e879871a633c7 openh323-1.12.0-r1.ebuild 2821
+MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
+MD5 bc1d3d9e9dfe4dea1ee2195db7e2cd04 openh323-1.11.7.ebuild 1826
+MD5 3bf614f03ac28b3bec486ee7f23b6c6d ChangeLog 9286
+MD5 2b323f821a82d94ecaaad482405ac025 openh323-1.13.2.ebuild 3705
+MD5 af3a69233933d2f0e342bbee7f6b5a59 openh323-1.13.2-r1.ebuild 4098
+MD5 ac4ea2adff91762288ef0246d7446f48 openh323-1.12.2-r1.ebuild 3106
 MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
-MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2 68
-MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
-MD5 9519f9e7c6a88c9159cba2345725ed9d files/digest-openh323-1.13.5 73
-MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
-MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.5-include-order.diff 1027
-MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2-r1 68
 MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
-MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
+MD5 ba6d90bbb25d240c705e30bd55bc8daf files/digest-openh323-1.15.2 73
 MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
-MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
-MD5 73a8df25ace2235307956d67acecb32d files/openh323-1.15.2-notrace.diff 801
+MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
+MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.5-include-order.diff 1027
 MD5 2c75f68b5db8444726ae9342b8a02319 files/openh323-1.13.2-ixjuser.diff 285
+MD5 9519f9e7c6a88c9159cba2345725ed9d files/digest-openh323-1.13.5 73
+MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2 68
+MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r1 68
+MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2-r1 68
 MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
+MD5 73a8df25ace2235307956d67acecb32d files/openh323-1.15.2-notrace.diff 801
+MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
+MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
 MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
-MD5 c86108b98d6cb08de9e4cfcaca436e24 files/digest-openh323-1.15.2 73
+MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
+MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
 MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r2 68
diff --git a/net-libs/openh323/files/digest-openh323-1.15.2 b/net-libs/openh323/files/digest-openh323-1.15.2
index 3483c1c512fd..3b4c43407ba9 100644
--- a/net-libs/openh323/files/digest-openh323-1.15.2
+++ b/net-libs/openh323/files/digest-openh323-1.15.2
@@ -1 +1 @@
-MD5 53086e76eb4e2ff2a3b77f1d4e9acaa8 openh323-v1_15_2-src.tar.gz 3735815
+MD5 53086e76eb4e2ff2a3b77f1d4e9acaa8 openh323-v1_15_2-src-tar.gz 3735815
diff --git a/net-libs/openh323/openh323-1.15.2.ebuild b/net-libs/openh323/openh323-1.15.2.ebuild
index c6381dc8f7b2..4bbc7ef457ef 100644
--- a/net-libs/openh323/openh323-1.15.2.ebuild
+++ b/net-libs/openh323/openh323-1.15.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.2.ebuild,v 1.1 2004/12/28 03:40:17 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.2.ebuild,v 1.2 2004/12/29 03:46:38 stkn Exp $
 
 IUSE="ssl novideo noaudio debug"
 
@@ -11,22 +11,23 @@ MY_P="${PN}-v${PV//./_}"
 S=${WORKDIR}/${PN}
 DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
 HOMEPAGE="http://www.openh323.org/"
-SRC_URI="http://dev.gentoo.org/~stkn/openh323/${MY_P}-src.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src-tar.gz"
 
+RESTRICT="nomirror"
 SLOT="0"
 LICENSE="MPL-1.1"
 KEYWORDS="-*"
 
 DEPEND=">=sys-apps/sed-4
-	>=dev-libs/pwlib-1.8.0
+	>=dev-libs/pwlib-1.8.3
 	>=media-video/ffmpeg-0.4.7
 	ssl? ( dev-libs/openssl )"
 
 src_unpack() {
-	unpack ${A}
+	# currently complaining to UPSTREAM about new naming scheme
+	tar -C ${WORKDIR} -xzf ${DISTDIR}/${MY_P}-src-tar.gz || die "Unpacking of ${PF} failed"
 
 	cd ${S}
-
 	# Makefile is currently broken with NOTRACE=1, fix that
 	epatch ${FILESDIR}/${PN}-1.15.2-notrace.diff
 }
@@ -92,7 +93,10 @@ src_install() {
 	###
 	# Install stuff
 	#
-	make PREFIX=${D}/usr ${makeopts} install || die "install failed"
+	make PREFIX=${D}/usr \
+		OH323_FILE="libh323_${OPENH323_ARCH}.so.${PV}" \
+		${makeopts} install || die "install failed"
+
 	dobin ${S}/samples/simple/obj_${OPENH323_ARCH}/simph323
 
 	###