[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    09/08/01 20:08:30

  Added:                xfconf.eclass
  Log:
  xfconf.eclass

Revision  Changes    Path
1.1                  eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.1&content-type=text/plain

Index: xfconf.eclass
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.1 2009/08/01 20:08:30 ssuominen Exp $

# @ECLASS: xfconf.eclass
# @MAINTAINER:
# XFCE maintainers <xfce@gentoo.org>
# @BLURB: Default XFCE ebuild layout
# @DESCRIPTION:
# Default XFCE ebuild layout

# @ECLASS-VARIABLE: EAUTORECONF
# @DESCRIPTION:
# Run eautoreconf instead of elibtoolize if set "yes"

# @ECLASS-VARIABLE: EINTLTOOLIZE
# @DESCRIPTION:
# Run intltoolize --force --copy --automake if set "yes"

# @ECLASS-VARIABLE: DOCS
# @DESCRIPTION:
# Define documentation to install

# @ECLASS-VARIABLE: PATCHES
# @DESCRIPTION:
# Define patches to apply

# @ECLASS-VARIABLE: XFCONF
# @DESCRIPTION:
# Define options for econf

inherit autotools base fdo-mime gnome2-utils libtool

MY_P=${P}
SRC_URI="mirror://xfce/xfce-${PV}/src/${MY_P}.tar.bz2"

if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
	_xfce4_intltool="dev-util/intltool"
fi

if [[ "${EAUTORECONF}" == "yes" ]]; then
	_xfce4_m4="dev-util/xfce4-dev-tools"
fi

RDEPEND=""
DEPEND="${_xfce4_intltool}
	${_xfce4_m4}"

unset _xfce4_intltool
unset _xfce4_m4

EXPF="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
case ${EAPI:-0} in
	2) EXPF="${EXPF} src_prepare src_configure" ;;
	1|0) ;;
	*) die "Unknown EAPI." ;;
esac
EXPORT_FUNCTIONS ${EXPF}

# @FUNCTION: xfconf_src_unpack
# @DESCRIPTION:
# Run base_src_util autopatch and eautoreconf or elibtoolize
xfconf_src_unpack() {
	unpack ${A}
	cd "${S}"
	has src_prepare ${EXPF} || xfconf_src_prepare
}

# @FUNCTION: xfconf_src_prepare
# @DESCRIPTION:
# Run base_src_util autopatch and eautoreconf or elibtoolize
xfconf_src_prepare() {
	base_src_util autopatch

	if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
		intltoolize --force --copy --automake || die "intltoolize failed"
	fi

	if [[ "${EAUTORECONF}" == "yes" ]]; then
		AT_M4DIR="/usr/share/xfce4/dev-tools/m4macros" eautoreconf
	else
		elibtoolize
	fi
}

# @FUNCTION: xfconf_src_configure
# @DESCRIPTION:
# Run econf with opts in XFCONF variable
xfconf_src_configure() {
	econf ${XFCONF}
}

# @FUNCTION: xfconf_src_compile
# @DESCRIPTION:
# Run econf with opts in XFCONF variable
xfconf_src_compile() {
	has src_configure ${EXPF} || xfconf_src_configure
	emake || die "emake failed"
}

# @FUNCTION: xfconf_src_install
# @DESCRIPTION:
# Run emake install and install documentation in DOCS variable
xfconf_src_install() {
	emake DESTDIR="${D}" install || die "emake install failed"

	if [[ -n ${DOCS} ]]; then
		dodoc ${DOCS} || die "dodoc failed"
	fi
}

# @FUNCTION: xfconf_pkg_preinst
# @DESCRIPTION:
# Run gnome2_icon_savelist
xfconf_pkg_preinst() {
	gnome2_icon_savelist
}

# @FUNCTION: xfconf_pkg_postinst
# @DESCRIPTION:
# Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update
xfconf_pkg_postinst() {
	fdo-mime_desktop_database_update
	fdo-mime_mime_database_update
	gnome2_icon_cache_update
}

# @FUNCTION: xfconf_pkg_postrm
# @DESCRIPTION:
# Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update
xfconf_pkg_postrm() {
	fdo-mime_desktop_database_update
	fdo-mime_mime_database_update
	gnome2_icon_cache_update
}

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    09/08/02 10:35:53

  Modified:             xfconf.eclass
  Log:
  Make ebuild usable for Terminal and Thunar for MY_P substituting.

Revision  Changes    Path
1.2                  eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.1&r2=1.2

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfconf.eclass	1 Aug 2009 20:08:30 -0000	1.1
+++ xfconf.eclass	2 Aug 2009 10:35:53 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.1 2009/08/01 20:08:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.2 2009/08/02 10:35:53 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -31,7 +31,12 @@
 
 inherit autotools base fdo-mime gnome2-utils libtool
 
-MY_P=${P}
+if ! [[ ${MY_P} ]]; then
+	MY_P=${P}
+else
+	S=${WORKDIR}/${MY_P}
+fi
+
 SRC_URI="mirror://xfce/xfce-${PV}/src/${MY_P}.tar.bz2"
 
 if [[ "${EINTLTOOLIZE}" == "yes" ]]; then

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    09/09/21 17:43:08

  Modified:             xfconf.eclass
  Log:
  Rename EXPF variable to XFCONF_EXPF per -dev ML discussion.

Revision  Changes    Path
1.3                  eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.2&r2=1.3

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfconf.eclass	2 Aug 2009 10:35:53 -0000	1.2
+++ xfconf.eclass	21 Sep 2009 17:43:08 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.2 2009/08/02 10:35:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.3 2009/09/21 17:43:08 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -54,13 +54,13 @@
 unset _xfce4_intltool
 unset _xfce4_m4
 
-EXPF="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
+XFCONF_EXPF="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
 case ${EAPI:-0} in
-	2) EXPF="${EXPF} src_prepare src_configure" ;;
+	2) XFCONF_EXPF="${XFCONF_EXPF} src_prepare src_configure" ;;
 	1|0) ;;
 	*) die "Unknown EAPI." ;;
 esac
-EXPORT_FUNCTIONS ${EXPF}
+EXPORT_FUNCTIONS ${XFCONF_EXPF}
 
 # @FUNCTION: xfconf_src_unpack
 # @DESCRIPTION:
@@ -68,7 +68,7 @@
 xfconf_src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	has src_prepare ${EXPF} || xfconf_src_prepare
+	has src_prepare ${XFCONF_EXPF} || xfconf_src_prepare
 }
 
 # @FUNCTION: xfconf_src_prepare
@@ -99,7 +99,7 @@
 # @DESCRIPTION:
 # Run econf with opts in XFCONF variable
 xfconf_src_compile() {
-	has src_configure ${EXPF} || xfconf_src_configure
+	has src_configure ${XFCONF_EXPF} || xfconf_src_configure
 	emake || die "emake failed"
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/01/22 16:33:59

  Modified:             xfconf.eclass
  Log:
  EAPI3 support

Revision  Changes    Path
1.5                  eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.4&r2=1.5

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfconf.eclass	3 Jan 2010 19:10:49 -0000	1.4
+++ xfconf.eclass	22 Jan 2010 16:33:59 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.4 2010/01/03 19:10:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.5 2010/01/22 16:33:59 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -56,7 +56,7 @@
 
 XFCONF_EXPF="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
 case ${EAPI:-0} in
-	2) XFCONF_EXPF="${XFCONF_EXPF} src_prepare src_configure" ;;
+	3|2) XFCONF_EXPF="${XFCONF_EXPF} src_prepare src_configure" ;;
 	1|0) ;;
 	*) die "Unknown EAPI." ;;
 esac

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Christoph Mende (angelos)]

