public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/xfce:master commit in: eclass/
@ 2011-02-20 20:14 Christoph Mende
  0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-02-20 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     8f70fa3cfe267b9998a825e55a08bbe9c172ce2b
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 20:14:43 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 20:14:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=8f70fa3c

Removed LICENSE and SLOT from eclass

---
 eclass/xfce4.eclass |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/eclass/xfce4.eclass b/eclass/xfce4.eclass
index c093c53..cf8367c 100644
--- a/eclass/xfce4.eclass
+++ b/eclass/xfce4.eclass
@@ -13,9 +13,6 @@
 inherit autotools fdo-mime git gnome2-utils libtool
 [ -n ${XFCE4_PATCHES} ] && inherit eutils
 
-LICENSE="GPL-2"
-SLOT="0"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -192,7 +189,7 @@ xfce4_src_compile() {
 xfce4_src_install() {
 	[ -n "${DOCS}" ] && dodoc ${DOCS}
 
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" "$@" install || die "emake install failed"
 }
 
 # @FUNCTION: xfce4_pkg_preinst



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/xfce:master commit in: eclass/
@ 2011-03-13 21:52 Christoph Mende
  0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-03-13 21:52 UTC (permalink / raw
  To: gentoo-commits

commit:     cb2083526d7af031eee11589929815c1efd7a416
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 21:51:37 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 21:51:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=cb208352

xfconf-live: Run base_src_prepare after git_src_prepare

---
 eclass/xfconf-live.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/xfconf-live.eclass b/eclass/xfconf-live.eclass
index 78174e1..7ee4822 100644
--- a/eclass/xfconf-live.eclass
+++ b/eclass/xfconf-live.eclass
@@ -31,8 +31,8 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_install pkg_preinst pk
 # configure.ac
 xfconf-live_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
-	base_src_prepare
 	git_src_prepare
+	base_src_prepare
 	return
 }
 



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/xfce:master commit in: eclass/
@ 2011-03-22 21:51 Christoph Mende
  0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-03-22 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5c427b98c65df7ab7bf268a3e357702f3208f217
Author:     Christoph Mende <angelos <AT> unkreativ <DOT> org>
AuthorDate: Tue Mar 22 21:51:04 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 21:51:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=5c427b98

xfconf.eclass: Updated docs

---
 eclass/xfconf-live.eclass |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/eclass/xfconf-live.eclass b/eclass/xfconf-live.eclass
index 7ee4822..2af939f 100644
--- a/eclass/xfconf-live.eclass
+++ b/eclass/xfconf-live.eclass
@@ -7,7 +7,7 @@
 # Gentoo's Xfce Team <xfce@gentoo.org>
 # @BLURB: Default XFCE ebuild layout
 # @DESCRIPTION:
-# Default XFCE ebuild layout
+# Default XFCE ebuild layout, see xfconf
 
 if [[ "${PN}" != "xfce4-dev-tools" ]]; then
 	EAUTORECONF="yes"
@@ -25,10 +25,6 @@ DEPEND+="
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
 
-# @FUNCTION: xfconf_src_prepare
-# @DESCRIPTION:
-# Patch autogen.sh in live ebuilds to inject the correct revision into
-# configure.ac
 xfconf-live_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 	git_src_prepare



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/xfce:master commit in: eclass/
@ 2011-04-06 18:45 Christoph Mende
  0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-04-06 18:45 UTC (permalink / raw
  To: gentoo-commits

commit:     cb1c602a8562fa3cc41ef25a825729e142cbb1f0
Author:     Christoph Mende <angelos <AT> unkreativ <DOT> org>
AuthorDate: Wed Apr  6 18:45:24 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 18:45:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=cb1c602a

Moved NOCONFIGURE from global scope to src_prepare

---
 eclass/xfconf-live.eclass |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/eclass/xfconf-live.eclass b/eclass/xfconf-live.eclass
index 2af939f..696786e 100644
--- a/eclass/xfconf-live.eclass
+++ b/eclass/xfconf-live.eclass
@@ -18,7 +18,6 @@ inherit git xfconf
 SRC_URI=""
 EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
 EGIT_BOOTSTRAP="autogen.sh"
-export NOCONFIGURE="yes"
 
 DEPEND+="
 	dev-util/gtk-doc"
@@ -27,7 +26,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_install pkg_preinst pk
 
 xfconf-live_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
-	git_src_prepare
+	NOCONFIGURE=yes git_src_prepare
 	base_src_prepare
 	return
 }



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/xfce:master commit in: eclass/
@ 2011-04-08 10:18 Christoph Mende
  0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-04-08 10:18 UTC (permalink / raw
  To: gentoo-commits

commit:     575fb90dfcdbbd1d6c2d97c57d4968097d0f5b03
Author:     Christoph Mende <angelos <AT> unkreativ <DOT> org>
AuthorDate: Fri Apr  8 10:18:14 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 10:18:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=575fb90d

Create empty ChangeLog so we can keep live ebuilds synchronized

---
 eclass/xfconf-live.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/xfconf-live.eclass b/eclass/xfconf-live.eclass
index 696786e..6862e42 100644
--- a/eclass/xfconf-live.eclass
+++ b/eclass/xfconf-live.eclass
@@ -28,7 +28,7 @@ xfconf-live_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 	NOCONFIGURE=yes git_src_prepare
 	base_src_prepare
-	return
+	[ -e ChangeLog ] || touch ChangeLog
 }
 
 xfconf-live_src_unpack() {



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/xfce:master commit in: eclass/
@ 2011-04-20 16:17 Christoph Mende
  0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-04-20 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     3b41b4a4e5e6b00c2b1af37addd7bbc9f3036818
Author:     Christoph Mende <angelos <AT> unkreativ <DOT> org>
AuthorDate: Wed Apr 20 16:15:19 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 16:15:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=3b41b4a4

Switch to git-2

---
 eclass/xfconf-live.eclass |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/xfconf-live.eclass b/eclass/xfconf-live.eclass
index 6862e42..53afda9 100644
--- a/eclass/xfconf-live.eclass
+++ b/eclass/xfconf-live.eclass
@@ -13,7 +13,7 @@ if [[ "${PN}" != "xfce4-dev-tools" ]]; then
 	EAUTORECONF="yes"
 fi
 
-inherit git xfconf
+inherit git-2 xfconf
 
 SRC_URI=""
 EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
@@ -26,13 +26,12 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_install pkg_preinst pk
 
 xfconf-live_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
-	NOCONFIGURE=yes git_src_prepare
 	base_src_prepare
 	[ -e ChangeLog ] || touch ChangeLog
 }
 
 xfconf-live_src_unpack() {
-	git_src_unpack "$@"
+	NOCONFIGURE=yes git-2_src_unpack "$@"
 }
 
 xfconf-live_src_configure() {



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/xfce:master commit in: eclass/
@ 2011-06-13 18:54 Christoph Mende
  0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende @ 2011-06-13 18:54 UTC (permalink / raw
  To: gentoo-commits

commit:     fe816690d5a9cd322f92611ab597b634d4c59c81
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 18:51:07 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 18:51:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=fe816690

Remove xfconf-live.eclass

---
 eclass/xfconf-live.eclass |   56 ---------------------------------------------
 1 files changed, 0 insertions(+), 56 deletions(-)

diff --git a/eclass/xfconf-live.eclass b/eclass/xfconf-live.eclass
deleted file mode 100644
index 53afda9..0000000
--- a/eclass/xfconf-live.eclass
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: xfconf-live.eclass
-# @MAINTAINER: Christoph Mende <angelos@gentoo.org>
-# Gentoo's Xfce Team <xfce@gentoo.org>
-# @BLURB: Default XFCE ebuild layout
-# @DESCRIPTION:
-# Default XFCE ebuild layout, see xfconf
-
-if [[ "${PN}" != "xfce4-dev-tools" ]]; then
-	EAUTORECONF="yes"
-fi
-
-inherit git-2 xfconf
-
-SRC_URI=""
-EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
-EGIT_BOOTSTRAP="autogen.sh"
-
-DEPEND+="
-	dev-util/gtk-doc"
-
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
-
-xfconf-live_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-	base_src_prepare
-	[ -e ChangeLog ] || touch ChangeLog
-}
-
-xfconf-live_src_unpack() {
-	NOCONFIGURE=yes git-2_src_unpack "$@"
-}
-
-xfconf-live_src_configure() {
-	XFCONF=( --enable-maintainer-mode ${XFCONF[@]} )
-	xfconf_src_configure "$@"
-}
-
-xfconf-live_src_install() {
-	xfconf_src_install "$@"
-}
-
-xfconf-live_pkg_preinst() {
-	xfconf_pkg_preinst "$@"
-}
-
-xfconf-live_pkg_postinst() {
-	xfconf_pkg_postinst "$@"
-}
-
-xfconf-live_pkg_postrm() {
-	xfconf_pkg_postrm "$@"
-}



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2011-06-13 18:55 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-06 18:45 [gentoo-commits] proj/xfce:master commit in: eclass/ Christoph Mende
  -- strict thread matches above, loose matches on Subject: below --
2011-06-13 18:54 Christoph Mende
2011-04-20 16:17 Christoph Mende
2011-04-08 10:18 Christoph Mende
2011-03-22 21:51 Christoph Mende
2011-03-13 21:52 Christoph Mende
2011-02-20 20:14 Christoph Mende

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox