Remove bundled xmlrpc-epi lib (bug #276777) and use new package in tree

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 13 insertions, 185 deletions

diff --git a/games-simulation/secondlife/ChangeLog b/games-simulation/secondlife/ChangeLog
index a9073722719e..0fb18a441938 100644
--- a/games-simulation/secondlife/ChangeLog
+++ b/games-simulation/secondlife/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-simulation/secondlife
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/ChangeLog,v 1.3 2009/06/14 19:13:25 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/ChangeLog,v 1.4 2009/07/07 14:41:27 lavajoe Exp $
+
+*secondlife-1.23_rc4-r1 (07 Jul 2009)
+
+  07 Jul 2009; Joe Peterson <lavajoe@gentoo.org>
+  -secondlife-1.23_rc2.ebuild, -secondlife-1.23_rc4.ebuild,
+  +secondlife-1.23_rc4-r1.ebuild:
+  Remove bundled xmlrpc-epi lib (bug #276777) and use new package in tree
 
 *secondlife-1.23_rc4 (14 Jun 2009)
 *secondlife-1.23_rc2 (14 Jun 2009)
diff --git a/games-simulation/secondlife/Manifest b/games-simulation/secondlife/Manifest
index 9c6b89109d58..262db42bc00a 100644
--- a/games-simulation/secondlife/Manifest
+++ b/games-simulation/secondlife/Manifest
@@ -7,15 +7,8 @@ AUX secondlife-1.23_rc4-fix-printf-format-error.patch 546 RMD160 a89790fcb463a3b
 AUX secondlife-1.23_rc4-fix-uninitialized-gdkcolor.patch 416 RMD160 f24518fcb869b082618f73d344745da620e19eb2 SHA1 5eb11f83f5593515c738fceb1799983a61bb61bd SHA256 1e0183f61dbfaa97067bf10657b6e587119dde597c898cb2ec5a7e89c8d49b96
 AUX secondlife-disable-ndof.patch 302 RMD160 e4f7947c8362d914808d4eb7fef90c7044883280 SHA1 8b76332cf5093b9c77d443986cde01aae3db6bc6 SHA256 e532e9618afc28e543f79c0ec4195b16f2c945d7184abb7d121a42275c6e58b7
 AUX secondlife-fix-cmake-include-path.patch 444 RMD160 0cb80fe8aecb0d88027c844577158054884018f1 SHA1 472a39c127324d7801284d9c362b6fc916ca4fe9 SHA256 9934aea45e6a8303ea9a059855e4cbfdcb60570adea43967d483003310ae2b05
-DIST glh_linear-linux-20080613.tar.bz2 8822 RMD160 28461838d90c03b666fd9f3b44e795ae3272b661 SHA1 37b1dc99797a643dc1cf5892fad7f48980a94f40 SHA256 1582ca663eb5eb5cb6bb24c09f8de4e91c17cab3e488bdb35c1d6113a520a143
-DIST slviewer-artwork-viewer-1.23.2-r120719.zip 10127954 RMD160 8555d1494236790c68c0397e95e6e12e8b4d75d7 SHA1 8a7d3549bede62823bc6cbebc3cfb3bdcf4565d3 SHA256 4995d37c86fca63b2bce5711b55fcc83dda68c050edd81f6b0343b0b0cee42b6
 DIST slviewer-artwork-viewer-rc-frozen-1.23.4.123523.zip 10127954 RMD160 019707a81587a1bb4d26949d03c033b3e5fa6943 SHA1 9d32a63a9c582f243bf6555ae6894cbc95e11464 SHA256 f2b7644fdef739846a61509f8de1ee3cfc18898b97bdda0ddcd986ded2f95baf
-DIST slviewer-linux-libs-viewer-1.23.2-r120719.tar.gz 548524 RMD160 a77f849c643c56276ee024e7f9754593e62f6699 SHA1 a44b94249465e106c7d8326d32a00402881e7740 SHA256 b0035eeb201577fe6ba65b16be2ca22473548cd002c0325e59112aa483163bf6
-DIST slviewer-linux-libs-viewer-rc-frozen-1.23.4.123523.tar.gz 1408656 RMD160 b6f9eacdae8e3e4b0999f4779d305167d49b024c SHA1 f0ad9cda7162c4b05d65dcbebbe7a15996b783d7 SHA256 958a81b069405f9da9a18dcc0f1b3d77260d97170d7a913d73d6d01d0de9f8a8
-DIST slviewer-src-viewer-1.23.2-r120719.tar.gz 8059168 RMD160 d161beb02a64910600d9f7d00acd327cc4223704 SHA1 51a6caa21a17311ea80b9c1a9ab65cdae931fb5d SHA256 2285a5c5fb56227805aa2276b88e30a53e445257a86c62f7713442efc8dcd1e9
 DIST slviewer-src-viewer-rc-frozen-1.23.4.123523.tar.gz 8461103 RMD160 a58b7b38f77ae5d395ef9cdfa909c3f8497a15c6 SHA1 61d04d4307b76396a7f788560950a9f63413d8bc SHA256 607b8859c764f358cb0adab8b2b8c6e1de7e1eb9879d6fb315de9fd81a4f6f16
-DIST xmlrpc-epi-0.54.tar.gz 491572 RMD160 4f51c47f1e84a21b0041e770d9362c8be371c242 SHA1 e547f2399c008a818b43161c1df593a0490c7567 SHA256 bd685ec51a477a28735188c10313d9f9ca35a7725a740ad49ccdcf62d9ca0e3f
-EBUILD secondlife-1.23_rc2.ebuild 5152 RMD160 8880d17952373ce48d467834248741e4f63bd912 SHA1 c37804536a05f5684cc8a5d2eb3b8516e09cbc06 SHA256 32209b10ff4ce3cedbda22b9aba1f05565b08b73a314e7f4fdecd1058e2c72fa
-EBUILD secondlife-1.23_rc4.ebuild 4915 RMD160 a1fdddaa5de8a1e6ba8bc4fd3d09a201ff300c48 SHA1 98bf25e7c5e9eec76828c4f7b113eb68703a86ed SHA256 14e319ebefd664b63bf11bafaf180dbb505902c0ac32eedbe552689805391670
-MISC ChangeLog 1631 RMD160 22375703b00d07926e0680e53ec07bc4109c700d SHA1 7eb016f5d9f9c5bb424e66311f249befd2169374 SHA256 9fb7f5bfade6c675e07e57b73912d09c542268aac899bd560e8f819b1e875cb4
+EBUILD secondlife-1.23_rc4-r1.ebuild 3433 RMD160 f1a7accc1184f678aa5c70df5a68fbd7917c9eb4 SHA1 7da80b5492b5c257e91e34fc58834d8e48a00e80 SHA256 55639d37e67c70d12fc28432909caf3c282e335203cb1c99fcbe143beb80e572
+MISC ChangeLog 1888 RMD160 4c7438d82087a13f44b96a7a3272c48ab72c9755 SHA1 442a356e7ddf320cfae91d128de6ee41f2e71ea6 SHA256 a0c9b325efa05f89bfe895b19e4f63daf90b27f71eb730bec6dd98627e625923
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/games-simulation/secondlife/secondlife-1.23_rc2.ebuild b/games-simulation/secondlife/secondlife-1.23_rc2.ebuild
deleted file mode 100644
index b0d3a5dc7e14..000000000000
--- a/games-simulation/secondlife/secondlife-1.23_rc2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/secondlife-1.23_rc2.ebuild,v 1.1 2009/06/14 19:13:25 lavajoe Exp $
-
-inherit eutils multilib games versionator
-
-SECONDLIFE_REVISION=120719
-SECONDLIFE_RELEASE_DIR=2009/05
-SECONDLIFE_MAJOR_VER=$(get_version_component_range 1-2)
-SECONDLIFE_MINOR_VER=$(get_version_component_range 3)
-SECONDLIFE_MINOR_VER=${SECONDLIFE_MINOR_VER/rc/}
-MY_P="slviewer-src-viewer-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}-r${SECONDLIFE_REVISION}"
-
-DESCRIPTION="The Second Life (an online, 3D virtual world) viewer"
-HOMEPAGE="http://secondlife.com/"
-SRC_URI="http://secondlife.com/developers/opensource/downloads/${SECONDLIFE_RELEASE_DIR}/${MY_P}.tar.gz http://secondlife.com/developers/opensource/downloads/${SECONDLIFE_RELEASE_DIR}/slviewer-artwork-viewer-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}-r${SECONDLIFE_REVISION}.zip http://secondlife.com/developers/opensource/downloads/${SECONDLIFE_RELEASE_DIR}/slviewer-linux-libs-viewer-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}-r${SECONDLIFE_REVISION}.tar.gz mirror://sourceforge/xmlrpc-epi/xmlrpc-epi-0.54.tar.gz http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080613.tar.bz2"
-
-LICENSE="GPL-2-with-Linden-Lab-FLOSS-exception Epinions"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-libs/glibc
-	sys-apps/dbus
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	>=x11-libs/gtk+-2.0
-	x11-libs/libXinerama
-	dev-libs/libgcrypt
-	dev-libs/libgpg-error
-	dev-libs/openssl
-	dev-libs/apr
-	dev-libs/apr-util
-	dev-libs/boost
-	dev-libs/elfio
-	dev-libs/expat
-	dev-util/cmake
-	media-libs/freetype
-	media-libs/libogg
-	media-libs/libsdl
-	media-libs/libvorbis
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta
-	media-libs/fmod
-	media-libs/jpeg
-	media-libs/openjpeg
-	net-libs/gnutls
-	net-misc/curl
-	net-dns/c-ares
-	sys-libs/zlib
-	virtual/libstdc++
-	virtual/glu
-	virtual/opengl
-	media-libs/openal
-	media-libs/freealut"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/linden"
-
-use amd64 && ARCH_LIBS_DIR="x86_64-linux"
-use x86 && ARCH_LIBS_DIR="i686-linux"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix cmake include path (so it can find xmlrpc includes)
-	epatch "${FILESDIR}/${PN}-fix-cmake-include-path.patch"
-
-	# Disable NDOF (joystick) that will not compile
-	epatch "${FILESDIR}/${PN}-disable-ndof.patch"
-
-	# Fix uninitialized GdkColor
-	epatch "${FILESDIR}/${P}-fix-uninitialized-gdkcolor.patch"
-
-	# Fix memset used with constant zero length parameter error
-	epatch "${FILESDIR}/${P}-fix-memset-error.patch"
-
-	# Fix printf format type error
-	epatch "${FILESDIR}/${P}-fix-printf-format-error.patch"
-
-	# Move extra glh include file into place.
-	# NOTE: This is hackish, since it had to be downloaded from the SL site
-	#       separately as part of the batch used when *not* building the
-	#       viewer standalone (this ebuild *does* build it standalone).
-	mv ../indra/llwindow/glh indra/llwindow || die
-	rm -r ../indra || die
-
-	# Add local paths to the xmlrpc-epi cmake files.
-	# NOTE: This lib is downloaded separately, since it is
-	#       not available in Gentoo.
-	sed -i -e"s:/usr/local/include:${S}/libraries/${ARCH_LIBS_DIR}/include /usr/local/include:" indra/cmake/FindXmlRpcEpi.cmake || die
-	sed -i -e"s:/usr/lib:${S}/libraries/${ARCH_LIBS_DIR}/lib_release_client /usr/lib:" indra/cmake/FindXmlRpcEpi.cmake || die
-
-	# Make 3rd party package area for xmlrpc-epi
-	mkdir -p libraries/${ARCH_LIBS_DIR}/include || die
-	mkdir libraries/${ARCH_LIBS_DIR}/lib_release_client || die
-}
-
-src_compile() {
-	# First, build xmlrpc-epi
-	cd "${WORKDIR}/xmlrpc-epi-"*
-
-	econf
-	emake || die
-
-	# Copy relevant files from xmlrpc-epi to 3rd party package area
-	rm src/.libs/libxmlrpc-epi.la || die
-	cp src/libxmlrpc-epi.la src/.libs || die
-	mkdir "${S}"/libraries/${ARCH_LIBS_DIR}/include/xmlrpc-epi || die
-	cp -dR src/*.h "${S}"/libraries/${ARCH_LIBS_DIR}/include/xmlrpc-epi || die
-	cp -dR src/.libs/libxmlrpc* "${S}"/libraries/${ARCH_LIBS_DIR}/lib_release_client || die
-
-	# Now build the Second Life viewer
-	cd "${S}/indra"
-
-	./develop.py --standalone configure || die
-	./develop.py --standalone build || die
-}
-
-src_install() {
-	cd "${S}"/indra/viewer-*/newview/packaged || die
-
-	dodoc README-*.txt licenses.txt || die
-	rm README-*.txt licenses.txt || die
-
-	insinto /usr/share/secondlife
-	doins secondlife_icon.png || die
-	rm secondlife_icon.png || die
-
-	dodir /usr/lib/${PN} || die
-	cp -dR "${S}"/libraries/${ARCH_LIBS_DIR}/lib_release_client/libxml* "${D}"/usr/lib/${PN} || die
-	#cp -dR bin secondlife *.sh "${D}"/usr/lib/${PN} || die
-	#rm -r bin secondlife *.sh || die
-	cp -dR * "${D}"/usr/lib/${PN} || die
-	chmod o-x "${D}"/usr/lib/${PN}/bin/* "${D}"/usr/lib/${PN}/secondlife "${D}"/usr/lib/${PN}/*.sh || die
-	chgrp games "${D}"/usr/lib/${PN}/bin/* "${D}"/usr/lib/${PN}/secondlife "${D}"/usr/lib/${PN}/*.sh || die
-
-	games_make_wrapper secondlife "./secondlife --set VersionChannelName Gentoo" /usr/lib/${PN} /usr/lib/${PN}
-	make_desktop_entry secondlife "Second Life" /usr/share/${PN}/secondlife_icon.png
-
-	prepgamesdirs
-}
diff --git a/games-simulation/secondlife/secondlife-1.23_rc4.ebuild b/games-simulation/secondlife/secondlife-1.23_rc4-r1.ebuild
index c04d38c6c995..6712a90a0d07 100644
--- a/games-simulation/secondlife/secondlife-1.23_rc4.ebuild
+++ b/games-simulation/secondlife/secondlife-1.23_rc4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/secondlife-1.23_rc4.ebuild,v 1.1 2009/06/14 19:13:25 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/secondlife/secondlife-1.23_rc4-r1.ebuild,v 1.1 2009/07/07 14:41:27 lavajoe Exp $
 
 inherit eutils multilib games versionator
 
@@ -12,7 +12,7 @@ MY_P="slviewer-src-viewer-rc-frozen-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_V
 
 DESCRIPTION="The Second Life (an online, 3D virtual world) viewer"
 HOMEPAGE="http://secondlife.com/"
-SRC_URI="http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/${MY_P}.tar.gz http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-artwork-viewer-rc-frozen-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}.${SECONDLIFE_REVISION}.zip http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-linux-libs-viewer-rc-frozen-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}.${SECONDLIFE_REVISION}.tar.gz mirror://sourceforge/xmlrpc-epi/xmlrpc-epi-0.54.tar.gz"
+SRC_URI="http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/${MY_P}.tar.gz http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-artwork-viewer-rc-frozen-${SECONDLIFE_MAJOR_VER}.${SECONDLIFE_MINOR_VER}.${SECONDLIFE_REVISION}.zip"
 
 LICENSE="GPL-2-with-Linden-Lab-FLOSS-exception Epinions"
 SLOT="0"
@@ -35,6 +35,7 @@ DEPEND="sys-libs/glibc
 	dev-libs/boost
 	dev-libs/elfio
 	dev-libs/expat
+	dev-libs/xmlrpc-epi
 	dev-util/cmake
 	media-libs/freetype
 	media-libs/libogg
@@ -69,9 +70,6 @@ src_unpack() {
 	# and comment out the amd64 streaming disable to fix streaming audio.
 	use amd64 && epatch "${FILESDIR}/${P}-amd64-audio-streaming-fix.patch"
 
-	# Fix cmake include path (so it can find xmlrpc includes)
-	epatch "${FILESDIR}/${PN}-fix-cmake-include-path.patch"
-
 	# Disable NDOF (joystick) that will not compile
 	epatch "${FILESDIR}/${PN}-disable-ndof.patch"
 
@@ -83,33 +81,9 @@ src_unpack() {
 
 	# Fix printf format type error
 	epatch "${FILESDIR}/${P}-fix-printf-format-error.patch"
-
-	# Add local paths to the xmlrpc-epi cmake files.
-	# NOTE: This lib is downloaded separately, since it is
-	#       not available in Gentoo.
-	sed -i -e"s:/usr/local/include:${S}/libraries/${ARCH_LIBS_DIR}/include /usr/local/include:" indra/cmake/FindXmlRpcEpi.cmake || die
-	sed -i -e"s:/usr/lib:${S}/libraries/${ARCH_LIBS_DIR}/lib_release_client /usr/lib:" indra/cmake/FindXmlRpcEpi.cmake || die
-
-	# Make 3rd party package area for xmlrpc-epi
-	mkdir -p libraries/${ARCH_LIBS_DIR}/include || die
-	mkdir libraries/${ARCH_LIBS_DIR}/lib_release_client || die
 }
 
 src_compile() {
-	# First, build xmlrpc-epi
-	cd "${WORKDIR}/xmlrpc-epi-"*
-
-	econf
-	emake || die
-
-	# Copy relevant files from xmlrpc-epi to 3rd party package area
-	rm src/.libs/libxmlrpc-epi.la || die
-	cp src/libxmlrpc-epi.la src/.libs || die
-	mkdir "${S}"/libraries/${ARCH_LIBS_DIR}/include/xmlrpc-epi || die
-	cp -dR src/*.h "${S}"/libraries/${ARCH_LIBS_DIR}/include/xmlrpc-epi || die
-	cp -dR src/.libs/libxmlrpc* "${S}"/libraries/${ARCH_LIBS_DIR}/lib_release_client || die
-
-	# Now build the Second Life viewer
 	cd "${S}/indra"
 
 	./develop.py --standalone configure || die
@@ -127,7 +101,6 @@ src_install() {
 	rm secondlife_icon.png || die
 
 	dodir /usr/lib/${PN} || die
-	cp -dR "${S}"/libraries/${ARCH_LIBS_DIR}/lib_release_client/libxml* "${D}"/usr/lib/${PN} || die
 	#cp -dR bin secondlife *.sh "${D}"/usr/lib/${PN} || die
 	#rm -r bin secondlife *.sh || die
 	cp -dR * "${D}"/usr/lib/${PN} || die