angelos     10/01/23 17:35:54

  Modified:             xfconf.eclass
  Log:
  Fixed SRC_URI

Revision  Changes    Path
1.6                  eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.5&r2=1.6

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfconf.eclass	22 Jan 2010 16:33:59 -0000	1.5
+++ xfconf.eclass	23 Jan 2010 17:35:54 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.5 2010/01/22 16:33:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.6 2010/01/23 17:35:54 angelos Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -37,7 +37,7 @@
 	S=${WORKDIR}/${MY_P}
 fi
 
-SRC_URI="mirror://xfce/xfce-${PV}/src/${MY_P}.tar.bz2"
+SRC_URI="mirror://xfce/xfce/xfce-${PV}/src/${MY_P}.tar.bz2"
 
 if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
 	_xfce4_intltool="dev-util/intltool"

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Christoph Mende (angelos)]

angelos     10/01/23 17:36:35

  Modified:             xfconf.eclass
  Log:
  Fixed SRC_URI

Revision  Changes    Path
1.7                  eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.6&r2=1.7

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfconf.eclass	23 Jan 2010 17:35:54 -0000	1.6
+++ xfconf.eclass	23 Jan 2010 17:36:34 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.6 2010/01/23 17:35:54 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.7 2010/01/23 17:36:34 angelos Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -37,7 +37,7 @@
 	S=${WORKDIR}/${MY_P}
 fi
 
-SRC_URI="mirror://xfce/xfce/xfce-${PV}/src/${MY_P}.tar.bz2"
+SRC_URI="mirror://xfce/xfce/${PV}/src/${MY_P}.tar.bz2"
 
 if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
 	_xfce4_intltool="dev-util/intltool"

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Jeremy Olexa (darkside)]

darkside    10/03/22 15:53:50

  Modified:             xfconf.eclass
  Log:
  Add EAPI3 support to eautoreconf call - this commit aligns xfconf.eclass to the one used in Gentoo Prefix overlay

Revision  Changes    Path
1.8                  eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.7&r2=1.8

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfconf.eclass	23 Jan 2010 17:36:34 -0000	1.7
+++ xfconf.eclass	22 Mar 2010 15:53:50 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.7 2010/01/23 17:36:34 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.8 2010/03/22 15:53:50 darkside Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -82,7 +82,8 @@
 	fi
 
 	if [[ "${EAUTORECONF}" == "yes" ]]; then
-		AT_M4DIR="/usr/share/xfce4/dev-tools/m4macros" eautoreconf
+		has "${EAPI:-0}" 0 1 2 && EPREFIX=
+		AT_M4DIR="${EPREFIX}/usr/share/xfce4/dev-tools/m4macros" eautoreconf
 	else
 		elibtoolize
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Fabian Groffen (grobian)]

grobian     10/03/22 16:29:28

  Modified:             xfconf.eclass
  Log:
  avoid read-only error message

Revision  Changes    Path
1.9                  eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.8&r2=1.9

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfconf.eclass	22 Mar 2010 15:53:50 -0000	1.8
+++ xfconf.eclass	22 Mar 2010 16:29:27 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.8 2010/03/22 15:53:50 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.9 2010/03/22 16:29:27 grobian Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -82,7 +82,7 @@
 	fi
 
 	if [[ "${EAUTORECONF}" == "yes" ]]; then
-		has "${EAPI:-0}" 0 1 2 && EPREFIX=
+		has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
 		AT_M4DIR="${EPREFIX}/usr/share/xfce4/dev-tools/m4macros" eautoreconf
 	else
 		elibtoolize

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/03/24 20:13:15

  Modified:             xfconf.eclass
  Log:
  Raise xfce4-dev-tools depend to 4.7.0 to force people upgrade build time depend. It's the minimum required version for couple of packages already.

Revision  Changes    Path
1.10                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.9&r2=1.10

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfconf.eclass	22 Mar 2010 16:29:27 -0000	1.9
+++ xfconf.eclass	24 Mar 2010 20:13:15 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.9 2010/03/22 16:29:27 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.10 2010/03/24 20:13:15 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -44,7 +44,7 @@
 fi
 
 if [[ "${EAUTORECONF}" == "yes" ]]; then
-	_xfce4_m4="dev-util/xfce4-dev-tools"
+	_xfce4_m4=">=dev-util/xfce4-dev-tools-4.7.0"
 fi
 
 RDEPEND=""

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/03/26 11:41:57

  Modified:             xfconf.eclass
  Log:
  Introduce new xfconf_use_debug function.

Revision  Changes    Path
1.11                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.10&r2=1.11

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfconf.eclass	24 Mar 2010 20:13:15 -0000	1.10
+++ xfconf.eclass	26 Mar 2010 11:41:57 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.10 2010/03/24 20:13:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.11 2010/03/26 11:41:57 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -62,6 +62,24 @@
 esac
 EXPORT_FUNCTIONS ${XFCONF_EXPF}
 
+# @FUNCTION: xfconf_use_debug
+# @RETURN:
+# Return --enable-debug, --enable-debug=full or --disable-debug based on
+# I_KNOW_WHAT_I_AM_DOING variable
+xfconf_use_debug() {
+	if use debug; then
+		if [[ -n $I_KNOW_WHAT_I_AM_DOING ]]; then
+			echo "--enable-debug=full"
+		else
+			echo "--enable-debug"
+		fi
+	else
+		if [[ -n $I_KNOW_WHAT_I_AM_DOING ]]; then
+			echo "--disable-debug"
+		fi
+	fi
+}
+
 # @FUNCTION: xfconf_src_unpack
 # @DESCRIPTION:
 # Run base_src_util autopatch and eautoreconf or elibtoolize

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/03/26 11:59:08

  Modified:             xfconf.eclass
  Log:
  Make sure USE debug is in IUSE.

Revision  Changes    Path
1.12                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.11&r2=1.12

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfconf.eclass	26 Mar 2010 11:41:57 -0000	1.11
+++ xfconf.eclass	26 Mar 2010 11:59:08 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.11 2010/03/26 11:41:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.12 2010/03/26 11:59:08 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -64,18 +64,20 @@
 
 # @FUNCTION: xfconf_use_debug
 # @RETURN:
