new release

6 files changed, 73 insertions, 40 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 6b8884a4b198..1b7a2c62d960 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-panel
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.67 2004/01/14 13:45:46 obz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.68 2004/01/16 17:46:16 foser Exp $
+
+*gnome-panel-2.4.2 (16 Jan 2003)
+
+  16 Jan 2004; foser <foser@gentoo.org> gnome-panel-2.4.2.ebuild :
+  New release
 
   14 Jan 2004; Mike Gardiner <obz@gentoo.org> gnome-panel-2.4.1.ebuild:
   Stable on x86 as part of GNOME-2.4.1
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 1c4e536f4bc9..d8750b448e3d 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,12 +1,11 @@
-MD5 eb58dda325007520bcfc41d8f435dd60 gnome-panel-2.2.2.2.ebuild 960
 MD5 d327e216eac270f85dccca930b54646b gnome-panel-2.4.0-r2.ebuild 1875
+MD5 b190318e057615e5269d8d6642c5c03d gnome-panel-2.4.2.ebuild 1550
 MD5 48542b12f7de0aa1d685b144b762a3ff gnome-panel-1.4.2-r2.ebuild 2016
 MD5 1c41d01742b08320a5080625b7862d11 gnome-panel-1.4.1.ebuild 1774
 MD5 d004297b7c3cb5cb005fa94cd96d1144 gnome-panel-2.4.0-r1.ebuild 1617
 MD5 bf21dde1d9cf939ff4ebb8bf150feff1 gnome-panel-2.4.1.ebuild 1747
-MD5 c0756bbfb679aab78678b623c5b89869 ChangeLog 9051
+MD5 bfd4882fe1e94d0d5f00d03469c251e1 ChangeLog 9169
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4e1b795f852d1e379d50f668ea0e8a1e files/digest-gnome-panel-2.2.2.2 73
 MD5 1bb4e04fb5577b5f7ffee6c5ef2855b2 files/gnome-panel-2.4.0-drawers_fix.patch 6205
 MD5 08d08fb07508d922ef40625fd41d53d6 files/gnome-panel-2.4.0-drawers_expanding_fix.patch 639
 MD5 e32de20a66c2dddfb1a4178bbce00e28 files/gnome-panel-2.4.0-autohide_fix.patch 2873
@@ -18,3 +17,4 @@ MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-panel-1.4.2-r2 70
 MD5 9696dc7286c62ec7105c7d927be6b4dc files/gnome-panel-2.4.1-drawers_expanding_fix.patch 639
 MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70
 MD5 756269f1a3d35355c5fd61009b9f4831 files/digest-gnome-panel-2.4.1 71
+MD5 7a56d7cd6b8d36c12f13018f16a7d1a5 files/digest-gnome-panel-2.4.2 71
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.2.2 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.2.2
deleted file mode 100644
index a223dece028f..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0fffc658f22e367ba33997dcf180ef17 gnome-panel-2.2.2.2.tar.bz2 2681490
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.2 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.2
new file mode 100644
index 000000000000..6ab82e44c1b3
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.2
@@ -0,0 +1 @@
+MD5 d62da1f6cb129f65206a945d93a2fa85 gnome-panel-2.4.2.tar.bz2 2662404
diff --git a/gnome-base/gnome-panel/gnome-panel-2.2.2.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.2.2.2.ebuild
deleted file mode 100644
index 7f2151fe3ac7..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.2.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.2.2.2.ebuild,v 1.5 2003/09/23 15:50:38 darkspecter Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The Panel for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-KEYWORDS="x86 ppc ~alpha ~sparc hppa ~amd64"
-
-IUSE="doc"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=x11-libs/libwnck-2.1.5
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/gnome-vfs-2.1.3
-	>=gnome-base/gnome-desktop-2.1.4
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1
-	>=app-text/scrollkeeper-0.3.11
-	!gnome-extra/system-tray-applet"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild
new file mode 100644
index 000000000000..5a9abb164a82
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild,v 1.1 2004/01/16 17:46:16 foser Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="The Panel for Gnome2"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+
+# IUSE="doc menu"
+IUSE="doc"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+SLOT="0"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RDEPEND=">=x11-libs/gtk+-2.1
+	>=x11-libs/libwnck-2.3
+	>=gnome-base/ORBit2-2.4
+	>=gnome-base/gnome-vfs-2.3
+	>=gnome-base/gnome-desktop-2.3
+	>=gnome-base/libbonoboui-2.1.1
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.1.1
+	>=gnome-base/libgnomeui-2.1
+	>=gnome-base/gconf-2.3.1
+	media-libs/libpng
+	!gnome-extra/system-tray-applet"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.21
+	doc? ( >=dev-util/gtk-doc-0.9 )"
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# use menu && epatch ${FILESDIR}/menu-${PV}.patch
+
+	# fix initial menu size
+	epatch ${FILESDIR}/${PN}-2.4-panel_size.patch
+
+	sed -i 's:--load:-v:' gnome-panel/Makefile.am
+
+	WANT_AUTOMAKE=1.4 automake || die
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	einfo "setting panel gconf defaults..."
+	GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
+	${ROOT}/usr/bin/gconftool-2 --direct --config-source ${GCONF_CONFIG_SOURCE} --load=/etc/gconf/schemas/panel-default-setup.entries
+
+}