New version (0.5)

4 files changed, 30 insertions, 10 deletions

diff --git a/net-www/phoenix-bin/ChangeLog b/net-www/phoenix-bin/ChangeLog
index 2b9c51f22dd7..189202b5e068 100644
--- a/net-www/phoenix-bin/ChangeLog
+++ b/net-www/phoenix-bin/ChangeLog
@@ -1,12 +1,22 @@
 # ChangeLog for net-www/phoenix-bin
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/ChangeLog,v 1.13 2002/12/09 04:33:20 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/ChangeLog,v 1.14 2002/12/10 17:23:02 phoenix Exp $
 
-\* Autoupdate keywords (12-6-02)
+*phoenix-bin-0.4-r2 (10 Dec 2002)
+
+  10 Dec 2002; phoen][x <phoenix@gentoo.org> phoenix-bin-0.5.ebuild 
+  files/digest-phoenix-bin-0.5 :
+  Version bump. Tagging that unstable.
+
+* Autoupdate keywords (12-6-02)
   06 Dec 2002; Rodney Rees <manson@gentoo.org> changed sparc ~sparc keywords
  
 *phoenix-bin-20021121 (21 Nov 2002)
 
+  21 Nov 2002; phoen][x <phoenix@gentoo.org> phoenix-bin-0.5.ebuild,
+  files/digest-phoenix-bin-0.5.ebuild :
+  Removing this from the tree because 20021121 > 0.5 from portage's view.
+
   21 Nov 2002; Mark Guertin <gerk@gentoo.org> phoenix-bin-20021121.ebuild:
   set as -ppc -sparc -sparc64 -alpha to avoid confusion, these are all x86
   binaries (set all builds visible like this)
@@ -19,7 +29,7 @@
 *phoenix-bin-0.4-r2 (19 Nov 2002)
 
   19 Nov 2002; phoen][x <phoenix@gentoo.org> phoenix-bin-0.4-r2.ebuild 
-  files/digest-phoenix-bin0.4-r2 :
+  files/digest-phoenix-bin-0.4-r2 :
   Made phoenix mozilla plugin compliant. The new plugin layout for 
   phoenix and mozilla is: All plugins go to /usr/lib/nsbrowser/plugins 
   and the browsers plugins/ dir is symlinked to that very directory. 
diff --git a/net-www/phoenix-bin/files/digest-phoenix-bin-0.5 b/net-www/phoenix-bin/files/digest-phoenix-bin-0.5
new file mode 100644
index 000000000000..dd9be5bf8d01
--- /dev/null
+++ b/net-www/phoenix-bin/files/digest-phoenix-bin-0.5
@@ -0,0 +1 @@
+MD5 6cd5cdb4d7106a2d3843e4f907831ab7 phoenix-0.5-i686-pc-linux-gnu.tar.gz 9153046
diff --git a/net-www/phoenix-bin/files/digest-phoenix-bin-20021121 b/net-www/phoenix-bin/files/digest-phoenix-bin-20021121
deleted file mode 100644
index 0aa801bc046c..000000000000
--- a/net-www/phoenix-bin/files/digest-phoenix-bin-20021121
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebbd0bc46a508ced0a7f525fb5ff934f phoenix-20021121-i686-pc-linux-gnu.tar.gz 9161210
diff --git a/net-www/phoenix-bin/phoenix-bin-20021121.ebuild b/net-www/phoenix-bin/phoenix-bin-0.5.ebuild
index 01a7ef9b1048..2ce8b2905ad2 100644
--- a/net-www/phoenix-bin/phoenix-bin-20021121.ebuild
+++ b/net-www/phoenix-bin/phoenix-bin-0.5.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/phoenix-bin-20021121.ebuild,v 1.3 2002/12/09 04:33:20 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/phoenix-bin-0.5.ebuild,v 1.1 2002/12/10 17:23:02 phoenix Exp $
 
-inherit nsplugins eutils
 IUSE=""
 
 MY_PN=${PN/-bin/}
@@ -22,23 +21,34 @@ RDEPEND=">=sys-libs/lib-compat-1.0-r2
 	 virtual/x11"
 
 src_install() {
+	# Plugin path creation
+	PLUGIN_DIR="/usr/lib/nsbrowser/plugins" 
+	dodir /${PLUGIN_DIR}
+
 	dodir /usr/lib
+
 	mv ${S} ${D}/usr/lib
 
+	# Plugin path setup (rescuing the existent plugins)
+	mv ${D}/usr/lib/${MY_PN}/plugins ${D}/usr/lib/${MY_PN}/plugins.temp
+	dosym ../nsbrowser/plugins /usr/lib/${MY_PN}/
+	mv ${D}/usr/lib/${MY_PN}/plugins.temp/* ${D}/usr/lib/${MY_PN}/plugins/
+	rmdir ${D}/usr/lib/${MY_PN}/plugins.temp
+
 	# Fixing permissions
 	chown -R root.root ${D}/usr/lib/${MY_PN}
 
 	# Truetype fonts
         cd ${D}/usr/lib/${MY_PN}/defaults/pref
-	epatch ${FILESDIR}/phoenix-0.4-antialiasing-patch
+        einfo "Enabling truetype fonts"
+        patch < ${FILESDIR}/phoenix-0.4-antialiasing-patch
 
 	# Misc stuff
 	dobin ${FILESDIR}/phoenix
 	dosym /usr/lib/libstdc++-libc6.1-1.so.2 /usr/lib/${MY_PN}/libstdc++-libc6.2-2.so.3
-	src_mv_plugins /usr/lib/phoenix/plugins
-
 }
 
 pkg_preinst() {
-	pkg_mv_plugins /usr/lib/phoenix/plugins
+	# Remove the old plugins dir
+	[ -d /usr/lib/phoenix/plugins ] && rm -r /usr/lib/phoenix/plugins
 }