-# Return --enable-debug, --enable-debug=full or --disable-debug based on
-# I_KNOW_WHAT_I_AM_DOING variable
+# Return --enable-debug, null, --enable-debug=full or --disable-debug based on
+# I_KNOW_WHAT_I_AM_DOING variable and USE debug
 xfconf_use_debug() {
-	if use debug; then
-		if [[ -n $I_KNOW_WHAT_I_AM_DOING ]]; then
-			echo "--enable-debug=full"
+	if has debug ${IUSE}; then
+		if use debug; then
+			if [[ -n $I_KNOW_WHAT_I_AM_DOING ]]; then
+				echo "--enable-debug=full"
+			else
+				echo "--enable-debug"
+			fi
 		else
-			echo "--enable-debug"
-		fi
-	else
-		if [[ -n $I_KNOW_WHAT_I_AM_DOING ]]; then
-			echo "--disable-debug"
+			if [[ -n $I_KNOW_WHAT_I_AM_DOING ]]; then
+				echo "--disable-debug"
+			fi
 		fi
 	fi
 }

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/03/26 12:10:14

  Modified:             xfconf.eclass
  Log:
  Use XFCONF_FULL_DEBUG instead of polluting I_KNOW_WHAT_I_AM_DOING.

Revision  Changes    Path
1.13                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.12&r2=1.13

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfconf.eclass	26 Mar 2010 11:59:08 -0000	1.12
+++ xfconf.eclass	26 Mar 2010 12:10:14 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.12 2010/03/26 11:59:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.13 2010/03/26 12:10:14 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -65,17 +65,17 @@
 # @FUNCTION: xfconf_use_debug
 # @RETURN:
 # Return --enable-debug, null, --enable-debug=full or --disable-debug based on
-# I_KNOW_WHAT_I_AM_DOING variable and USE debug
+# XFCONF_FULL_DEBUG variable and USE debug
 xfconf_use_debug() {
 	if has debug ${IUSE}; then
 		if use debug; then
-			if [[ -n $I_KNOW_WHAT_I_AM_DOING ]]; then
+			if [[ -n $XFCONF_FULL_DEBUG ]]; then
 				echo "--enable-debug=full"
 			else
 				echo "--enable-debug"
 			fi
 		else
-			if [[ -n $I_KNOW_WHAT_I_AM_DOING ]]; then
+			if [[ -n $XFCONF_FULL_DEBUG ]]; then
 				echo "--disable-debug"
 			fi
 		fi

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/03/26 12:17:16

  Modified:             xfconf.eclass
  Log:
  Be eclass-manpages friendly

Revision  Changes    Path
1.14                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.13&r2=1.14

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfconf.eclass	26 Mar 2010 12:10:14 -0000	1.13
+++ xfconf.eclass	26 Mar 2010 12:17:16 -0000	1.14
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.13 2010/03/26 12:10:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.14 2010/03/26 12:17:16 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -63,7 +63,7 @@
 EXPORT_FUNCTIONS ${XFCONF_EXPF}
 
 # @FUNCTION: xfconf_use_debug
-# @RETURN:
+# @DESCRIPTION:
 # Return --enable-debug, null, --enable-debug=full or --disable-debug based on
 # XFCONF_FULL_DEBUG variable and USE debug
 xfconf_use_debug() {

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/03/30 12:10:46

  Modified:             xfconf.eclass
  Log:
  Commit some debug-print-function's for debugging

Revision  Changes    Path
1.15                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xfconf.eclass?r1=1.14&r2=1.15

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfconf.eclass	26 Mar 2010 12:17:16 -0000	1.14
+++ xfconf.eclass	30 Mar 2010 12:10:46 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.14 2010/03/26 12:17:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.15 2010/03/30 12:10:46 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -86,6 +86,7 @@
 # @DESCRIPTION:
 # Run base_src_util autopatch and eautoreconf or elibtoolize
 xfconf_src_unpack() {
+	debug-print-function ${FUNCNAME} "$@"
 	unpack ${A}
 	cd "${S}"
 	has src_prepare ${XFCONF_EXPF} || xfconf_src_prepare
@@ -95,6 +96,7 @@
 # @DESCRIPTION:
 # Run base_src_util autopatch and eautoreconf or elibtoolize
 xfconf_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
 	base_src_prepare
 
 	if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
@@ -113,6 +115,7 @@
 # @DESCRIPTION:
 # Run econf with opts in XFCONF variable
 xfconf_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
 	econf ${XFCONF}
 }
 
@@ -120,6 +123,7 @@
 # @DESCRIPTION:
 # Run econf with opts in XFCONF variable
 xfconf_src_compile() {
+	debug-print-function ${FUNCNAME} "$@"
 	has src_configure ${XFCONF_EXPF} || xfconf_src_configure
 	emake || die "emake failed"
 }
@@ -128,6 +132,7 @@
 # @DESCRIPTION:
 # Run emake install and install documentation in DOCS variable
 xfconf_src_install() {
+	debug-print-function ${FUNCNAME} "$@"
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	if [[ -n ${DOCS} ]]; then
@@ -139,6 +144,7 @@
 # @DESCRIPTION:
 # Run gnome2_icon_savelist
 xfconf_pkg_preinst() {
+	debug-print-function ${FUNCNAME} "$@"
 	gnome2_icon_savelist
 }
 
@@ -146,6 +152,7 @@
 # @DESCRIPTION:
 # Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update
 xfconf_pkg_postinst() {
+	debug-print-function ${FUNCNAME} "$@"
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
@@ -155,6 +162,7 @@
 # @DESCRIPTION:
 # Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update
 xfconf_pkg_postrm() {
+	debug-print-function ${FUNCNAME} "$@"
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/06/13 16:10:21

  Modified:             xfconf.eclass
  Log:
  Accept arguments to emake install

Revision  Changes    Path
1.16                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.15&r2=1.16

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfconf.eclass	30 Mar 2010 12:10:46 -0000	1.15
+++ xfconf.eclass	13 Jun 2010 16:10:21 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.15 2010/03/30 12:10:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.16 2010/06/13 16:10:21 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -133,7 +133,7 @@
 # Run emake install and install documentation in DOCS variable
 xfconf_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" "$@" install || die "emake install failed"
 
 	if [[ -n ${DOCS} ]]; then
 		dodoc ${DOCS} || die "dodoc failed"

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/07/26 18:57:14

  Modified:             xfconf.eclass
  Log:
  punt all .la files from xfce pkgs, we don't use static archives (we pass --disable-static) since none of the xfce libs are useful static. we also don't have any plugins/libraries using libltdl.

Revision  Changes    Path
1.17                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.16&r2=1.17

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xfconf.eclass	13 Jun 2010 16:10:21 -0000	1.16
+++ xfconf.eclass	26 Jul 2010 18:57:14 -0000	1.17
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.16 2010/06/13 16:10:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.17 2010/07/26 18:57:14 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -138,6 +138,9 @@
 	if [[ -n ${DOCS} ]]; then
 		dodoc ${DOCS} || die "dodoc failed"
 	fi
+
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 # @FUNCTION: xfconf_pkg_preinst

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/09/16 17:09:51

  Modified:             xfconf.eclass
  Log:
  Validate .desktop entries always, every problem must be reported upstream

Revision  Changes    Path
1.18                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.17&r2=1.18

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xfconf.eclass	26 Jul 2010 18:57:14 -0000	1.17
+++ xfconf.eclass	16 Sep 2010 17:09:51 -0000	1.18
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.17 2010/07/26 18:57:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.18 2010/09/16 17:09:51 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -29,7 +29,7 @@
 # @DESCRIPTION:
 # Define options for econf
 
-inherit autotools base fdo-mime gnome2-utils libtool
+inherit autotools base eutils fdo-mime gnome2-utils libtool
 
 if ! [[ ${MY_P} ]]; then
 	MY_P=${P}
@@ -141,6 +141,8 @@
 
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	validate_desktop_entries
 }
 
 # @FUNCTION: xfconf_pkg_preinst

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/11/03 17:39:59

  Modified:             xfconf.eclass
  Log:
  Convert XFCONF to an array

Revision  Changes    Path
1.19                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.18&r2=1.19

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xfconf.eclass	16 Sep 2010 17:09:51 -0000	1.18
+++ xfconf.eclass	3 Nov 2010 17:39:59 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.18 2010/09/16 17:09:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.19 2010/11/03 17:39:59 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -116,7 +116,13 @@
 # Run econf with opts in XFCONF variable
 xfconf_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
-	econf ${XFCONF}
+
+	# Convert XFCONF to an array, see base.eclass for original code
+	if [[ "$(declare -p XFCONF 2>/dev/null 2>&1)" != "declare -a"* ]]; then
+		XFCONF=( ${XFCONF} )
+	fi
+	
+	econf ${XFCONF[@]}
 }
 
 # @FUNCTION: xfconf_src_compile

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/11/03 17:43:13

  Modified:             xfconf.eclass
  Log:
  Fix comment

Revision  Changes    Path
1.20                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.19&r2=1.20

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xfconf.eclass	3 Nov 2010 17:39:59 -0000	1.19
+++ xfconf.eclass	3 Nov 2010 17:43:13 -0000	1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.19 2010/11/03 17:39:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.20 2010/11/03 17:43:13 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -113,7 +113,7 @@
 
 # @FUNCTION: xfconf_src_configure
 # @DESCRIPTION:
-# Run econf with opts in XFCONF variable
+# Run econf with opts in XFCONF array
 xfconf_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/01/27 17:32:49

  Modified:             xfconf.eclass
  Log:
  EAPI4 support

Revision  Changes    Path
1.21                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.20&r2=1.21

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xfconf.eclass	3 Nov 2010 17:43:13 -0000	1.20
+++ xfconf.eclass	27 Jan 2011 17:32:49 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.20 2010/11/03 17:43:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.21 2011/01/27 17:32:49 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -56,7 +56,7 @@
 
 XFCONF_EXPF="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
 case ${EAPI:-0} in
-	3|2) XFCONF_EXPF="${XFCONF_EXPF} src_prepare src_configure" ;;
+	4|3|2) XFCONF_EXPF="${XFCONF_EXPF} src_prepare src_configure" ;;
 	1|0) ;;
 	*) die "Unknown EAPI." ;;
 esac

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/02/04 17:23:35

  Modified:             xfconf.eclass
  Log:
  Remove unnecessary die messages as portage prints the command it fails on.   Whitespace.

