Restore xfce4-panel-4.7.4 wrt #348615 by Sebastian Pipping (and Jory A. Pratt from IRC).

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

4 files changed, 54 insertions, 5 deletions

diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 73bb00038c26..69ba2cc5c272 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce4-panel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.174 2010/12/05 16:05:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.175 2010/12/13 18:10:03 ssuominen Exp $
+
+  13 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-panel-4.7.4.ebuild, xfce4-panel-4.7.6.ebuild:
+  Restore xfce4-panel-4.7.4 wrt #348615 by Sebastian Pipping (and Jory A. Pratt
+  from IRC).
 
 *xfce4-panel-4.7.6 (05 Dec 2010)
 
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index e40bf532a572..4c777ca7ff75 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,6 +1,8 @@
 DIST xfce4-panel-4.6.4.tar.bz2 902913 RMD160 35eaab8726a447b961024d433845f30804da4751 SHA1 d2b310c036be84ed9886c06ae35b7a1a8eabfcb8 SHA256 cc9b70bdc73ab80f46655a34cdbaf876a67cd90b50230cbf4d77a3106a5c54e7
+DIST xfce4-panel-4.7.4.tar.bz2 1171070 RMD160 422b65c3269c3aa629a12b4c9177fe428e7ab18a SHA1 e66820ac9254a513820bd89e2dd76ee0b787b7a0 SHA256 db7b7549077110f430f33960120abca4316f4729ad81208c002dbdf8cc6f71bb
 DIST xfce4-panel-4.7.6.tar.bz2 1184905 RMD160 d1ee06e87ddd91210275a6f51a487ead2b0cd93e SHA1 9fcd8cbe15aa54ab4394905dc18b1bbd083cdea9 SHA256 3ee1a99845ec3ac4f2572586df9c833065cd9bb1a5eeff521b396a00674e3970
 EBUILD xfce4-panel-4.6.4.ebuild 1141 RMD160 b661779f87fd92e9a154299ce1f2d5ecb8c23bdf SHA1 c4355f3afae67c7aa414487524f1a99dbcc4d845 SHA256 553383f8f205139a220ee286503b45e898f77ffa7c943f7b0c7c2b13ab642bde
-EBUILD xfce4-panel-4.7.6.ebuild 1192 RMD160 5780ce59012e38a157209b7f2557f7d1b76e5764 SHA1 5e2b66cebd2caebedac433b59acf41bec24c0d38 SHA256 12bdf3f52786f95e087ec48ceb5092eb9348ba6c25a07fc00edf89ec7f35b16f
-MISC ChangeLog 21689 RMD160 a40bb81f6a25554b5e0775591897586866d8a7db SHA1 6f0fdaff76a395b9532ad7ee69cfa2349c8aee1b SHA256 df7f1a8a243c84e1ecfbbe332613effedc971f0b3e128f881a245313dae54206
+EBUILD xfce4-panel-4.7.4.ebuild 1153 RMD160 fbf528904f6dc21cb453b125cd0463f8b7c8600e SHA1 65b538a1294e8d74d780b099ef567113578c2811 SHA256 f2466dc390f00e6b78997b543ae1c2dab072a9b0674d744897d3da27261333ef
+EBUILD xfce4-panel-4.7.6.ebuild 1193 RMD160 b2540cbae4c95bab7c015becd9c7e5e715037eb2 SHA1 792d4b3ce16a6c6632cb0d715ce2723d7f9b9e5b SHA256 f3523406e3f91ede8a50ed90ef3260081358b0b545ae6cec82047cfd5bc27945
+MISC ChangeLog 21892 RMD160 d0afd275196dd3999c09bba836ffab4583e3c7f2 SHA1 b88b7d60f2f5c8d8930cfcd0d3c4000f5e38f300 SHA256 5eb382b2a1b00bf25e8f60e45e91a628263389b32d7c1e79d6514cc4874e51ad
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.7.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.7.4.ebuild
new file mode 100644
index 000000000000..7e2f763b28a4
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.7.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.7.4.ebuild,v 1.3 2010/12/13 18:10:03 ssuominen Exp $
+
+EAPI=3
+inherit xfconf
+
+DESCRIPTION="Xfce's panel"
+HOMEPAGE="http://www.xfce.org/projects/xfce4-panel/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/4.7/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+RDEPEND="x11-libs/libX11
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/garcon-0.1.4
+	>=xfce-base/libxfce4ui-4.7.1
+	>=xfce-base/xfconf-4.7.2
+	>=xfce-base/exo-0.5.1
+	>=x11-libs/gtk+-2.14:2
+	>=dev-libs/glib-2.18:2
+	>=dev-libs/dbus-glib-0.73
+	x11-libs/cairo
+	>=x11-libs/libwnck-2.22"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-dependency-tracking
+		--disable-static
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
+}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.7.6.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.7.6.ebuild
index abc764d70a6a..7d59c84e4181 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.7.6.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.7.6.ebuild,v 1.1 2010/12/05 16:05:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.7.6.ebuild,v 1.2 2010/12/13 18:10:03 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.7/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND="x11-libs/libX11