dev-java/red5: Remove old, migrate 0.8 to EAPI 5

Package-Manager: portage-2.1.12.3

4 files changed, 16 insertions, 107 deletions

diff --git a/dev-java/red5/ChangeLog b/dev-java/red5/ChangeLog
index 32a3d135..833d4ffb 100644
--- a/dev-java/red5/ChangeLog
+++ b/dev-java/red5/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> -red5-0.7.0.ebuild,
+  red5-0.8.0.ebuild:
+  dev-java/red5: Remove old, migrate 0.8 to EAPI 5
+
   28 May 2013; Bertrand Jacquin <beber@meleeweb.net> +metadata.xml:
   Add missing metadata.xml
 
@@ -23,4 +27,3 @@
   +files/ivysettings.xml, +files/red5.confd, +files/red5.initd,
   +red5-0.8.0.ebuild:
   red5-0.8.0
-
diff --git a/dev-java/red5/Manifest b/dev-java/red5/Manifest
index a157a028..26727090 100644
--- a/dev-java/red5/Manifest
+++ b/dev-java/red5/Manifest
@@ -2,9 +2,7 @@ AUX 21red5 54 SHA256 79aa94c73a70a19d07eb5a63f91c66aeda344d1aadc6631e3761a5cf87f
 AUX ivysettings.xml 1589 SHA256 3fa2903b842a7574b2a4a0bc6eebe8d1d311703cc127d57c18595bc93f1a9aa3 WHIRLPOOL 83356f162cbe32a26ce38c8f890010ba3191e99b8aa58166e2666b1be0888232282cc5fd4b64f7e42c288aeab96ed20075d7669a95afaaaa8035c32858c87ce2
 AUX red5.confd 29 SHA256 98088a4d5497a35069600974fd8b358400afcab25f0ff93db3d01fb1e22c5373 WHIRLPOOL 6dbc95c958cd143f6de7b558f5a241656ab11be693c82ed204849dc42cfdce2ff4394c11dcafe0af091fb23edf2f349f41acb25abf2e8c2cac4a61c56c7003d3
 AUX red5.initd 454 SHA256 f40ea9226b6afdc7356be50d37a65a87fd5683d25a1841f4e076dadaa53b71f6 WHIRLPOOL cb7d6fa58dabab98f98607bc7c7d3bd6227df9bab0a85bde3225e543ca2717f2104532f54ec4457ccb2c56bb2c690c2a4c954f31e4d4fc5da7dcfa9df4e508ad