Revision  Changes    Path
1.22                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.21&r2=1.22

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xfconf.eclass	27 Jan 2011 17:32:49 -0000	1.21
+++ xfconf.eclass	4 Feb 2011 17:23:35 -0000	1.22
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.21 2011/01/27 17:32:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.22 2011/02/04 17:23:35 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -100,7 +100,7 @@
 	base_src_prepare
 
 	if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
-		intltoolize --force --copy --automake || die "intltoolize failed"
+		intltoolize --force --copy --automake || die
 	fi
 
 	if [[ "${EAUTORECONF}" == "yes" ]]; then
@@ -121,7 +121,7 @@
 	if [[ "$(declare -p XFCONF 2>/dev/null 2>&1)" != "declare -a"* ]]; then
 		XFCONF=( ${XFCONF} )
 	fi
-	
+
 	econf ${XFCONF[@]}
 }
 
@@ -131,7 +131,7 @@
 xfconf_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 	has src_configure ${XFCONF_EXPF} || xfconf_src_configure
-	emake || die "emake failed"
+	emake || die
 }
 
 # @FUNCTION: xfconf_src_install
@@ -139,10 +139,10 @@
 # Run emake install and install documentation in DOCS variable
 xfconf_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
-	emake DESTDIR="${D}" "$@" install || die "emake install failed"
+	emake DESTDIR="${D}" "$@" install || die
 
 	if [[ -n ${DOCS} ]]; then
-		dodoc ${DOCS} || die "dodoc failed"
+		dodoc ${DOCS} || die
 	fi
 
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/02/10 18:14:53

  Modified:             xfconf.eclass
  Log:
  Remove support for deprecated EAPIs 0 1 and 2

Revision  Changes    Path
1.23                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.22&r2=1.23

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xfconf.eclass	4 Feb 2011 17:23:35 -0000	1.22
+++ xfconf.eclass	10 Feb 2011 18:14:53 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.22 2011/02/04 17:23:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.23 2011/02/10 18:14:53 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -54,13 +54,12 @@
 unset _xfce4_intltool
 unset _xfce4_m4
 
-XFCONF_EXPF="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
 case ${EAPI:-0} in
-	4|3|2) XFCONF_EXPF="${XFCONF_EXPF} src_prepare src_configure" ;;
-	1|0) ;;
+	4|3) ;;
 	*) die "Unknown EAPI." ;;
 esac
-EXPORT_FUNCTIONS ${XFCONF_EXPF}
+
+EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
 
 # @FUNCTION: xfconf_use_debug
 # @DESCRIPTION:
@@ -82,16 +81,6 @@
 	fi
 }
 
-# @FUNCTION: xfconf_src_unpack
-# @DESCRIPTION:
-# Run base_src_util autopatch and eautoreconf or elibtoolize
-xfconf_src_unpack() {
-	debug-print-function ${FUNCNAME} "$@"
-	unpack ${A}
-	cd "${S}"
-	has src_prepare ${XFCONF_EXPF} || xfconf_src_prepare
-}
-
 # @FUNCTION: xfconf_src_prepare
 # @DESCRIPTION:
 # Run base_src_util autopatch and eautoreconf or elibtoolize
@@ -104,7 +93,6 @@
 	fi
 
 	if [[ "${EAUTORECONF}" == "yes" ]]; then
-		has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
 		AT_M4DIR="${EPREFIX}/usr/share/xfce4/dev-tools/m4macros" eautoreconf
 	else
 		elibtoolize
@@ -125,15 +113,6 @@
 	econf ${XFCONF[@]}
 }
 
-# @FUNCTION: xfconf_src_compile
-# @DESCRIPTION:
-# Run econf with opts in XFCONF variable
-xfconf_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-	has src_configure ${XFCONF_EXPF} || xfconf_src_configure
-	emake || die
-}
-
 # @FUNCTION: xfconf_src_install
 # @DESCRIPTION:
 # Run emake install and install documentation in DOCS variable
@@ -145,7 +124,6 @@
 		dodoc ${DOCS} || die
 	fi
 
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	find "${ED}" -name '*.la' -exec rm -f {} +
 
 	validate_desktop_entries

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/02/14 19:52:14

  Modified:             xfconf.eclass
  Log:
  raise minimal xfce4-dev-tools version to 4.8.0

Revision  Changes    Path
1.24                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.23&r2=1.24

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xfconf.eclass	10 Feb 2011 18:14:53 -0000	1.23
+++ xfconf.eclass	14 Feb 2011 19:52:14 -0000	1.24
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.23 2011/02/10 18:14:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.24 2011/02/14 19:52:14 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -44,7 +44,7 @@
 fi
 
 if [[ "${EAUTORECONF}" == "yes" ]]; then
