Merge branch 'develop-7.4' into develop-7.5

Brought in Joe's changes to the committed 7.4.2 ebuild.
hickinbottoms · Apr 9, 2010 · f6c6191 · f6c6191
2 parents cddc8e1 + f8850ea
commit f6c6191
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/Changelog b/Changelog
diff --git a/Changelog b/Changelog
@@ -0,0 +1 @@
+files/Gentoo-detailed-changelog.txt
diff --git a/files/Gentoo-detailed-changelog.txt b/files/Gentoo-detailed-changelog.txt
@@ -0,0 +1,3 @@
+---- squeezeboxserver-7.5.0
+
+Updated for Squeezebox Server 7.5.0
diff --git a/squeezeboxserver-7.5.0.ebuild b/squeezeboxserver-7.5.0.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header$
 
+EAPI="2"
+
 inherit eutils
 
 MAJOR_VER="${PV:0:3}"
@@ -17,7 +19,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="lame wavpack alac ogg flac aac"
-EAPI="2"
 
 # Note: EV present because of bug#287857.
 SRC_URI="http://www.slimdevices.com/downloads/${SRC_DIR}/${MY_P}.tgz
@@ -211,7 +212,8 @@ src_install() {
 	dodoc Changelog*.html
 	dodoc Installation.txt
 	dodoc License*.txt
-	newdoc "${FILESDIR}/Gentoo-plugins-README.txt" Gentoo-plugins-README.txt
+	dodoc "${FILESDIR}/Gentoo-plugins-README.txt"
+	dodoc "${FILESDIR}/Gentoo-detailed-changelog.txt"
 
 	# Configuration files and preferences
 	insinto "${ETCDIR}"

diff --git a/stage/files/Gentoo-detailed-changelog.txt b/stage/files/Gentoo-detailed-changelog.txt
@@ -0,0 +1,3 @@
+---- squeezeboxserver-7.5.0
+
+Updated for Squeezebox Server 7.5.0
diff --git a/stage/squeezeboxserver-7.5.0.ebuild b/stage/squeezeboxserver-7.5.0.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header$
 
+EAPI="2"
+
 inherit eutils
 
 MAJOR_VER="${PV:0:3}"
@@ -17,7 +19,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="lame wavpack alac ogg flac aac"
-EAPI="2"
 
 # Note: EV present because of bug#287857.
 SRC_URI="http://www.slimdevices.com/downloads/${SRC_DIR}/${MY_P}.tgz
@@ -211,7 +212,8 @@ src_install() {
 	dodoc Changelog*.html
 	dodoc Installation.txt
 	dodoc License*.txt
-	newdoc "${FILESDIR}/Gentoo-plugins-README.txt" Gentoo-plugins-README.txt
+	dodoc "${FILESDIR}/Gentoo-plugins-README.txt"
+	dodoc "${FILESDIR}/Gentoo-detailed-changelog.txt"
 
 	# Configuration files and preferences
 	insinto "${ETCDIR}"