-DIST red5-0.7.0.tar.gz 59768131 SHA256 12c850592fc4bdedb602cb3fa3410e27418547835722513555155271e6a6d43a
-DIST red5-0.8.0.tar.gz 34974818 SHA256 9a49b1ab653611bf5948e4c6c25dc3a096bc87d9cb9f3567e6e65aca36243ef7
-EBUILD red5-0.7.0.ebuild 2322 SHA256 a81e76addc304b5eb1f175e65a5f6595bf6c56aed2108bbde9d14e27fa51cdff WHIRLPOOL 513b3afa31cd4fd4ac30a6c4956d54afba40b816ae5484c3bd6ebc5c028599a7e73f854a1479baeee69339612b21a86f87b21a75339778e1eaf54242f9143fe4
-EBUILD red5-0.8.0.ebuild 1011 SHA256 f317048bda9f580190ed88ffca9314a830879e84f25d4274fc013c7e0c24da6f WHIRLPOOL 3f9a9150dd8d770be83a152cb26afbd1b38e320d62415909d97ff95e503278d71578f9254f9af3e272bfe63ddb1dbad0a38fe161a5fd71edb157d64448668476
-MISC ChangeLog 717 SHA256 b754ae14b87e6fa41edfd3b3a32d90a496d491d2492562fb508fb3311d35f574 WHIRLPOOL ae5ae135e347213c1bce536785a74638e4dd731bba6f65d40f7b832b6e5e69ccfbe0ab6f8d07db23a1ce79a3feb6e9a4e27cd261b55337340400386bf7fc25d0
+DIST red5-0.8.0.tar.gz 34974818 SHA256 9a49b1ab653611bf5948e4c6c25dc3a096bc87d9cb9f3567e6e65aca36243ef7 WHIRLPOOL 3a2e50974ca53aaa62147adecf2b890410637baba99857974b52ad733168eb956a3c1e5f4875b06edebbaf56b2cc3892cb5c7e7521e38dfc2f0c6182075de8b3
+EBUILD red5-0.8.0.ebuild 1006 SHA256 187ecce6bce9b912b204c1dc3419e1d2301b9f5207d02e63f8b547798fd9e1c8 WHIRLPOOL 0ae44ae651eaa9fc645f0cdd27cf3d4c83260ac26fff39d40b5cc9cfc9bd3f3c8048921e21726e4741d706c5250dae329c0a00f167e84ae8a0335080768843e4
+MISC ChangeLog 862 SHA256 f2a19e2e184ef760f49f870171934c6b9c8b1cbf834cd13bd3fdc771800fdec4 WHIRLPOOL 6b8ee5bd3c66df52d719f8a732fa19148dd963f0401eac7558ae0f7185794648eac9bd1e14f6e755959930a051e787c3d9b456ea67a3fe62aad64253f3c5e62c
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/dev-java/red5/red5-0.7.0.ebuild b/dev-java/red5/red5-0.7.0.ebuild
deleted file mode 100644
index 05c1cdd1..00000000
--- a/dev-java/red5/red5-0.7.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit java-utils-2 java-pkg-2 java-ant-2
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Open Source Flash Server written in Java"
-HOMEPAGE="http://osflash.org/red5"
-SRC_URI="http://www.nielsenaa.com/red5-installers/red5-${PV}.tar.gz"
-		#http://red5.googlecode.com/svn/trunk/snapshots/070hotfix.zip
-		#http://red5.googlecode.com/svn/trunk/snapshots/070hotfix_java5.zip"
-		#http://red5.googlecode.com/svn/trunk/repository/jetty/jetty-6.1.8.jar
-		#http://red5.googlecode.com/svn/trunk/repository/jetty/jetty-util-6.1.8.jar
-		#http://red5.googlecode.com/svn/trunk/repository/jetty/jetty-xbean-6.1.8.jar"
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples source"
-DEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.5"
-RDEPEND=">=virtual/jdk-1.5"
-
-RED5_HOME=/opt/red5
-
-pkg_setup() {
-	enewgroup red5
-	enewuser red5 -1 -1 ${RED5_HOME} red5
-}
-
-src_compile() {
-	echo >> build.properties
-	echo "java.target_version=$(java-pkg_get-vm-version)" >> build.properties
-	mkdir "${WORKDIR}/ivycache"
-	echo "ivy.default.ivy.user.dir=${WORKDIR}/ivycache" >> build.properties
-	cp "${FILESDIR}/ivysettings.xml" ./
-	eant
-	rm red5.jar
-	if has_version ">=virtual/jdk-1.6"; then
-		unzip 070hotfix.zip
-	else
-		unzip 070hotfix_java5.zip
-	fi
-	mv jetty-6.1.8.jar jetty-util-6.1.8.jar jetty-xbean-6.1.8.jar lib/
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/red5.initd red5
-	newconfd "${FILESDIR}"/red5.confd red5
-	doenvd "${FILESDIR}"/21red5
-
-	if ! use source ; then
-		rm -rf test
-		rm -rf bin
-		rm -rf src
-		rm -rf swf
-		rm -f build.xml
-		rm -f build.properties
-		rm -f Makefile
-	fi
-	if use doc ; then
-		dodoc doc/*
-	fi
-	rm -rf doc
-
-	keepdir /var/lib/red5-webapps
-	fowners red5:red5 /var/lib/red5-webapps/
-
-	if use examples ; then
-		insopts -m0644
-		insinto /var/lib/red5-webapps
-		doins -r dist/webapps/*
-		fowners -R red5:red5 /var/lib/red5-webapps/
-	fi
-
-	dosym /var/lib/red5-webapps "${RED5_HOME}/webapps"
-
-	insinto /var/lib/red5-webapps
-	doins  webapps/red5-default.xml
-	fowners red5:red5 /var/lib/red5-webapps/red5-default.xml
-
-	rm -rf webapps
-
-	rm -rf dumps
-	rm -rf bin
-	rm -rf dist
-	rm -rf *.bat
-
-	cp -rp * "${D}/${RED5_HOME}"
-	fowners -R red5:red5 "${RED5_HOME}"
-	fperms 0750 "${RED5_HOME}/red5.sh"
-}
diff --git a/dev-java/red5/red5-0.8.0.ebuild b/dev-java/red5/red5-0.8.0.ebuild
index ad80d0c7..23791fe4 100644
--- a/dev-java/red5/red5-0.8.0.ebuild
+++ b/dev-java/red5/red5-0.8.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=5
 inherit eutils java-utils-2 java-pkg-2 java-ant-2
 
 MY_P="${P/_/}"
@@ -9,7 +10,7 @@ S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Open Source Flash Server written in Java"
 HOMEPAGE="http://osflash.org/red5"
-SRC_URI="http://www.red5.org/downloads/0_8/red5-${PV}.tar.gz"
+SRC_URI="http://www.red5.org/downloads/red5/0_8/red5-${PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
@@ -26,9 +27,9 @@ pkg_setup() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/red5.initd red5
-	newconfd "${FILESDIR}"/red5.confd red5
-	doenvd "${FILESDIR}"/21red5
+	newinitd "${FILESDIR}/red5.initd" red5
+	newconfd "${FILESDIR}/red5.confd" red5
+	doenvd "${FILESDIR}/21red5"
 
 	if use doc ; then
 		dodoc doc/*
@@ -40,8 +41,9 @@ src_install() {
 		rm src.zip
 	fi
 
-	dodir "${RED5_HOME}"
-	cp -rp * "${D}${RED5_HOME}"
+	insinto "${RED5_HOME}"
+	doins .
+
 	fowners -R red5:red5 "${RED5_HOME}"
 	fperms 0750 "${RED5_HOME}/red5.sh"
 	dosym "${RED5_HOME}/webapps" /var/lib/red5-webapps