-	_xfce4_m4=">=dev-util/xfce4-dev-tools-4.7.0"
+	_xfce4_m4=">=dev-util/xfce4-dev-tools-4.8.0"
 fi
 
 RDEPEND=""

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/04/09 09:15:51

  Modified:             xfconf.eclass
  Log:
  Fix xfconf.eclass xfconf_use_debug logic so it'll be compatible with 9999 versions in the overlay. Yes, we really don't want --disable-debug EVER and we WANT --enable-debug=minimum by default. It's the upstream default too.

Revision  Changes    Path
1.25                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.24&r2=1.25

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xfconf.eclass	14 Feb 2011 19:52:14 -0000	1.24
+++ xfconf.eclass	9 Apr 2011 09:15:51 -0000	1.25
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.24 2011/02/14 19:52:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.25 2011/04/09 09:15:51 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -63,8 +63,9 @@
 
 # @FUNCTION: xfconf_use_debug
 # @DESCRIPTION:
-# Return --enable-debug, null, --enable-debug=full or --disable-debug based on
-# XFCONF_FULL_DEBUG variable and USE debug
+# If IUSE has debug, return --enable-debug=minimum.
+# If USE debug is enabled, return --enable-debug which is same as --enable-debug=yes.
+# If USE debug is enabled and XFCONF_FULL_DEBUG variable is set, return --enable-debug=full.
 xfconf_use_debug() {
 	if has debug ${IUSE}; then
 		if use debug; then
@@ -74,9 +75,7 @@
 				echo "--enable-debug"
 			fi
 		else
-			if [[ -n $XFCONF_FULL_DEBUG ]]; then
-				echo "--disable-debug"
-			fi
+			echo "--enable-debug=minimum"
 		fi
 	fi
 }

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/04/09 17:58:05

  Modified:             xfconf.eclass
  Log:
  Remove XFCONF variable support. It's mandatory as an array now.

Revision  Changes    Path
1.26                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.25&r2=1.26

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xfconf.eclass	9 Apr 2011 09:15:51 -0000	1.25
+++ xfconf.eclass	9 Apr 2011 17:58:05 -0000	1.26
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.25 2011/04/09 09:15:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.26 2011/04/09 17:58:05 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -103,12 +103,6 @@
 # Run econf with opts in XFCONF array
 xfconf_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
-
-	# Convert XFCONF to an array, see base.eclass for original code
-	if [[ "$(declare -p XFCONF 2>/dev/null 2>&1)" != "declare -a"* ]]; then
-		XFCONF=( ${XFCONF} )
-	fi
-
 	econf ${XFCONF[@]}
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/04/09 18:00:29

  Modified:             xfconf.eclass
  Log:
  Punt code for SRC_URI, it's handled in the ebuilds because it's not consistent to keep here

Revision  Changes    Path
1.27                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.26&r2=1.27

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xfconf.eclass	9 Apr 2011 17:58:05 -0000	1.26
+++ xfconf.eclass	9 Apr 2011 18:00:29 -0000	1.27
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.26 2011/04/09 17:58:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.27 2011/04/09 18:00:29 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -31,14 +31,6 @@
 
 inherit autotools base eutils fdo-mime gnome2-utils libtool
 
-if ! [[ ${MY_P} ]]; then
-	MY_P=${P}
-else
-	S=${WORKDIR}/${MY_P}
-fi
-
-SRC_URI="mirror://xfce/xfce/${PV}/src/${MY_P}.tar.bz2"
-
 if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
 	_xfce4_intltool="dev-util/intltool"
 fi

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/04/10 18:13:35

  Modified:             xfconf.eclass
  Log:
  Simply check if EINTLTOOLIZE and EAUTORECONF is set or not, to support other formats such as true or 1

Revision  Changes    Path
1.28                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.27&r2=1.28

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xfconf.eclass	9 Apr 2011 18:00:29 -0000	1.27
+++ xfconf.eclass	10 Apr 2011 18:13:35 -0000	1.28
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.27 2011/04/09 18:00:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.28 2011/04/10 18:13:35 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -31,11 +31,11 @@
 
 inherit autotools base eutils fdo-mime gnome2-utils libtool
 
-if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
+if [[ -n $EINTLTOOLIZE ]]; then
 	_xfce4_intltool="dev-util/intltool"
 fi
 
-if [[ "${EAUTORECONF}" == "yes" ]]; then
+if [[ -n $EAUTORECONF ]]; then
 	_xfce4_m4=">=dev-util/xfce4-dev-tools-4.8.0"
 fi
 

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/04/10 18:20:53

  Modified:             xfconf.eclass
  Log:
  Fixes for manpage

Revision  Changes    Path
1.29                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.28&r2=1.29

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xfconf.eclass	10 Apr 2011 18:13:35 -0000	1.28
+++ xfconf.eclass	10 Apr 2011 18:20:53 -0000	1.29
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.28 2011/04/10 18:13:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.29 2011/04/10 18:20:53 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -11,23 +11,23 @@
 
 # @ECLASS-VARIABLE: EAUTORECONF
 # @DESCRIPTION:
-# Run eautoreconf instead of elibtoolize if set "yes"
+# Run eautoreconf instead of elibtoolize if the variable is set.
 
 # @ECLASS-VARIABLE: EINTLTOOLIZE
 # @DESCRIPTION:
-# Run intltoolize --force --copy --automake if set "yes"
+# Run intltoolize --force --copy --automake if the variable is set.
 
 # @ECLASS-VARIABLE: DOCS
 # @DESCRIPTION:
-# Define documentation to install
+# This should be an variable defining documentation to install.
 
 # @ECLASS-VARIABLE: PATCHES
 # @DESCRIPTION:
-# Define patches to apply
+# This should be an array defining patches to apply.
 
 # @ECLASS-VARIABLE: XFCONF
 # @DESCRIPTION:
-# Define options for econf
+# This should be an array defining arguments for econf.
 
 inherit autotools base eutils fdo-mime gnome2-utils libtool
 

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/04/10 18:25:08

  Modified:             xfconf.eclass
  Log:
  Fix previous commit and fix all the code

Revision  Changes    Path
1.30                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.29&r2=1.30

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xfconf.eclass	10 Apr 2011 18:20:53 -0000	1.29
+++ xfconf.eclass	10 Apr 2011 18:25:08 -0000	1.30
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.29 2011/04/10 18:20:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.30 2011/04/10 18:25:08 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -79,11 +79,11 @@
 	debug-print-function ${FUNCNAME} "$@"
 	base_src_prepare
 
-	if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
+	if [[ -n $EINTLTOOLIZE ]]; then
 		intltoolize --force --copy --automake || die
 	fi
 
-	if [[ "${EAUTORECONF}" == "yes" ]]; then
+	if [[ -n $EAUTORECONF ]]; then
 		AT_M4DIR="${EPREFIX}/usr/share/xfce4/dev-tools/m4macros" eautoreconf
 	else
 		elibtoolize

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Christoph Mende (angelos)]

angelos     11/04/20 21:04:10

  Modified:             xfconf.eclass
  Log:
  Improve documentation

