ebuild bump and cleanup

(Portage version: 2.0.51.19)

6 files changed, 43 insertions, 21 deletions

diff --git a/www-apps/ampache/ChangeLog b/www-apps/ampache/ChangeLog
index 6afa00271a57..7dc94891d2c9 100644
--- a/www-apps/ampache/ChangeLog
+++ b/www-apps/ampache/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/ampache
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.1 2005/06/27 00:47:04 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ChangeLog,v 1.2 2005/06/27 03:56:11 marineam Exp $
+
+*ampache-3.3.1.1 (27 Jun 2005)
+
+  27 Jun 2005; Michael Marineau <marineam@gentoo.org>
+  +files/ampache-3.3.1.1-webinstall.txt, -ampache-3.3.1.ebuild,
+  +ampache-3.3.1.1.ebuild:
+  A little ebuild bump. Also cleaned up a couple things, closing bug #93544
+  again. Hopefully all is happy now.
 
 *ampache-3.3.1 (27 Jun 2005)
 
diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
index 74c72a11a056..e58a1285f7e5 100644
--- a/www-apps/ampache/Manifest
+++ b/www-apps/ampache/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4e94cd15acb3e14820ddc528d5bf1999 ampache-3.3.1.ebuild 783
-MD5 2aae4bad15cbcb569927f52df8bb37b4 ChangeLog 429
+MD5 3e1fb65cb5f24910a15351e953bf2800 ampache-3.3.1.1.ebuild 781
+MD5 68ff77ec4b1895cd99e45a30db3f0c31 ChangeLog 720
 MD5 46ab575d4d218ddb1fe7500850065f03 metadata.xml 257
-MD5 54dbaabc383b0fa56e0cc41c9d61e5e6 files/digest-ampache-3.3.1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCv0yVnVkA0cTr1F4RAhb+AJ9+hE8YpRAEixFNJkNq6Eoj/U2vcQCdH4qG
-0fVuqddzshi/Zj5Y937moSk=
-=f/kN
------END PGP SIGNATURE-----
+MD5 bac72cded6bd647450f351cf0920486c files/digest-ampache-3.3.1.1 68
+MD5 bca60999fc1787d45fa77e621731126c files/ampache-3.3.1.1-webinstall.txt 1376
diff --git a/www-apps/ampache/ampache-3.3.1.ebuild b/www-apps/ampache/ampache-3.3.1.1.ebuild
index eff08ad30b13..b7ff19e792a2 100644
--- a/www-apps/ampache/ampache-3.3.1.ebuild
+++ b/www-apps/ampache/ampache-3.3.1.1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.3.1.ebuild,v 1.1 2005/06/27 00:47:04 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ampache/ampache-3.3.1.1.ebuild,v 1.1 2005/06/27 03:56:11 marineam Exp $
 
 inherit webapp
 
 DESCRIPTION="Ampache is a PHP-based tool for managing, updating and playing your audio files via a web interface."
 HOMEPAGE="http://www.ampache.org/"
 SRC_URI="http://www.ampache.org/downloads/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86"
@@ -25,11 +24,12 @@ src_compile() {
 src_install() {
 	webapp_src_preinst
 
-	docinto docs
-	dodoc docs/*
+	dodoc ${S}/docs/*
+	rm -rf ${S}/docs/*
+
 	cp -R . ${D}${MY_HTDOCSDIR}
-	webapp_postinst_txt en docs/README
-	rm -rf docs/*
+
+	webapp_postinst_txt en ${FILESDIR}/${P}-webinstall.txt
 	webapp_src_install
 }
 
diff --git a/www-apps/ampache/files/ampache-3.3.1.1-webinstall.txt b/www-apps/ampache/files/ampache-3.3.1.1-webinstall.txt
new file mode 100644
index 000000000000..b7c023447d2d
--- /dev/null
+++ b/www-apps/ampache/files/ampache-3.3.1.1-webinstall.txt
@@ -0,0 +1,23 @@
+Installing Using the Web Interface:
+
+As of 3.3-Beta3 Ampache includes an web based installation script. In order
+for the script to work correctly you will need a user that has Database
+create and modify rights for your mysql server. To use this script simply
+visit /install.php. If you get a Access Denied make sure that your /config
+directory does not contain an existing ampache.cfg
+
+         Step 1 - Inserting the database, this requires you to enter
+                 a username/pass for MySQL that is able to create
+                 a brand new database and insert new tables. This does
+                 not have to be the user you actually run ampache as
+         Step 2 - Creating the Config file, this step asks for a 'user'
+                 level account for MySQL that has full access over
+                 the newly created ampache database, this can be the
+                 same as the last step, but it is not recommended.
+                 Ampache will attempt to write the config file directly
+                 to the /config directory, if it isn't able to it
+                 should prompt you to download the ampache.cfg simply
+                 put it into /config and then visit the login page.
+         Step 3 - Creating the Initial User Account, you will be asked
+                 for a username and password for the administrator
+                 account.
diff --git a/www-apps/ampache/files/digest-ampache-3.3.1 b/www-apps/ampache/files/digest-ampache-3.3.1
deleted file mode 100644
index 3230bf6c7369..000000000000
--- a/www-apps/ampache/files/digest-ampache-3.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 190312ace466ff52782669531534a533 ampache-3.3.1.tar.gz 1515977
diff --git a/www-apps/ampache/files/digest-ampache-3.3.1.1 b/www-apps/ampache/files/digest-ampache-3.3.1.1
new file mode 100644
index 000000000000..d23d830e4f87
--- /dev/null
+++ b/www-apps/ampache/files/digest-ampache-3.3.1.1
@@ -0,0 +1 @@
+MD5 1ab934581874d788514575797f18db7a ampache-3.3.1.1.tar.gz 1516094