Revision  Changes    Path
1.31                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.30&r2=1.31

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xfconf.eclass	10 Apr 2011 18:25:08 -0000	1.30
+++ xfconf.eclass	20 Apr 2011 21:04:10 -0000	1.31
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.30 2011/04/10 18:25:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.31 2011/04/20 21:04:10 angelos Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -11,23 +11,23 @@
 
 # @ECLASS-VARIABLE: EAUTORECONF
 # @DESCRIPTION:
-# Run eautoreconf instead of elibtoolize if the variable is set.
+# Run eautoreconf instead of elibtoolize if the variable is set
 
 # @ECLASS-VARIABLE: EINTLTOOLIZE
 # @DESCRIPTION:
-# Run intltoolize --force --copy --automake if the variable is set.
+# Run intltoolize --force --copy --automake if the variable is set
 
 # @ECLASS-VARIABLE: DOCS
 # @DESCRIPTION:
-# This should be an variable defining documentation to install.
+# This should be a variable defining documentation to install
 
 # @ECLASS-VARIABLE: PATCHES
 # @DESCRIPTION:
-# This should be an array defining patches to apply.
+# This should be an array defining patches to apply
 
 # @ECLASS-VARIABLE: XFCONF
 # @DESCRIPTION:
-# This should be an array defining arguments for econf.
+# This should be an array defining arguments for econf
 
 inherit autotools base eutils fdo-mime gnome2-utils libtool
 
@@ -56,8 +56,8 @@
 # @FUNCTION: xfconf_use_debug
 # @DESCRIPTION:
 # If IUSE has debug, return --enable-debug=minimum.
-# If USE debug is enabled, return --enable-debug which is same as --enable-debug=yes.
-# If USE debug is enabled and XFCONF_FULL_DEBUG variable is set, return --enable-debug=full.
+# If USE debug is enabled, return --enable-debug which is the same as --enable-debug=yes.
+# If USE debug is enabled and the XFCONF_FULL_DEBUG variable is set, return --enable-debug=full.
 xfconf_use_debug() {
 	if has debug ${IUSE}; then
 		if use debug; then
@@ -92,7 +92,7 @@
 
 # @FUNCTION: xfconf_src_configure
 # @DESCRIPTION:
-# Run econf with opts in XFCONF array
+# Run econf with opts from the XFCONF array
 xfconf_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 	econf ${XFCONF[@]}
@@ -100,7 +100,7 @@
 
 # @FUNCTION: xfconf_src_install
 # @DESCRIPTION:
-# Run emake install and install documentation in DOCS variable
+# Run emake install and install documentation in the DOCS variable
 xfconf_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 	emake DESTDIR="${D}" "$@" install || die

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/04/30 07:38:34

  Modified:             xfconf.eclass
  Log:
  Add support for DOCS being an array with backward compat

Revision  Changes    Path
1.32                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.31&r2=1.32

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xfconf.eclass	20 Apr 2011 21:04:10 -0000	1.31
+++ xfconf.eclass	30 Apr 2011 07:38:34 -0000	1.32
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.31 2011/04/20 21:04:10 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.32 2011/04/30 07:38:34 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -19,7 +19,7 @@
 
 # @ECLASS-VARIABLE: DOCS
 # @DESCRIPTION:
-# This should be a variable defining documentation to install
+# This should be an array defining documentation to install
 
 # @ECLASS-VARIABLE: PATCHES
 # @DESCRIPTION:
@@ -74,7 +74,7 @@
 
 # @FUNCTION: xfconf_src_prepare
 # @DESCRIPTION:
-# Run base_src_util autopatch and eautoreconf or elibtoolize
+# Run base_src_prepare and eautoreconf or elibtoolize
 xfconf_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 	base_src_prepare
@@ -84,7 +84,7 @@
 	fi
 
 	if [[ -n $EAUTORECONF ]]; then
-		AT_M4DIR="${EPREFIX}/usr/share/xfce4/dev-tools/m4macros" eautoreconf
+		AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eautoreconf
 	else
 		elibtoolize
 	fi
@@ -95,7 +95,7 @@
 # Run econf with opts from the XFCONF array
 xfconf_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
-	econf ${XFCONF[@]}
+	econf "${XFCONF[@]}"
 }
 
 # @FUNCTION: xfconf_src_install
@@ -105,8 +105,12 @@
 	debug-print-function ${FUNCNAME} "$@"
 	emake DESTDIR="${D}" "$@" install || die
 
-	if [[ -n ${DOCS} ]]; then
-		dodoc ${DOCS} || die
+	if [[ -n ${DOCS[@]} ]]; then
+		if [[ $(declare -p DOCS) == "declare -a "* ]]; then
+			dodoc "${DOCS[@]}" || die
+		else
+			dodoc ${DOCS} || die
+		fi
 	fi
 
 	find "${ED}" -name '*.la' -exec rm -f {} +

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/05/01 11:46:49

  Modified:             xfconf.eclass
  Log:
  Add similar output to eautoreconf to intltoolize

Revision  Changes    Path
1.33                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.32&r2=1.33

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xfconf.eclass	30 Apr 2011 07:38:34 -0000	1.32
+++ xfconf.eclass	1 May 2011 11:46:49 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.32 2011/04/30 07:38:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.33 2011/05/01 11:46:49 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -80,7 +80,10 @@
 	base_src_prepare
 
 	if [[ -n $EINTLTOOLIZE ]]; then
-		intltoolize --force --copy --automake || die
+		local _intltoolize="intltoolize --force --copy --automake"
+		ebegin "Running ${_intltoolize}"
+		${_intltoolize} || die
+		eend $?
 	fi
 
 	if [[ -n $EAUTORECONF ]]; then

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/05/19 22:39:07

  Modified:             xfconf.eclass
  Log:
  DOCS has to be an array now, all ebuilds are migrated

Revision  Changes    Path
1.34                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.33&r2=1.34

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xfconf.eclass	1 May 2011 11:46:49 -0000	1.33
+++ xfconf.eclass	19 May 2011 22:39:07 -0000	1.34
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.33 2011/05/01 11:46:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.34 2011/05/19 22:39:07 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -103,18 +103,12 @@
 
 # @FUNCTION: xfconf_src_install
 # @DESCRIPTION:
-# Run emake install and install documentation in the DOCS variable
+# Run emake install and install documentation in the DOCS array
 xfconf_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 	emake DESTDIR="${D}" "$@" install || die
 
-	if [[ -n ${DOCS[@]} ]]; then
-		if [[ $(declare -p DOCS) == "declare -a "* ]]; then
-			dodoc "${DOCS[@]}" || die
-		else
-			dodoc ${DOCS} || die
-		fi
-	fi
+	[[ -n ${DOCS[@]} ]] && dodoc "${DOCS[@]}"
 
 	find "${ED}" -name '*.la' -exec rm -f {} +
 

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Christoph Mende (angelos)]

angelos     11/06/06 14:38:46

  Modified:             xfconf.eclass
  Log:
  Warn when using xfconf_use_debug without having debug in IUSE

Revision  Changes    Path
1.35                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.34&r2=1.35

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xfconf.eclass	19 May 2011 22:39:07 -0000	1.34
+++ xfconf.eclass	6 Jun 2011 14:38:46 -0000	1.35
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.34 2011/05/19 22:39:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.35 2011/06/06 14:38:46 angelos Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -69,6 +69,8 @@
 		else
 			echo "--enable-debug=minimum"
 		fi
+	else
+		ewarn "${FUNCNAME} called without debug in IUSE"
 	fi
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Christoph Mende (angelos)]

angelos     11/06/13 18:01:12

  Modified:             xfconf.eclass
  Log:
  Implement live functionality

Revision  Changes    Path
1.36                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.35&r2=1.36

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xfconf.eclass	6 Jun 2011 14:38:46 -0000	1.35
+++ xfconf.eclass	13 Jun 2011 18:01:11 -0000	1.36
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.35 2011/06/06 14:38:46 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.36 2011/06/13 18:01:11 angelos Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -17,41 +17,39 @@
 # @DESCRIPTION:
 # Run intltoolize --force --copy --automake if the variable is set
 
-# @ECLASS-VARIABLE: DOCS
-# @DESCRIPTION:
-# This should be an array defining documentation to install
-
-# @ECLASS-VARIABLE: PATCHES
-# @DESCRIPTION:
-# This should be an array defining patches to apply
-
 # @ECLASS-VARIABLE: XFCONF
 # @DESCRIPTION:
 # This should be an array defining arguments for econf
 
-inherit autotools base eutils fdo-mime gnome2-utils libtool
+unset _xfconf_live
+[[ $PV == *9999* ]] && _xfconf_live=git-2
+
+inherit ${_xfconf_live} autotools base eutils fdo-mime gnome2-utils libtool
+
+EGIT_BOOTSTRAP="autogen.sh"
+EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
+
+_xfconf_deps=""
+_xfconf_m4=">=dev-util/xfce4-dev-tools-4.8.0"
 
-if [[ -n $EINTLTOOLIZE ]]; then
-	_xfce4_intltool="dev-util/intltool"
-fi
-
-if [[ -n $EAUTORECONF ]]; then
-	_xfce4_m4=">=dev-util/xfce4-dev-tools-4.8.0"
-fi
+[[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}"
+[[ -n $EINTLTOOLIZE ]] && _xfconf_deps+=" dev-util/intltool"
+[[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}"
 
 RDEPEND=""
-DEPEND="${_xfce4_intltool}
-	${_xfce4_m4}"
+DEPEND="${_xfconf_deps}"
 
-unset _xfce4_intltool
-unset _xfce4_m4
+unset _xfconf_deps
+unset _xfconf_m4
 
 case ${EAPI:-0} in
 	4|3) ;;
 	*) die "Unknown EAPI." ;;
 esac
 
-EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
+[[ -n $_xfconf_live ]] && _xfconf_live=src_unpack
+
+EXPORT_FUNCTIONS ${_xfconf_live} src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
 
 # @FUNCTION: xfconf_use_debug
 # @DESCRIPTION:
@@ -74,6 +72,13 @@
 	fi
 }
 
+# @FUNCTION: xfconf_src_unpack
+# @DESCRIPTION:
+# Run git-2_src_unpack if required
+xfconf_src_unpack() {
+	NOCONFIGURE=1 git-2_src_unpack
+}
+
 # @FUNCTION: xfconf_src_prepare
 # @DESCRIPTION:
 # Run base_src_prepare and eautoreconf or elibtoolize
@@ -100,6 +105,7 @@
 # Run econf with opts from the XFCONF array
 xfconf_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
+	[[ -n $_xfconf_live ]] && XFCONF+=( --enable-maintainer-mode )
 	econf "${XFCONF[@]}"
 }
 
@@ -108,9 +114,13 @@
 # Run emake install and install documentation in the DOCS array
 xfconf_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
-	emake DESTDIR="${D}" "$@" install || die
 
-	[[ -n ${DOCS[@]} ]] && dodoc "${DOCS[@]}"
+	# FIXME
+	if [[ -n $_xfconf_live ]] && ! [[ -e ChangeLog ]]; then
+		touch ChangeLog
+	fi
+
+	base_src_install "$@" || die
 
 	find "${ED}" -name '*.la' -exec rm -f {} +
 

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/10/15 21:08:59

  Modified:             xfconf.eclass
  Log:
  Remove support for deprecated EAPI=3.

Revision  Changes    Path
1.37                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.36&r2=1.37

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xfconf.eclass	13 Jun 2011 18:01:11 -0000	1.36
+++ xfconf.eclass	15 Oct 2011 21:08:59 -0000	1.37
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.36 2011/06/13 18:01:11 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.37 2011/10/15 21:08:59 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -43,7 +43,7 @@
 unset _xfconf_m4
 
 case ${EAPI:-0} in
-	4|3) ;;
+	4) ;;
 	*) die "Unknown EAPI." ;;
 esac
 

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/12/03 16:54:44

  Modified:             xfconf.eclass
  Log:
  Only depend on AUTOTOOLS_DEPEND when pulling xfce4-dev-tools, so use AUTOTOOLS_AUTO_DEPEND=no

Revision  Changes    Path
1.38                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.37&r2=1.38

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xfconf.eclass	15 Oct 2011 21:08:59 -0000	1.37
+++ xfconf.eclass	3 Dec 2011 16:54:44 -0000	1.38
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.37 2011/10/15 21:08:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.38 2011/12/03 16:54:44 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -21,6 +21,8 @@
 # @DESCRIPTION:
 # This should be an array defining arguments for econf
 
+AUTOTOOLS_AUTO_DEPEND="no"
+
 unset _xfconf_live
 [[ $PV == *9999* ]] && _xfconf_live=git-2
 
@@ -30,7 +32,7 @@
 EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
 
 _xfconf_deps=""
-_xfconf_m4=">=dev-util/xfce4-dev-tools-4.8.0"
+_xfconf_m4=">=dev-util/xfce4-dev-tools-4.8.0 ${AUTOTOOLS_DEPEND}"
 
 [[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}"
 [[ -n $EINTLTOOLIZE ]] && _xfconf_deps+=" dev-util/intltool"

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    12/05/22 10:57:17

  Modified:             xfconf.eclass
  Log:
  Punt support for running intltoolize --force --copy --automake, because autotools.eclass will do this now for us.

Revision  Changes    Path
1.41                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.40&r2=1.41

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xfconf.eclass	16 Jan 2012 21:14:13 -0000	1.40
+++ xfconf.eclass	22 May 2012 10:57:17 -0000	1.41
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.40 2012/01/16 21:14:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.41 2012/05/22 10:57:17 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -13,10 +13,6 @@
 # @DESCRIPTION:
 # Run eautoreconf instead of elibtoolize if the variable is set
 
-# @ECLASS-VARIABLE: EINTLTOOLIZE
-# @DESCRIPTION:
-# Run intltoolize --force --copy --automake if the variable is set
-
 # @ECLASS-VARIABLE: XFCONF
 # @DESCRIPTION:
 # This should be an array defining arguments for econf
@@ -35,7 +31,6 @@
 _xfconf_m4=">=dev-util/xfce4-dev-tools-4.9.1 ${AUTOTOOLS_DEPEND}"
 
 [[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}"
-[[ -n $EINTLTOOLIZE ]] && _xfconf_deps+=" dev-util/intltool"
 [[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}"
 
 RDEPEND=""
@@ -88,13 +83,6 @@
 	debug-print-function ${FUNCNAME} "$@"
 	base_src_prepare
 
-	if [[ -n $EINTLTOOLIZE ]]; then
-		local _intltoolize="intltoolize --force --copy --automake"
-		ebegin "Running ${_intltoolize}"
-		${_intltoolize} || die
-		eend $?
-	fi
-
 	if [[ -n $EAUTORECONF ]]; then
 		AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eautoreconf
 	else

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    12/07/02 08:43:37

  Modified:             xfconf.eclass
  Log:
  Raise xfce4-dev-tools dependency to 4.10 wrt #416233, Comment #12

Revision  Changes    Path
1.42                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.41&r2=1.42

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xfconf.eclass	22 May 2012 10:57:17 -0000	1.41
+++ xfconf.eclass	2 Jul 2012 08:43:37 -0000	1.42
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.41 2012/05/22 10:57:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.42 2012/07/02 08:43:37 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -17,18 +17,18 @@
 # @DESCRIPTION:
 # This should be an array defining arguments for econf
 
-AUTOTOOLS_AUTO_DEPEND="no"
+AUTOTOOLS_AUTO_DEPEND=no
 
 unset _xfconf_live
 [[ $PV == *9999* ]] && _xfconf_live=git-2
 
 inherit ${_xfconf_live} autotools base eutils fdo-mime gnome2-utils libtool
 
-EGIT_BOOTSTRAP="autogen.sh"
+EGIT_BOOTSTRAP=autogen.sh
 EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
 
 _xfconf_deps=""
-_xfconf_m4=">=dev-util/xfce4-dev-tools-4.9.1 ${AUTOTOOLS_DEPEND}"
+_xfconf_m4=">=dev-util/xfce4-dev-tools-4.10 ${AUTOTOOLS_DEPEND}"
 
 [[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}"
 [[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}"

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    12/09/02 07:58:15

  Modified:             xfconf.eclass
  Log:
  Drop desktop file validate foo and let the PM handle it as the best it can. It was really here for the 4.10 bumping period for QA anyways, and the time has passed. Convert to prune_libtool_files and use the --all argument since we always want all, Xfce never installs any static archives nor uses libltdl

Revision  Changes    Path
1.43                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.42&r2=1.43

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xfconf.eclass	2 Jul 2012 08:43:37 -0000	1.42
+++ xfconf.eclass	2 Sep 2012 07:58:15 -0000	1.43
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.42 2012/07/02 08:43:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.43 2012/09/02 07:58:15 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -112,9 +112,7 @@
 
 	base_src_install "$@" || die
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	validate_desktop_entries
+	prune_libtool_files --all
 }
 
 # @FUNCTION: xfconf_pkg_preinst

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    12/11/28 12:41:23

  Modified:             xfconf.eclass
  Log:
  Remove support for EAPI=4 to force EAPI=5 and verbose build.log everywhere

Revision  Changes    Path
1.45                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.44&r2=1.45

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xfconf.eclass	27 Sep 2012 16:35:42 -0000	1.44
+++ xfconf.eclass	28 Nov 2012 12:41:23 -0000	1.45
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.44 2012/09/27 16:35:42 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.45 2012/11/28 12:41:23 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -40,7 +40,7 @@
 unset _xfconf_m4
 
 case ${EAPI:-0} in
-	4|5) ;;
+	5) ;;
 	*) die "Unknown EAPI." ;;
 esac
 

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Samuli Suominen (ssuominen)]

ssuominen    14/02/27 17:12:01

  Modified:             xfconf.eclass
  Log:
  get rid of base.eclass, mostly thanks to einstalldocs introduction to eutils, thanks to creffert for some hints

Revision  Changes    Path
1.46                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.45&r2=1.46

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xfconf.eclass	28 Nov 2012 12:41:23 -0000	1.45
+++ xfconf.eclass	27 Feb 2014 17:12:01 -0000	1.46
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.45 2012/11/28 12:41:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.46 2014/02/27 17:12:01 ssuominen Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -22,7 +22,7 @@
 unset _xfconf_live
 [[ $PV == *9999* ]] && _xfconf_live=git-2
 
-inherit ${_xfconf_live} autotools base eutils fdo-mime gnome2-utils libtool
+inherit ${_xfconf_live} autotools eutils fdo-mime gnome2-utils libtool
 
 EGIT_BOOTSTRAP=autogen.sh
 EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
@@ -78,10 +78,13 @@
 
 # @FUNCTION: xfconf_src_prepare
 # @DESCRIPTION:
-# Run base_src_prepare and eautoreconf or elibtoolize
+# Process PATCHES with epatch and run epatch_user followed by run of
+# elibtoolize, or eautoreconf if EAUTORECONF is set.
 xfconf_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
-	base_src_prepare
+
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	epatch_user
 
 	if [[ -n $EAUTORECONF ]]; then
 		AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eautoreconf
@@ -101,7 +104,8 @@
 
 # @FUNCTION: xfconf_src_install
 # @DESCRIPTION:
-# Run emake install and install documentation in the DOCS array
+# Run emake install to DESTDIR, einstalldocs to process DOCS and
+# prune_libtool_files --all to always remove libtool files (.la)
 xfconf_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -110,7 +114,9 @@
 		touch ChangeLog
 	fi
 
-	base_src_install "$@" || die
+	emake DESTDIR="${D}" "$@" install
+
+	einstalldocs
 
 	prune_libtool_files --all
 }

[gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass

[Mike Frysinger (vapier)]

vapier      14/11/15 07:49:11

  Modified:             xfconf.eclass
  Log:
  set AUTOTOOLS_AUTO_DEPEND based on EAUTORECONF so that we do not clobber earlier settings #409611 by Michał Górny

Revision  Changes    Path
1.47                 eclass/xfconf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.46&r2=1.47

Index: xfconf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xfconf.eclass	27 Feb 2014 17:12:01 -0000	1.46
+++ xfconf.eclass	15 Nov 2014 07:49:11 -0000	1.47
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.46 2014/02/27 17:12:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.47 2014/11/15 07:49:11 vapier Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -13,12 +13,16 @@
 # @DESCRIPTION:
 # Run eautoreconf instead of elibtoolize if the variable is set
 
+if [[ -n ${EAUTORECONF} ]] ; then
+	AUTOTOOLS_AUTO_DEPEND=yes
+else
+	: ${AUTOTOOLS_AUTO_DEPEND:=no}
+fi
+
 # @ECLASS-VARIABLE: XFCONF
 # @DESCRIPTION:
 # This should be an array defining arguments for econf
 
-AUTOTOOLS_AUTO_DEPEND=no
-
 unset _xfconf_live
 [[ $PV == *9999* ]] && _xfconf_live=git-2
 
@@ -28,7 +32,7 @@
 EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
 
 _xfconf_deps=""
-_xfconf_m4=">=dev-util/xfce4-dev-tools-4.10 ${AUTOTOOLS_DEPEND}"
+_xfconf_m4=">=dev-util/xfce4-dev-tools-4.10"
 
 [[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}"
 [[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}"