* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2008-11-25 23:52 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2008-11-25 23:52 UTC (permalink / raw
To: gentoo-commits
loki_val 08/11/25 23:52:04
Added: gtk-sharp-module.eclass
Log:
eclass required for gnome-sharp and gnome-desktop-sharp packages
Revision Changes Path
1.1 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.1&content-type=text/plain
Index: gtk-sharp-module.eclass
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.1 2008/11/25 23:52:03 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
# Note that this breaks compatibility with the original gtk-sharp-component
# eclass.
inherit eutils mono multilib autotools
# Get the name of the component to build and the build dir; by default,
# extract it from the ebuild's name.
GTK_SHARP_MODULE=${GTK_SHARP_MODULE:=${PN/-sharp/}}
GTK_SHARP_MODULE_DIR=${GTK_SHARP_MODULE_DIR:=${PN/-sharp/}}
# In some cases the desired module cannot be configured to be built on its own.
# This variable allows for the setting of additional configure-deps.
GTK_SHARP_MODULE_DEPS="${GTK_SHARP_MODULE_DEPS}"
# Allow ebuilds to set a value for the required GtkSharp version; default to
# ${PV}.
GTK_SHARP_REQUIRED_VERSION=${GTK_SHARP_REQUIRED_VERSION:=${PV%.*}}
# Version number used to differentiate between unversioned 1.0 series and the
# versioned 2.0 series (2.0 series has 2 or 2.0 appended to various paths and
# scripts). Default to ${SLOT}.
GTK_SHARP_SLOT="${GTK_SHARP_SLOT:=${SLOT}}"
GTK_SHARP_SLOT_DEC="${GTK_SHARP_SLOT_DEC:=-${GTK_SHARP_SLOT}.0}"
# Set some defaults.
DESCRIPTION="GtkSharp's ${GTK_SHARP_MODULE} module"
HOMEPAGE="http://www.mono-project.com/GtkSharp"
LICENSE="LGPL-2.1"
DEPEND="=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*
>=sys-apps/sed-4"
RESTRICT="test"
# The GtkSharp modules are currently divided into three seperate tarball
# distributions. Figure out which of these our component belongs to. This is
# done to avoid passing bogus configure parameters, as well as to return the
# correct tarball to download. Note that this makes ${GTK_SHARP_TARBALL_PREFIX}
# obsolete.
gtk_sharp_module_list="glade"
gnome_sharp_module_list="art gnome gnomevfs"
gnome_desktop_sharp_module_list="gnome-print gnome-panel gtkhtml gtksourceview nautilusburn rsvg vte wnck"
if [[ " ${gtk_sharp_module_list} " == *" ${GTK_SHARP_MODULE} "* ]] ; then
my_module_list="${gtk_sharp_module_list}"
my_tarball="gtk-sharp"
elif [[ " ${gnome_sharp_module_list} " == *" ${GTK_SHARP_MODULE} "* ]] ; then
my_module_list="${gnome_sharp_module_list}"
my_tarball="gnome-sharp"
# While gnome-desktop-sharp is a part of gnome-desktop-sharp (0_o) it is not a
# configurable component, so we don't want to put it into the module list.
# Result is that we have to check for it manually here and in src_configure.
elif [[ " ${gnome_desktop_sharp_module_list} " == *" ${GTK_SHARP_MODULE} "* ||
"${GTK_SHARP_MODULE}" == "gnome-desktop" ]] ; then
my_module_list="${gnome_desktop_sharp_module_list}"
my_tarball="gnome-desktop-sharp"
else
die "unknown GtkSharp module: ${GTK_SHARP_MODULE}"
fi
MY_P=${my_tarball}-${PV}
S=${WORKDIR}/${MY_P}
# Since all interesting versions are hosted on the GNOME server anyway it's the
# only one we support, for now.
SRC_URI="mirror://gnome/sources/${my_tarball}/${PV%.*}/${MY_P}.tar.bz2
mirror://gentoo/${MY_P}-configurable.diff.gz
http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${MY_P}-configurable.diff.gz"
### Public functions.
gtk-sharp-module_fix_files() {
# Change references like "/r:../glib/glib-sharp.dll" ->
# "/r:${GTK_SHARP_LIB_DIR}/glib-sharp.dll" and references like
# "../glib/glib-sharp.xml" or "$(top_srcdir)/glib/glib-sharp.xml" ->
# "${GAPI_DIR}/glib-sharp.xml".
#
# We also make sure to call the installed gapi-fixup and gapi-codegen and
# not the ones that would be built locally.
local gapi_dir="${ROOT}/usr/share/gapi${GTK_SHARP_SLOT_DEC}"
local gapi_fixup="gapi${GTK_SHARP_SLOT}-fixup"
local gapi_codegen="gapi${GTK_SHARP_SLOT}-codegen"
# This is very likely to be of use outside of this function as well, so make
# it public.
GTK_SHARP_LIB_DIR="${ROOT}/usr/$(get_libdir)/mono/gtk-sharp${GTK_SHARP_SLOT_DEC}"
local makefiles="$(find ${S} -name Makefile.in)"
sed -i -e "s;\(\.\.\|\$(top_srcdir)\)/[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).xml;${gapi_dir}/\2.xml;g" \
-e "s;/r:\(\.\./\)*[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).dll;/r:${GTK_SHARP_LIB_DIR}/\2.dll;g" \
-e "s;\.\./[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).dll;${GTK_SHARP_LIB_DIR}/\1.dll;g" \
-e "s:\$(SYMBOLS) \$(top_builddir)/parser/gapi-fixup.exe:\$(SYMBOLS):" \
-e "s:\$(INCLUDE_API) \$(top_builddir)/generator/gapi_codegen.exe:\$(INCLUDE_API):" \
-e "s:\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe:${gapi_fixup}:" \
-e "s:\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe:${gapi_codegen}:" \
${makefiles} || die "failed to fix GtkSharp makefiles"
# Oh GtkSharp, why do your pkgconfig entries suck donkey ass? Why do
# gnome-desktop-sharp modules use ${assemblies_dir} for Libs: instead of
# the convention you yourself introduced for gnome-sharp, which just uses
# @PACKAGE_VERSION@? Are you just trying to annoy me?
local pcins="$(find ${S} -name *.pc.in)"
sed -i -e 's:^libdir.*:libdir=@libdir@:' \
-e "s:\${assemblies_dir}:\${libdir}/mono/gtk-sharp${GTK_SHARP_SLOT_DEC}:" \
${pcins} || die "failed to fix GtkSharp pkgconfig entries"
}
gtk-sharp-module_src_prepare() {
# Make selecting components configurable.
epatch ${WORKDIR}/${MY_P}-configurable.diff
# Fixes support with pkgconfig-0.17, #92503.
sed -i -e 's/\<PKG_PATH\>/GTK_SHARP_PKG_PATH/g' \
-e ':^CFLAGS=:d' \
${S}/configure.in
# Fix install data hook, #161093.
if [ -f "${S}/sample/gconf/Makefile.am" ]
then
sed -i -e 's/^install-hook/install-data-hook/' \
${S}/sample/gconf/Makefile.am || die
fi
# Disable building samples, #16015.
sed -i -e "s:sample::" ${S}/Makefile.am || die
eautoreconf
cd ${S}/${GTK_SHARP_MODULE_DIR}
gtk-sharp-module_fix_files
}
gtk-sharp-module_src_configure() {
# Disable any module besides one(s) we want.
local module gtk_sharp_conf
einfo "Configuring to build ${PN} module ..."
# No bogus configure parameters please.
[[ ${GTK_SHARP_MODULE} == "gnome-desktop" ]] && GTK_SHARP_MODULE=
for module in ${GTK_SHARP_MODULE} ${GTK_SHARP_MODULE_DEPS} ; do
my_module_list=${my_module_list/${module}/}
done
for module in ${my_module_list} ; do
gtk_sharp_conf="${gtk_sharp_conf} --disable-${module} "
done
for module in ${GTK_SHARP_MODULE} ${GTK_SHARP_MODULE_DEPS} ; do
gtk_sharp_conf="${gtk_sharp_conf} --enable-${module} "
done
cd ${S}
econf ${@} ${gtk_sharp_conf} || die "econf failed"
}
gtk-sharp-module_src_compile() {
cd ${S}/${GTK_SHARP_MODULE_DIR}
LANG=C emake -j1 || die "emake failed"
}
gtk-sharp-module_src_install() {
cd ${GTK_SHARP_MODULE_DIR}
LANG=C emake GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) /package gtk-sharp${GTK_SHARP_SLOT_DEC}" \
DESTDIR=${D} install || die "emake install failed"
}
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2008-11-26 0:54 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2008-11-26 0:54 UTC (permalink / raw
To: gentoo-commits
loki_val 08/11/26 00:54:41
Modified: gtk-sharp-module.eclass
Log:
sed is only a dep
Revision Changes Path
1.2 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.1&r2=1.2
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-sharp-module.eclass 25 Nov 2008 23:52:03 -0000 1.1
+++ gtk-sharp-module.eclass 26 Nov 2008 00:54:41 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.1 2008/11/25 23:52:03 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.2 2008/11/26 00:54:41 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -37,6 +37,7 @@
DEPEND="=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*
>=sys-apps/sed-4"
+RDEPEND="=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
RESTRICT="test"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2008-11-26 10:03 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2008-11-26 10:03 UTC (permalink / raw
To: gentoo-commits
loki_val 08/11/26 10:03:43
Modified: gtk-sharp-module.eclass
Log:
Add quotes
Revision Changes Path
1.3 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.2&r2=1.3
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-sharp-module.eclass 26 Nov 2008 00:54:41 -0000 1.2
+++ gtk-sharp-module.eclass 26 Nov 2008 10:03:42 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.2 2008/11/26 00:54:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.3 2008/11/26 10:03:42 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -123,21 +123,21 @@
# Fixes support with pkgconfig-0.17, #92503.
sed -i -e 's/\<PKG_PATH\>/GTK_SHARP_PKG_PATH/g' \
-e ':^CFLAGS=:d' \
- ${S}/configure.in
+ "${S}"/configure.in
# Fix install data hook, #161093.
if [ -f "${S}/sample/gconf/Makefile.am" ]
then
sed -i -e 's/^install-hook/install-data-hook/' \
- ${S}/sample/gconf/Makefile.am || die
+ "${S}"/sample/gconf/Makefile.am || die
fi
# Disable building samples, #16015.
- sed -i -e "s:sample::" ${S}/Makefile.am || die
+ sed -i -e "s:sample::" "${S}"/Makefile.am || die
eautoreconf
- cd ${S}/${GTK_SHARP_MODULE_DIR}
+ cd "${S}"/${GTK_SHARP_MODULE_DIR}
gtk-sharp-module_fix_files
}
@@ -161,20 +161,20 @@
gtk_sharp_conf="${gtk_sharp_conf} --enable-${module} "
done
- cd ${S}
+ cd "${S}"
econf ${@} ${gtk_sharp_conf} || die "econf failed"
}
gtk-sharp-module_src_compile() {
- cd ${S}/${GTK_SHARP_MODULE_DIR}
+ cd "${S}"/${GTK_SHARP_MODULE_DIR}
LANG=C emake -j1 || die "emake failed"
}
gtk-sharp-module_src_install() {
cd ${GTK_SHARP_MODULE_DIR}
LANG=C emake GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) /package gtk-sharp${GTK_SHARP_SLOT_DEC}" \
- DESTDIR=${D} install || die "emake install failed"
+ DESTDIR="${D}" install || die "emake install failed"
}
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2008-11-26 14:03 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2008-11-26 14:03 UTC (permalink / raw
To: gentoo-commits
loki_val 08/11/26 14:03:05
Modified: gtk-sharp-module.eclass
Log:
All of the ebuilds currently using eclass build with -j8.
Revision Changes Path
1.4 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.3&r2=1.4
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-sharp-module.eclass 26 Nov 2008 10:03:42 -0000 1.3
+++ gtk-sharp-module.eclass 26 Nov 2008 14:03:05 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.3 2008/11/26 10:03:42 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.4 2008/11/26 14:03:05 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -168,12 +168,12 @@
gtk-sharp-module_src_compile() {
cd "${S}"/${GTK_SHARP_MODULE_DIR}
- LANG=C emake -j1 || die "emake failed"
+ LANG=C emake ${OVERRIDEJOBS} || die "emake failed"
}
gtk-sharp-module_src_install() {
cd ${GTK_SHARP_MODULE_DIR}
- LANG=C emake GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) /package gtk-sharp${GTK_SHARP_SLOT_DEC}" \
+ LANG=C emake ${OVERRIDEJOBS} GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) /package gtk-sharp${GTK_SHARP_SLOT_DEC}" \
DESTDIR="${D}" install || die "emake install failed"
}
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2008-11-27 5:24 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2008-11-27 5:24 UTC (permalink / raw
To: gentoo-commits
loki_val 08/11/27 05:24:23
Modified: gtk-sharp-module.eclass
Log:
It's handy to know these depend on mono if you're making a set.
Revision Changes Path
1.5 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.4&r2=1.5
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtk-sharp-module.eclass 26 Nov 2008 14:03:05 -0000 1.4
+++ gtk-sharp-module.eclass 27 Nov 2008 05:24:23 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.4 2008/11/26 14:03:05 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.5 2008/11/27 05:24:23 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -35,9 +35,10 @@
LICENSE="LGPL-2.1"
-DEPEND="=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*
+RDEPEND="=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*
+ >=dev-lang/mono-2"
+DEPEND="${RDEPEND}
>=sys-apps/sed-4"
-RDEPEND="=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
RESTRICT="test"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2008-11-28 0:20 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2008-11-28 0:20 UTC (permalink / raw
To: gentoo-commits
loki_val 08/11/28 00:20:08
Modified: gtk-sharp-module.eclass
Log:
Major changes to avoid pkg-config files displaying the wrong --libs. Simplifications, quoting fixed.
Revision Changes Path
1.6 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.5&r2=1.6
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk-sharp-module.eclass 27 Nov 2008 05:24:23 -0000 1.5
+++ gtk-sharp-module.eclass 28 Nov 2008 00:20:08 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.5 2008/11/27 05:24:23 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.6 2008/11/28 00:20:08 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -35,10 +35,10 @@
LICENSE="LGPL-2.1"
-RDEPEND="=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*
- >=dev-lang/mono-2"
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4"
+DEPEND="=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*
+ >=sys-apps/sed-4
+ >=dev-util/pkgconfig-0.23"
+RDEPEND="=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
RESTRICT="test"
@@ -47,14 +47,10 @@
# done to avoid passing bogus configure parameters, as well as to return the
# correct tarball to download. Note that this makes ${GTK_SHARP_TARBALL_PREFIX}
# obsolete.
-gtk_sharp_module_list="glade"
gnome_sharp_module_list="art gnome gnomevfs"
gnome_desktop_sharp_module_list="gnome-print gnome-panel gtkhtml gtksourceview nautilusburn rsvg vte wnck"
-if [[ " ${gtk_sharp_module_list} " == *" ${GTK_SHARP_MODULE} "* ]] ; then
- my_module_list="${gtk_sharp_module_list}"
- my_tarball="gtk-sharp"
-elif [[ " ${gnome_sharp_module_list} " == *" ${GTK_SHARP_MODULE} "* ]] ; then
+if [[ " ${gnome_sharp_module_list} " == *" ${GTK_SHARP_MODULE} "* ]] ; then
my_module_list="${gnome_sharp_module_list}"
my_tarball="gnome-sharp"
@@ -82,63 +78,41 @@
### Public functions.
gtk-sharp-module_fix_files() {
- # Change references like "/r:../glib/glib-sharp.dll" ->
- # "/r:${GTK_SHARP_LIB_DIR}/glib-sharp.dll" and references like
+ # Change references like "/r:../art/art-sharp.dll" ->
+ # "/r:/usr/lib/pkgconfig/../../lib/mono/gtk-sharp-2.0/art-sharp.dll" and references like
# "../glib/glib-sharp.xml" or "$(top_srcdir)/glib/glib-sharp.xml" ->
- # "${GAPI_DIR}/glib-sharp.xml".
+ # "${gapi_dir}/glib-sharp.xml".
#
# We also make sure to call the installed gapi-fixup and gapi-codegen and
# not the ones that would be built locally.
local gapi_dir="${ROOT}/usr/share/gapi${GTK_SHARP_SLOT_DEC}"
- local gapi_fixup="gapi${GTK_SHARP_SLOT}-fixup"
- local gapi_codegen="gapi${GTK_SHARP_SLOT}-codegen"
- # This is very likely to be of use outside of this function as well, so make
- # it public.
- GTK_SHARP_LIB_DIR="${ROOT}/usr/$(get_libdir)/mono/gtk-sharp${GTK_SHARP_SLOT_DEC}"
-
- local makefiles="$(find ${S} -name Makefile.in)"
- sed -i -e "s;\(\.\.\|\$(top_srcdir)\)/[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).xml;${gapi_dir}/\2.xml;g" \
- -e "s;/r:\(\.\./\)*[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).dll;/r:${GTK_SHARP_LIB_DIR}/\2.dll;g" \
- -e "s;\.\./[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).dll;${GTK_SHARP_LIB_DIR}/\1.dll;g" \
- -e "s:\$(SYMBOLS) \$(top_builddir)/parser/gapi-fixup.exe:\$(SYMBOLS):" \
- -e "s:\$(INCLUDE_API) \$(top_builddir)/generator/gapi_codegen.exe:\$(INCLUDE_API):" \
- -e "s:\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe:${gapi_fixup}:" \
- -e "s:\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe:${gapi_codegen}:" \
- ${makefiles} || die "failed to fix GtkSharp makefiles"
-
- # Oh GtkSharp, why do your pkgconfig entries suck donkey ass? Why do
- # gnome-desktop-sharp modules use ${assemblies_dir} for Libs: instead of
- # the convention you yourself introduced for gnome-sharp, which just uses
- # @PACKAGE_VERSION@? Are you just trying to annoy me?
- local pcins="$(find ${S} -name *.pc.in)"
- sed -i -e 's:^libdir.*:libdir=@libdir@:' \
- -e "s:\${assemblies_dir}:\${libdir}/mono/gtk-sharp${GTK_SHARP_SLOT_DEC}:" \
- ${pcins} || die "failed to fix GtkSharp pkgconfig entries"
+ local makefiles=( $(find "${S}" -name Makefile.in) )
+ sed -i \
+ -e "s;\(\.\.\|\$(top_srcdir)\)/[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).xml;${gapi_dir}/\2.xml;g" \
+ -e "s; \.\./art/art-sharp.dll; $(get_sharp_lib art-sharp-2.0);g" \
+ -e "s;\.\./gnomevfs/gnome-vfs-sharp.dll;$(get_sharp_lib gnome-vfs-sharp-2.0);g" \
+ -e "s;\$(top_builddir)/art/art-sharp.dll;$(get_sharp_lib art-sharp-2.0);" \
+ -e "s;\$(top_builddir)/gnome/gnome-sharp.dll;$(get_sharp_lib gnome-sharp-2.0);" \
+ "${makefiles[@]}" || die "failed to fix GtkSharp makefiles"
+}
+
+get_sharp_lib() {
+ S="$(pkg-config --libs ${1})"
+ S=${S%% *}
+ printf ${S#-r:}
}
gtk-sharp-module_src_prepare() {
# Make selecting components configurable.
- epatch ${WORKDIR}/${MY_P}-configurable.diff
-
- # Fixes support with pkgconfig-0.17, #92503.
- sed -i -e 's/\<PKG_PATH\>/GTK_SHARP_PKG_PATH/g' \
- -e ':^CFLAGS=:d' \
- "${S}"/configure.in
-
- # Fix install data hook, #161093.
- if [ -f "${S}/sample/gconf/Makefile.am" ]
- then
- sed -i -e 's/^install-hook/install-data-hook/' \
- "${S}"/sample/gconf/Makefile.am || die
- fi
+ epatch "${WORKDIR}/${MY_P}-configurable.diff"
# Disable building samples, #16015.
- sed -i -e "s:sample::" "${S}"/Makefile.am || die
+ sed -i -e "s:sample::" "${S}/Makefile.am" || die
eautoreconf
- cd "${S}"/${GTK_SHARP_MODULE_DIR}
+ cd "${S}/${GTK_SHARP_MODULE_DIR}"
gtk-sharp-module_fix_files
}
@@ -168,14 +142,13 @@
gtk-sharp-module_src_compile() {
- cd "${S}"/${GTK_SHARP_MODULE_DIR}
- LANG=C emake ${OVERRIDEJOBS} || die "emake failed"
+ cd "${S}/${GTK_SHARP_MODULE_DIR}"
+ LANG=C emake || die "emake failed"
}
gtk-sharp-module_src_install() {
- cd ${GTK_SHARP_MODULE_DIR}
- LANG=C emake ${OVERRIDEJOBS} GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) /package gtk-sharp${GTK_SHARP_SLOT_DEC}" \
- DESTDIR="${D}" install || die "emake install failed"
+ cd "${GTK_SHARP_MODULE_DIR}"
+ LANG=C emake DESTDIR=${D} install || die "emake install failed"
}
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2008-12-03 20:44 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2008-12-03 20:44 UTC (permalink / raw
To: gentoo-commits
loki_val 08/12/03 20:44:04
Modified: gtk-sharp-module.eclass
Log:
Silence irrelevant error messages due to packages checked by pkg-config not being installed.
Revision Changes Path
1.7 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.6&r2=1.7
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtk-sharp-module.eclass 28 Nov 2008 00:20:08 -0000 1.6
+++ gtk-sharp-module.eclass 3 Dec 2008 20:44:04 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.6 2008/11/28 00:20:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.7 2008/12/03 20:44:04 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -114,7 +114,7 @@
cd "${S}/${GTK_SHARP_MODULE_DIR}"
- gtk-sharp-module_fix_files
+ gtk-sharp-module_fix_files &> /dev/null
}
gtk-sharp-module_src_configure() {
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-01-05 20:49 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-01-05 20:49 UTC (permalink / raw
To: gentoo-commits
loki_val 09/01/05 20:49:10
Modified: gtk-sharp-module.eclass
Log:
Fix gapi-fixup being sedded into makefiles instead of gapi2-fixup, w.r.t. bug 253903.
Revision Changes Path
1.9 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.8&r2=1.9
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk-sharp-module.eclass 5 Jan 2009 17:12:34 -0000 1.8
+++ gtk-sharp-module.eclass 5 Jan 2009 20:49:10 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.8 2009/01/05 17:12:34 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.9 2009/01/05 20:49:10 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -207,8 +207,8 @@
# We also make sure to call the installed gapi-fixup and gapi-codegen and
# not the ones that would be built locally.
local gapi_dir="${ROOT}/usr/share/gapi${GTK_SHARP_SLOT_DEC}"
- local GAPI_FIXUP="gapi${GTK_SHARP_COMPONENT_SLOT}-fixup"
- local GAPI_CODEGEN="gapi${GTK_SHARP_COMPONENT_SLOT}-codegen"
+ local GAPI_FIXUP="gapi2-fixup"
+ local GAPI_CODEGEN="gapi2-codegen"
local makefiles=( $(find "${S}" -name Makefile.in) )
sed -i \
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-01-05 22:10 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-01-05 22:10 UTC (permalink / raw
To: gentoo-commits
loki_val 09/01/05 22:10:45
Modified: gtk-sharp-module.eclass
Log:
Add blocker for gtk-sharp-gapi also
Revision Changes Path
1.10 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.9&r2=1.10
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-sharp-module.eclass 5 Jan 2009 20:49:10 -0000 1.9
+++ gtk-sharp-module.eclass 5 Jan 2009 22:10:44 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.9 2009/01/05 20:49:10 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.10 2009/01/05 22:10:44 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -88,6 +88,7 @@
case ${PF} in
#gtk-sharp tarball
gtk-sharp-gapi*)
+ add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
add_depend "dev-perl/XML-LibXML"
;;
gtk-sharp-*)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-01-06 19:37 Fabian Groffen (grobian)
0 siblings, 0 replies; 28+ messages in thread
From: Fabian Groffen (grobian) @ 2009-01-06 19:37 UTC (permalink / raw
To: gentoo-commits
grobian 09/01/06 19:37:18
Modified: gtk-sharp-module.eclass
Log:
spaces -> tabs
Revision Changes Path
1.11 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.10&r2=1.11
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtk-sharp-module.eclass 5 Jan 2009 22:10:44 -0000 1.10
+++ gtk-sharp-module.eclass 6 Jan 2009 19:37:18 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.10 2009/01/05 22:10:44 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.11 2009/01/06 19:37:18 grobian Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -358,10 +358,10 @@
Version: ${pkgconfig_version}
EOF
- for gfile in "${D}"/usr/${apifile%/*}/*-api.xml
- do
- CSTRING="${CSTRING} -I:"'${gapidir}'"/${gfile##*/}"
- done
+ for gfile in "${D}"/usr/${apifile%/*}/*-api.xml
+ do
+ CSTRING="${CSTRING} -I:"'${gapidir}'"/${gfile##*/}"
+ done
echo "${CSTRING}" >> "${D}/usr/$(get_libdir)/pkgconfig/${pkgconfig_filename}.pc"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-01-23 19:58 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-01-23 19:58 UTC (permalink / raw
To: gentoo-commits
loki_val 09/01/23 19:58:46
Modified: gtk-sharp-module.eclass
Log:
/usr/bin/gapi2-codegen shell script from gtk-sharp-gapi would sometimes not be installed because I typoed the eclass
Revision Changes Path
1.12 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.11&r2=1.12
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gtk-sharp-module.eclass 6 Jan 2009 19:37:18 -0000 1.11
+++ gtk-sharp-module.eclass 23 Jan 2009 19:58:46 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.11 2009/01/06 19:37:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.12 2009/01/23 19:58:46 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -78,6 +78,9 @@
}
[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*"
+[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "!=dev-dotnet/gtk-sharp-gapi-2.12.7-r5"
+[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "!=dev-dotnet/gtk-sharp-gapi-2.12.7-r6"
+
has "${GTK_SHARP_MODULE}" ${gnome_sharp_module_list} ${gnome_desktop_sharp_module_list} gtk-dotnet glade \
&& add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
has "${GTK_SHARP_MODULE}" gtk gdk atk pango gtk-dotnet parser \
@@ -292,7 +295,7 @@
gtk-sharp-module_src_install() {
- cd "${GTK_SHARP_MODULE_DIR}"
+ cd "${S}/${GTK_SHARP_MODULE_DIR}"
emake DESTDIR=${D} install || die "emake install failed"
mono_multilib_comply
find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-01-23 20:28 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-01-23 20:28 UTC (permalink / raw
To: gentoo-commits
loki_val 09/01/23 20:28:58
Modified: gtk-sharp-module.eclass
Log:
I always forget that its !!, not ! in EAPI-2 if you really mean it.
Revision Changes Path
1.13 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.12&r2=1.13
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gtk-sharp-module.eclass 23 Jan 2009 19:58:46 -0000 1.12
+++ gtk-sharp-module.eclass 23 Jan 2009 20:28:58 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.12 2009/01/23 19:58:46 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.13 2009/01/23 20:28:58 loki_val Exp $
# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -78,8 +78,8 @@
}
[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*"
-[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "!=dev-dotnet/gtk-sharp-gapi-2.12.7-r5"
-[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "!=dev-dotnet/gtk-sharp-gapi-2.12.7-r6"
+[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "!!=dev-dotnet/gtk-sharp-gapi-2.12.7-r5"
+[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "!!=dev-dotnet/gtk-sharp-gapi-2.12.7-r6"
has "${GTK_SHARP_MODULE}" ${gnome_sharp_module_list} ${gnome_desktop_sharp_module_list} gtk-dotnet glade \
&& add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-01-29 22:48 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-01-29 22:48 UTC (permalink / raw
To: gentoo-commits
loki_val 09/01/29 22:48:20
Modified: gtk-sharp-module.eclass
Log:
New and spiffy version of the old eclass.
Revision Changes Path
1.14 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.13&r2=1.14
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gtk-sharp-module.eclass 23 Jan 2009 20:28:58 -0000 1.13
+++ gtk-sharp-module.eclass 29 Jan 2009 22:48:20 -0000 1.14
@@ -1,130 +1,173 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.13 2009/01/23 20:28:58 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.14 2009/01/29 22:48:20 loki_val Exp $
-# Author : Peter Johanson <latexer@gentoo.org>, butchered by ikelos, then loki_val.
-# Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
+# @ECLASS: gtk-sharp-module.eclass
+# @MAINTAINER:
+# dotnet@gentoo.org
+# @BLURB: Manages the modules of the gtk-, gnome-, and gnome-desktop-sharp tarballs
+# @DESCRIPTION:
+# This eclass provides phase functions and helper functions for the modules
+# of the gtk-sharp, gnome-sharp and gnome-desktop-sharp tarballs.
+# PLEASE TAKE NOTE: ONLY FOR EAPI-2 EBUILDS
-# Note that this breaks compatibility with the original gtk-sharp-component
-# eclass.
+WANT_AUTOMAKE=none
+WANT_AUTOCONF=none
inherit eutils mono multilib autotools base versionator
-# Get the name of the component to build and the build dir; by default,
-# extract it from the ebuild's name.
+# @ECLASS-VARIABLE: GTK_SHARP_MODULE
+# @DESCRIPTION:
+# The name of the Gtk# module.
+# Default value: ${PN/-sharp/}
GTK_SHARP_MODULE=${GTK_SHARP_MODULE:=${PN/-sharp/}}
-GTK_SHARP_MODULE_DIR=${GTK_SHARP_MODULE_DIR:=${PN/-sharp/}}
-
-# Allow ebuilds to set a value for the required GtkSharp version.
-GTK_SHARP_REQUIRED_VERSION=${GTK_SHARP_REQUIRED_VERSION}
-# Version number used to differentiate between unversioned 1.0 series and the
-# versioned 2.0 series (2.0 series has 2 or 2.0 appended to various paths and
-# scripts). Default to ${SLOT}.
-GTK_SHARP_SLOT="${GTK_SHARP_SLOT:=${SLOT}}"
-GTK_SHARP_SLOT_DEC="${GTK_SHARP_SLOT_DEC:=-${GTK_SHARP_SLOT}.0}"
+# @ECLASS-VARIABLE: GTK_SHARP_MODULE_DIR
+# @DESCRIPTION:
+# The subdirectory of S in which GTK_SHARP_MODULE is installed.
+# Default value: ${PN/-sharp/}
+GTK_SHARP_MODULE_DIR=${GTK_SHARP_MODULE_DIR:=${PN/-sharp/}}
-#Handy little var
+# @ECLASS-VARIABLE: GTK_SHARP_REQUIRED_VERSION
+# @DESCRIPTION:
+# The version of the gtk-sharp tarball this package requires.
+# Optional.
+GTK_SHARP_REQUIRED_VERSION="${GTK_SHARP_REQUIRED_VERSION}"
+
+# @ECLASS-VARIABLE: gapi_users_list
+# @DESCRIPTION:
+# List of modules that use one of gapi2-codegen, gapi2-fixup or gapi2-parser
+# No ebuild-serviceable parts inside.
+gapi_users_list="art gnome gnomevfs ${gnome_desktop_sharp_module_list} atk gtk gdk glade pango"
+
+# @ECLASS-VARIABLE: PV_MAJOR
+# @DESCRIPTION:
+# The first two components of the PV variable.
PV_MAJOR=$(get_version_component_range 1-2)
-# Set some defaults.
-DESCRIPTION="GtkSharp's ${GTK_SHARP_MODULE} module"
-HOMEPAGE="http://www.mono-project.com/GtkSharp"
-
-LICENSE="LGPL-2.1"
-DEPEND="
- >=dev-lang/mono-2.0.1
- >=sys-apps/sed-4
- >=dev-util/pkgconfig-0.23
- "
-RDEPEND="
- >=dev-lang/mono-2.0.1
- "
-
-IUSE="debug"
-
-
-# The GtkSharp modules are currently divided into three seperate tarball
-# distributions. Figure out which of these our component belongs to.
-
-gtk_sharp_module_list="glib glade gtk gdk atk pango gtk-dotnet gtk-gapi"
-gnome_sharp_module_list="art gnome gnomevfs gconf"
-gnome_desktop_sharp_module_list="gnome-desktop gnome-print gnome-panel gtkhtml gtksourceview nautilusburn rsvg vte wnck"
-
-has "${GTK_SHARP_MODULE}" ${gtk_sharp_module_list} && GTK_SHARP_REQUIRED_VERSION=${PV}
-
-
+# @FUNCTION: add_bdepends
+# @USAGE: <package atom>
+# @DESCRIPTION:
+# Adds to the DEPEND variable
add_bdepend() {
+ [[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs ONE (1) argument"
DEPEND="${DEPEND} $@"
}
+# @FUNCTION: add_rdepends
+# @USAGE: <package atom>
+# @DESCRIPTION:
+# Adds to the RDEPEND variable
add_rdepend() {
+ [[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs ONE (1) argument"
RDEPEND="${RDEPEND} $@"
}
+# @FUNCTION: add_depend
+# @USAGE: <package atom>
+# @DESCRIPTION:
+# Adds to the DEPEND and RDEPEND variables
add_depend() {
+ [[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs ONE (1) argument"
DEPEND="${DEPEND} $@"
RDEPEND="${RDEPEND} $@"
}
-gsm_get_tarball() {
- has "${GTK_SHARP_MODULE}" ${gtk_sharp_module_list} \
- && echo "gtk-sharp" && return 0
- has "${GTK_SHARP_MODULE}" ${gnome_sharp_module_list} \
- && echo "gnome-sharp" && return 0
- has "${GTK_SHARP_MODULE}" ${gnome_desktop_sharp_module_list} \
- && echo "gnome-desktop-sharp" && return 0
- die "unknown GtkSharp module: ${GTK_SHARP_MODULE}"
-}
-
-[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*"
-[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "!!=dev-dotnet/gtk-sharp-gapi-2.12.7-r5"
-[[ "${PN}" != "gtk-sharp-gapi" ]] && add_bdepend "!!=dev-dotnet/gtk-sharp-gapi-2.12.7-r6"
-
-has "${GTK_SHARP_MODULE}" ${gnome_sharp_module_list} ${gnome_desktop_sharp_module_list} gtk-dotnet glade \
- && add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
-has "${GTK_SHARP_MODULE}" gtk gdk atk pango gtk-dotnet parser \
- && add_depend "=dev-dotnet/glib-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
-has "${GTK_SHARP_MODULE}" ${gnome_desktop_sharp_module_list} \
- && add_depend ">=dev-dotnet/gnome-sharp-${PV_MAJOR}"
+# @ECLASS-VARIABLE: TARBALL
+# @DESCRIPTION:
+# The GtkSharp modules are currently divided into three seperate tarball
+# distributions. The TARBALL variable holds the name of the tarball
+# to which GTK_SHARP_MODULE belongs.
+case ${GTK_SHARP_MODULE} in
+ glib|glade|gtk|gdk|atk|pango|gtk-dotnet|gtk-gapi|gtk-docs)
+ TARBALL="gtk-sharp"
+ case ${PVR} in
+ 2.12.7-r1*)
+ SRC_URI="mirror://gentoo/gtk-sharp-2.12.0-patches.tar.bz2
+ mirror://gentoo/gtk-sharp-2.12.7.patch.bz2"
+ #Upstream: https://bugzilla.novell.com/show_bug.cgi?id=$bugno
+ #Upstream bug #421063 for the parallel-make patches
+ #Upstream bug #470390 for the gtk-sharp-2.12.7.patch
+ PATCHES=( "${WORKDIR}/patches/${TARBALL}-2.12.0-parallelmake.patch"
+ "${WORKDIR}/patches/${TARBALL}-2.12.0-doc-parallelmake.patch"
+ "${WORKDIR}/${TARBALL}-2.12.7.patch" )
+ EAUTORECONF="YES"
+ add_bdepend "=sys-devel/automake-1.10*"
+ add_bdepend ">=sys-devel/autoconf-2.61"
+ ;;
+ esac
+ ;;
+ art|gnome|gnomevfs|gconf)
+ TARBALL="gnome-sharp"
+ add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
+ has "${GTK_SHARP_MODULE}" "${gapi_users_list}" && \
+ add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*"
+ ;;
+ gnome-desktop|gnome-print|gnome-panel|gtkhtml|gtksourceview|nautilusburn|rsvg|vte|wnck)
+ TARBALL="gnome-desktop-sharp"
+ add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
+ add_depend "=dev-dotnet/gnome-sharp-${PV_MAJOR}*"
+ add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*"
+ ;;
+ *)
+ eerror "Huh? Sonny boy, looks like your GTK_SHARP_MODULE is not on the approved list. BAILING!"
+ die "How did we get here!!?"
+ ;;
+esac
case ${PF} in
#gtk-sharp tarball
+ gtk-sharp-docs*)
+ add_depend ">=virtual/monodoc-2.0"
+ ;;
gtk-sharp-gapi*)
add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
add_depend "dev-perl/XML-LibXML"
;;
gtk-sharp-*)
+ add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}"
+ add_depend "~dev-dotnet/glib-sharp-${PV}"
add_depend "~dev-dotnet/atk-sharp-${PV}"
add_depend "~dev-dotnet/gdk-sharp-${PV}"
add_depend "~dev-dotnet/pango-sharp-${PV}"
;;
gdk-sharp-*)
- add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
+ add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}"
+ add_depend "~dev-dotnet/glib-sharp-${PV}"
add_depend "x11-libs/gtk+:2"
add_depend "~dev-dotnet/pango-sharp-${PV}"
+ add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
;;
atk-sharp-*)
- add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
+ add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}"
+ add_depend "~dev-dotnet/glib-sharp-${PV}"
add_depend "dev-libs/atk"
+ add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
;;
glib-sharp-*)
add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
add_depend "dev-libs/glib:2"
;;
pango-sharp-*)
- add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
+ add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}"
+ add_depend "~dev-dotnet/glib-sharp-${PV}"
add_depend "x11-libs/pango"
+ add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
;;
gtk-dotnet-*)
- add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
+ add_depend "~dev-dotnet/glib-sharp-${PV}"
add_depend "~dev-dotnet/gdk-sharp-${PV}"
add_depend "~dev-dotnet/pango-sharp-${PV}"
- add_depend "!dev-lang/mono[minimal]"
+ add_depend "~dev-dotnet/gtk-sharp-${PV}"
+ add_depend "dev-lang/mono[-minimal]"
+ add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
;;
glade-sharp-*)
+ add_bdepend "~dev-dotnet/gtk-sharp-gapi-${PV}"
+ add_depend "~dev-dotnet/glib-sharp-${PV}"
add_depend "~dev-dotnet/atk-sharp-${PV}"
add_depend "~dev-dotnet/gdk-sharp-${PV}"
+ add_depend "~dev-dotnet/gtk-sharp-${PV}"
add_depend "~dev-dotnet/pango-sharp-${PV}"
add_depend ">=gnome-base/libglade-2.3.6"
;;
@@ -182,206 +225,295 @@
;;
esac
+# @ECLASS-VARIABLE: DESCRIPTION
+# @DESCRIPTION:
+# Default value: GtkSharp's ${GTK_SHARP_MODULE} module of the ${TARBALL} tarball
+DESCRIPTION="GtkSharp's ${GTK_SHARP_MODULE} module of the ${TARBALL} tarball"
+# @ECLASS-VARIABLE: HOMEPAGE
+# @DESCRIPTION:
+# Default value: http://www.mono-project.com/GtkSharp
+HOMEPAGE="http://www.mono-project.com/GtkSharp"
+# @ECLASS-VARIABLE: DESCRIPTION
+# @DESCRIPTION:
+# Default value: LGPL-2.1
+LICENSE="LGPL-2.1"
+add_depend ">=dev-lang/mono-2.0.1"
+add_bdepend ">=sys-apps/sed-4"
+add_bdepend ">=dev-util/pkgconfig-0.23"
+add_bdepend ">=app-shells/bash-3.1"
-GSM_P=$(gsm_get_tarball)-${PV}
-S=${WORKDIR}/${GSM_P}
-SRC_URI="mirror://gnome/sources/$(gsm_get_tarball)/${PV%.*}/${GSM_P}.tar.bz2"
-
-if [[ "${GSM_P%.*}" = "gtk-sharp-2.12" ]]
-then
- SRC_URI="${SRC_URI}
- mirror://gentoo/gtk-sharp-2.12.0-patches.tar.bz2"
- #Upstream: https://bugzilla.novell.com/show_bug.cgi?id=$bugno
- #Upstream bug #421063
- PATCHES=( "${WORKDIR}/patches/$(gsm_get_tarball)-2.12.0-parallelmake.patch"
- "${WORKDIR}/patches/$(gsm_get_tarball)-2.12.0-doc-parallelmake.patch" )
- EAUTORECONF="YES"
-fi
-
-
-### Public functions.
-
-gtk-sharp-module_fix_files() {
- # Change references like "/r:../art/art-sharp.dll" ->
- # "/r:/usr/lib/pkgconfig/../../lib/mono/gtk-sharp-2.0/art-sharp.dll" and references like
- # "../glib/glib-sharp.xml" or "$(top_srcdir)/glib/glib-sharp.xml" ->
- # "${gapi_dir}/glib-sharp.xml".
- #
- # We also make sure to call the installed gapi-fixup and gapi-codegen and
- # not the ones that would be built locally.
- local gapi_dir="${ROOT}/usr/share/gapi${GTK_SHARP_SLOT_DEC}"
- local GAPI_FIXUP="gapi2-fixup"
- local GAPI_CODEGEN="gapi2-codegen"
-
- local makefiles=( $(find "${S}" -name Makefile.in) )
- sed -i \
- -e "s;\(\.\.\|\$(top_srcdir)\|\$(srcdir)/\.\.\)/[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).xml;${gapi_dir}/\2.xml;g" \
- -e "s; \.\./glib/glib-sharp.dll; $(get_sharp_lib glib-sharp-2.0);g" \
- -e "s; \.\./pango/pango-sharp.dll; $(get_sharp_lib pango-sharp-2.0);g" \
- -e "s; \.\./art/art-sharp.dll; $(get_sharp_lib art-sharp-2.0);g" \
- -e "s; \.\./atk/atk-sharp.dll; $(get_sharp_lib atk-sharp-2.0);g" \
- -e "s; \.\./gdk/gdk-sharp.dll; $(get_sharp_lib gdk-sharp-2.0);g" \
- -e "s; \.\./gtk/gtk-sharp.dll; $(get_sharp_lib gtk-sharp-2.0);g" \
- -e "s;\.\./gnomevfs/gnome-vfs-sharp.dll;$(get_sharp_lib gnome-vfs-sharp-2.0);g" \
- -e "s;\$(top_builddir)/art/art-sharp.dll;$(get_sharp_lib art-sharp-2.0);" \
- -e "s;\$(top_builddir)/gnome/gnome-sharp.dll;$(get_sharp_lib gnome-sharp-2.0);" \
- -e "s;\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe;${GAPI_FIXUP};" \
- -e "s;\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe;${GAPI_CODEGEN};" \
- -e "s:\$(SYMBOLS) \$(top_builddir)/parser/gapi-fixup.exe:\$(SYMBOLS):" \
- -e "s:\$(INCLUDE_API) \$(top_builddir)/generator/gapi_codegen.exe:\$(INCLUDE_API):" \
- "${makefiles[@]}" || die "failed to fix GtkSharp makefiles"
-}
-
-get_sharp_lib() {
- S="$(pkg-config --libs ${1})"
- S=${S%% *}
- printf ${S#-r:}
-}
-
-gtk-sharp_tarball_src_prepare() {
- local package
- sed -i -e '/SUBDIRS/s/ glib / /' \
- -e '/SUBDIRS/s/ glade / /' \
- -e '/SUBDIRS/s/ sample / /' \
- -e '/SUBDIRS/s/ doc/ /' \
- Makefile.am || die "failed sedding sense into gtk-sharp's Makefile.am"
- for package in GLIB PANGO ATK GTK
+IUSE="debug"
+# @ECLASS-VARIABLE: HOMEPAGE
+# @DESCRIPTION:
+# Default value: ${WORKDIR}/${TARBALL}-${PV}
+S="${WORKDIR}/${TARBALL}-${PV}"
+# @ECLASS-VARIABLE: SRC_URI
+# @DESCRIPTION:
+# Default value: mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2
+SRC_URI="${SRC_URI}
+ mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2"
+
+# @FUNCTION: get_sharp_apis
+# @USAGE: <type> <pkgconfig-package>
+# @RETURN: .NET API files
+# @DESCRIPTION:
+# Given a valid pkg-config package, will return a list of API xml files.
+# <type> can be either --prefixed or --bare. If prefixed, each API file
+# will be prefixed with -I:
+get_sharp_apis() {
+ [[ ${#@} -eq 2 ]] || die "${FUNCNAME} needs two arguments"
+ get_sharp_assemblies "$@"
+}
+
+# @FUNCTION: get_sharp_assemblies
+# @USAGE: <type> <pkgconfig-package>
+# @RETURN: .NET .dll assemblies
+# @DESCRIPTION:
+# Given a valid pkg-config package, will return a list of .dll assemblies.
+# <type> can be either --prefixed or --bare. If prefixed, each .dll file
+# will be prefixed with -r:
+get_sharp_assemblies() {
+ [[ ${#@} -eq 2 ]] || die "${FUNCNAME} needs two arguments"
+ local string config=libs prefix="-r:"
+ local -a rvalue
+ [[ "${FUNCNAME[1]}" = "get_sharp_apis" ]] && config=cflags && prefix="-I:"
+ for string in $(pkg-config --${config} ${2} 2> /dev/null)
do
- sed -r -i -e "s:(PKG_CHECK_MODULES\(${package}.*)\):\1,[foo=bar],[bar=foo]):" \
- configure.in || die "failed sedding sense into gnome-sharp's configure.in"
+ rvalue+=( ${string#-?:} )
done
- EAUTORECONF=YES
+
+ case $1 in
+ --bare)
+ :
+ ;;
+ --prefixed)
+ for (( i=0 ; i< ${#rvalue[@]} ; i++ ))
+ do
+ rvalue[$i]=${prefix}${rvalue[$i]}
+ done
+ ;;
+ *)
+ die "${FUNCNAME}: Unknown parameter"
+ ;;
+ esac
+ echo "${rvalue[@]}"
+}
+
+# @FUNCTION: phase_hook
+# @USAGE: <prefix>
+# Looks for functions named <prefix>_caller_suffix and executes them.
+# _caller_suffix is the calling function with the prefix
+# gtk-sharp-module removed.
+phase_hook() {
+ [[ ${#@} -eq 1 ]] || die "${FUNCNAME} needs one argument"
+ if [[ "$(type -t ${1}${FUNCNAME[1]#gtk-sharp-module})" = "function" ]]
+ then
+ ebegin "Phase-hook: Running ${1}${FUNCNAME[1]#gtk-sharp-module}"
+ ${1}${FUNCNAME[1]#gtk-sharp-module}
+ eend 0
+ fi
}
-gnome-sharp_tarball_src_prepare() {
- if ! [[ "${PN}" = "gconf-sharp" ]]
+# @FUNCTION: ac_path_prog_override
+# @USAGE: <PROG> [path]
+# @DESCRIPTION:
+# Override AC_PATH_PROG() autoconf macros. Path will be set to " " if
+# not specified.
+ac_path_prog_override() {
+ if [[ ${#@} -lt 1 || ${#@} -gt 2 ]]
then
- sed -r -i -e "s:(PKG_CHECK_MODULES\(GLADESHARP.*)\):\1,[foo=bar],[bar=foo]):" \
- configure.in || die "failed sedding sense into gnome-sharp's configure.in"
- EAUTORECONF=YES
+ eerror "${FUNCNAME[0]} requires at least one parameter and takes at most two:"
+ eerror "AC_PATH_PROG(PARAM1, param2)"
+ die "${FUNCNAME[0]} requires at least one parameter and takes at most two:"
fi
+ export ac_cv_path_${1}="${2:- }"
}
-gtk-sharp-module_src_prepare() {
- if [[ "$(type -t $(gsm_get_tarball)_tarball_src_prepare)" = "function" ]]
+
+# @FUNCTION: pkg_check_modules_override
+# @USAGE: <GROUP> [package1] [package2]
+# @DESCRIPTION:
+# Will export the appropriate variables to override PKG_CHECK_MODULES autoconf
+# macros, with the string " " by default. If packages are specified, they will
+# be looked up with pkg-config and the appropriate LIBS and CFLAGS substituted.
+# LIBS and CFLAGS can also be specified per-package with the following syntax:
+# @CODE
+# package=LIBS%CFLAGS
+# @CODE
+# = and % have no effect unless both are specified.
+# Here is an example:
+# @CODE
+# pkg_check_modules_override GASH "gtk+-2.0=-jule%" gobject-2.0
+# @CODE
+# The above example will do:
+# export GASH_CFLAGS+=" -jule"
+# export GASH_LIBS+=" "
+# export GASH_CFLAGS+=" $(pkg-config --cflags gobject-2.0)"
+# export GASH_LIBS+=" $(pkg-config --libs gobject-2.0)"
+#
+# NOTE: If a package is not found, the string " " will be inserted in place of
+# <GROUP>_CFLAGS and <GROUP>_LIBS
+pkg_check_modules_override() {
+ local package
+ local group="${1}"
+ local packages="${*:2}"
+ export ${group}_CFLAGS=" "
+ export ${group}_LIBS=" "
+
+ if [[ ${#@} -lt 1 ]]
then
- ebegin "Running $(gsm_get_tarball)_tarball_src_prepare"
- $(gsm_get_tarball)_tarball_src_prepare
- eend $?
+ eerror "${FUNCNAME[0]} requires at least one parameter: GROUP"
+ eerror "PKG_CHECK_MODULES(GROUP, package1 package2 etc)"
+ die "${FUNCNAME[0]} requires at least one parameter: GROUP"
fi
- base_src_util autopatch
- [[ ${EAUTORECONF} ]] && eautoreconf
+ for package in $packages
+ do
+ if [[ ${package/=} != ${package} && ${package/\%} != ${package} ]]
+ then
+ package_cflag_libs=${package##*=}
+ export ${group}_CFLAGS+=" ${package_cflag_libs%%\%*}"
+ export ${group}_LIBS+=" ${package_cflag_libs##*\%}"
+ else
+ if pkg-config --exists $package
+ then
+ export ${group}_CFLAGS+=" $(pkg-config --cflags $package)"
+ export ${group}_LIBS+=" $(pkg-config --libs $package)"
+ else
+ export ${group}_CFLAGS+=" "
+ export ${group}_LIBS+=" "
+ fi
+ fi
+ done
+}
+# @FUNCTION: gtk-sharp-tarball-post_src_prepare
+# @DESCRIPTION:
+# Runs a M-m-m-monster sed on GTK_SHARP_MODULE_DIR to convert references to
+# local assemblies to the installed ones. Is only called by src_prepare when
+# $GTK_SHARP_MODULE is a member of $gtk_sharp_module_list.
+gtk-sharp-tarball-post_src_prepare() {
cd "${S}/${GTK_SHARP_MODULE_DIR}"
-
- gtk-sharp-module_fix_files &> /dev/null
+ sed -i \
+ -e "s; \$(srcdir)/../glib/glib-api.xml; $(get_sharp_apis --bare glib-sharp-2.0);" \
+ -e "s; ../pango/pango-api.xml; $(get_sharp_apis --bare pango-sharp-2.0);" \
+ -e "s; ../atk/atk-api.xml; $(get_sharp_apis --bare atk-sharp-2.0);" \
+ -e "s; ../gdk/gdk-api.xml; $(get_sharp_apis --bare gdk-sharp-2.0);" \
+ -e "s; ../gtk/gtk-api.xml; $(get_sharp_apis --bare gtk-sharp-2.0);" \
+ -e "s; \.\./glib/glib-sharp.dll; $(get_sharp_assemblies --bare glib-sharp-2.0);g" \
+ -e "s; \.\./pango/pango-sharp.dll; $(get_sharp_assemblies --bare pango-sharp-2.0);g" \
+ -e "s; \.\./atk/atk-sharp.dll; $(get_sharp_assemblies --bare atk-sharp-2.0);g" \
+ -e "s; \.\./gdk/gdk-sharp.dll; $(get_sharp_assemblies --bare gdk-sharp-2.0);g" \
+ -e "s; \.\./gtk/gtk-sharp.dll; $(get_sharp_assemblies --bare gtk-sharp-2.0);g" \
+ -e "s;\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe;/usr/bin/gapi2-fixup;" \
+ -e "s;\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe;/usr/bin/gapi2-codegen;" \
+ -e "s:\$(SYMBOLS) \$(top_builddir)/parser/gapi-fixup.exe:\$(SYMBOLS):" \
+ -e "s:\$(INCLUDE_API) \$(top_builddir)/generator/gapi_codegen.exe:\$(INCLUDE_API):" \
+ $(find . -name Makefile.in) || die "failed to fix ${TARBALL}-tarball makefiles"
+}
+
+# @FUNCTION: gnome-sharp-tarball-post_src_prepare
+# @DESCRIPTION:
+# Runs a M-m-m-monster sed on GTK_SHARP_MODULE_DIR to convert references to
+# local assemblies to the installed ones. Is only called by src_prepare when
+# $GTK_SHARP_MODULE is a member of $gnome_sharp_module_list.
+gnome-sharp-tarball-post_src_prepare() {
+ cd "${S}/${GTK_SHARP_MODULE_DIR}"
+ sed -i \
+ -e "s; ../gnomevfs/gnome-vfs-api.xml; $(get_sharp_apis --bare gnome-vfs-sharp-2.0);" \
+ -e "s; ../art/art-api.xml; $(get_sharp_apis --bare art-sharp-2.0);" \
+ -e "s; \.\./art/art-sharp.dll; $(get_sharp_assemblies --bare art-sharp-2.0);g" \
+ -e "s; \.\./gnomevfs/gnome-vfs-sharp.dll; $(get_sharp_assemblies --bare gnome-vfs-sharp-2.0);g" \
+ -e "s;/r:\$(top_builddir)/art/art-sharp.dll;$(get_sharp_assemblies --prefixed art-sharp-2.0);" \
+ -e "s;/r:\$(top_builddir)/gnome/gnome-sharp.dll;$(get_sharp_assemblies --prefixed gnome-sharp-2.0);" \
+ $(find . -name Makefile.in) || die "failed to fix ${TARBALL}-tarball makefiles"
+}
+
+# @FUNCTION: gtk-sharp-module_src_prepare
+# @DESCRIPTION:
+# Runs autopatch from base.eclass, eautoreconf if EAUTORECONF is set to any
+# value.
+# Contains a phase_hook, runs very last.
+# phase_hook prefix trigger: ${TARBALL}-tarball-post
+# Is exported.
+gtk-sharp-module_src_prepare() {
+ base_src_util autopatch
+# @ECLASS-VARIABLE: EAUTORECONF
+# @DESCRIPTION:
+# If set, EAUTORECONF will be run during src_prepare.
+ [[ ${EAUTORECONF} ]] && eautoreconf
+ phase_hook ${TARBALL}-tarball-post
}
+# @FUNCTION: gtk-sharp-tarball_src_configure
+# @DESCRIPTION:
+# Sets some environment variables that will allow us to make the dependencies
+# for each ebuild be only its own dependencies, without patching configure.
+# Is only called by gtk-sharp-module_src_configure when $GTK_SHARP_MODULE
+# is a member of $gtk_sharp_module_list.
+gtk-sharp-tarball_src_configure() {
+ pkg_check_modules_override GLIB gobject-2.0
+ pkg_check_modules_override GIO gio-2.0
+ pkg_check_modules_override PANGO pango
+ pkg_check_modules_override ATK atk
+ pkg_check_modules_override GTK gtk+-2.0
+ pkg_check_modules_override GLADE libglade-2.0
+}
+
+# @FUNCTION: gnome-sharp-tarball_src_configure
+# @DESCRIPTION:
+# Sets some environment variables that will allow us to make the dependencies
+# for each ebuild be only its own dependencies. Without patching configure.
+# Is only called by gtk-sharp-module_src_configure when $GTK_SHARP_MODULE
+# is a member of $gnome_sharp_module_list.
+gnome-sharp-tarball_src_configure() {
+ pkg_check_modules_override GLADESHARP glade-sharp-2.0
+ pkg_check_modules_override GAPI gapi-2.0
+ ac_path_prog_override GAPI_PARSER /usr/bin/gapi2-parser
+ ac_path_prog_override GAPI_CODEGEN /usr/bin/gapi2-codegen
+ ac_path_prog_override GAPI_FIXUP /usr/bin/gapi2-fixup
+}
+
+# @FUNCTION: gtk-sharp-module_src_configure
+# @USAGE: [econf-arguments]
+# @DESCRIPTION:
+# Calls econf with some default values.
+# Contains a phase_hook, run before econf.
+# phase_hook prefix trigger: ${TARBALL}-tarball
+# Is exported.
gtk-sharp-module_src_configure() {
+ phase_hook ${TARBALL}-tarball
econf --disable-static \
--disable-dependency-tracking \
--disable-maintainer-mode \
$(use debug &&echo "--enable-debug" ) \
- ${gtk_sharp_conf} \
${@} || die "econf failed"
}
+# @FUNCTION: gtk-sharp-module_src_compile
+# @DESCRIPTION:
+# Calls emake in the subdir of the module.
+# Sets CSC=/usr/bin/gmcs. Deletes top_srcdir Makefiles to prevent recursing in
+# case we missed some dll references.
+# Is exported.
gtk-sharp-module_src_compile() {
+ rm -f "${S}"/Makefile* &> /dev/null
cd "${S}/${GTK_SHARP_MODULE_DIR}"
- emake || die "emake failed"
+ emake CSC=/usr/bin/gmcs || die "emake failed"
}
+# @FUNCTION: gtk-sharp-module_src_install
+# @DESCRIPTION:
+# Installs the module. Fixes up lib paths so they're multilib-safe.
+# Gets rid of .la files.
+# Is exported.
gtk-sharp-module_src_install() {
-
cd "${S}/${GTK_SHARP_MODULE_DIR}"
- emake DESTDIR=${D} install || die "emake install failed"
+ emake DESTDIR="${D}" install || die "emake install failed"
mono_multilib_comply
- find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
- if has "${GTK_SHARP_MODULE}" gtk gdk atk pango
- then
- find "${D}" -name '*.pc' -exec rm -rf '{}' '+' || die "la removal failed"
- pkgconfig_filename="${PN}${GTK_SHARP_SLOT_DEC}"
- pkgconfig_pkgname="${GTK_SHARP_MODULE}#"
- pkgconfig_description=".NET/Mono bindings for ${GTK_SHARP_MODULE}"
- pkgconfig_monodir="$(gsm_get_tarball)${GTK_SHARP_SLOT_DEC}"
- case ${GTK_SHARP_MODULE} in
- gtk)
- pkgconfig_requires="glib-sharp${GTK_SHARP_SLOT_DEC} atk-sharp${GTK_SHARP_SLOT_DEC} gdk-sharp${GTK_SHARP_SLOT_DEC} pango-sharp${GTK_SHARP_SLOT_DEC}"
- ;;
- gdk)
- pkgconfig_requires="glib-sharp${GTK_SHARP_SLOT_DEC} pango-sharp${GTK_SHARP_SLOT_DEC}"
- ;;
- atk)
- pkgconfig_requires="glib-sharp${GTK_SHARP_SLOT_DEC}"
- ;;
- pango)
- pkgconfig_requires="glib-sharp${GTK_SHARP_SLOT_DEC}"
- ;;
- *)
- die "unhandled gtk_sharp_module"
- ;;
- esac
- generate_pkgconfig
- fi
+ find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+ [[ $(find "${D}" -type f|wc -l) -lt 3 ]] && die "Too few files. This smells like a failed install."
}
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install
-
-generate_pkgconfig() {
- ebegin "Generating .pc file for ${P}"
- local dll \
- gfile \
- pkgconfig_gapidir \
- apifile \
- LSTRING='Libs:' \
- CSTRING='Cflags:' \
- pkgconfig_filename="${1:-${pkgconfig_filename:-${PN}}}" \
- pkgconfig_monodir="${2:-${pkgconfig_monodir:-${pkgconfig_filename}}}" \
- pkgconfig_pkgname="${3:-${pkgconfig_pkgname:-${pkgconfig_filename}}}" \
- pkgconfig_version="${4:-${pkgconfig_version:-${PV}}}" \
- pkgconfig_description="${5:-${pkgconfig_description:-${DESCRIPTION}}}" \
- pkgconfig_requires="${6:-${pkgconfig_requires}}" \
-
- pushd "${D}/usr/" &> /dev/null
- apifile=$(find share -name '*-api.xml' 2>/dev/null)
- popd &> /dev/null
-
- pkgconfig_gapidir=${apifile:+\$\{prefix\}/${apifile%/*}}
-
- dodir "/usr/$(get_libdir)/pkgconfig"
- cat <<- EOF -> "${D}/usr/$(get_libdir)/pkgconfig/${pkgconfig_filename}.pc"
- prefix=\${pcfiledir}/../..
- exec_prefix=\${prefix}
- libdir=\${prefix}/$(get_libdir)
- gapidir=${pkgconfig_gapidir}
- Name: ${pkgconfig_pkgname}
- Description: ${pkgconfig_description}
- Version: ${pkgconfig_version}
- EOF
-
- for gfile in "${D}"/usr/${apifile%/*}/*-api.xml
- do
- CSTRING="${CSTRING} -I:"'${gapidir}'"/${gfile##*/}"
- done
- echo "${CSTRING}" >> "${D}/usr/$(get_libdir)/pkgconfig/${pkgconfig_filename}.pc"
-
-
- for dll in "${D}"/usr/$(get_libdir)/mono/${pkgconfig_monodir}/*.dll
- do
- if ! [[ "${dll##*/}" == "policy."*".dll" ]]
- then
- LSTRING="${LSTRING} -r:"'${libdir}'"/mono/${pkgconfig_monodir}/${dll##*/}"
- fi
- done
- echo "${LSTRING}" >> "${D}/usr/$(get_libdir)/pkgconfig/${pkgconfig_filename}.pc"
-
- if [[ "${pkgconfig_requires}" ]]
- then
- printf "Requires: ${pkgconfig_requires}" >> "${D}/usr/$(get_libdir)/pkgconfig/${pkgconfig_filename}.pc"
- fi
- PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --silence-errors --libs ${pkgconfig_filename} &> /dev/null
- eend $?
-}
-
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-02-08 17:23 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-02-08 17:23 UTC (permalink / raw
To: gentoo-commits
loki_val 09/02/08 17:23:40
Modified: gtk-sharp-module.eclass
Log:
Update for gtk-sharp-2.12.8
Revision Changes Path
1.15 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.14&r2=1.15
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gtk-sharp-module.eclass 29 Jan 2009 22:48:20 -0000 1.14
+++ gtk-sharp-module.eclass 8 Feb 2009 17:23:40 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.14 2009/01/29 22:48:20 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.15 2009/02/08 17:23:40 loki_val Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -82,15 +82,13 @@
glib|glade|gtk|gdk|atk|pango|gtk-dotnet|gtk-gapi|gtk-docs)
TARBALL="gtk-sharp"
case ${PVR} in
- 2.12.7-r1*)
- SRC_URI="mirror://gentoo/gtk-sharp-2.12.0-patches.tar.bz2
- mirror://gentoo/gtk-sharp-2.12.7.patch.bz2"
+ 2.12.*)
+ SRC_URI="mirror://gentoo/gtk-sharp-2.12.7.patch.bz2"
#Upstream: https://bugzilla.novell.com/show_bug.cgi?id=$bugno
- #Upstream bug #421063 for the parallel-make patches
#Upstream bug #470390 for the gtk-sharp-2.12.7.patch
- PATCHES=( "${WORKDIR}/patches/${TARBALL}-2.12.0-parallelmake.patch"
- "${WORKDIR}/patches/${TARBALL}-2.12.0-doc-parallelmake.patch"
- "${WORKDIR}/${TARBALL}-2.12.7.patch" )
+ PATCHES=(
+ "${WORKDIR}/${TARBALL}-2.12.7.patch"
+ )
EAUTORECONF="YES"
add_bdepend "=sys-devel/automake-1.10*"
add_bdepend ">=sys-devel/autoconf-2.61"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-02-24 22:04 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-02-24 22:04 UTC (permalink / raw
To: gentoo-commits
loki_val 09/02/24 22:04:56
Modified: gtk-sharp-module.eclass
Log:
Gnome-desktop-sharp and gnome-panel-sharp should depend on gte, not eq their respective not-sharp packages.
Revision Changes Path
1.16 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.15&r2=1.16
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gtk-sharp-module.eclass 8 Feb 2009 17:23:40 -0000 1.15
+++ gtk-sharp-module.eclass 24 Feb 2009 22:04:56 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.15 2009/02/08 17:23:40 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.16 2009/02/24 22:04:56 loki_val Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -191,10 +191,10 @@
;;
#gnome-desktop-sharp tarball
gnome-desktop-sharp-*)
- add_depend "=gnome-base/gnome-desktop-${PV_MAJOR}*"
+ add_depend ">=gnome-base/gnome-desktop-${PV_MAJOR}*"
;;
gnome-panel-sharp-*)
- add_depend "=gnome-base/gnome-panel-${PV_MAJOR}*"
+ add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}*"
;;
gnome-print-sharp-*)
add_depend ">=gnome-base/libgnomeprint-${API_VERSION}"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-02-25 6:48 Zac Medico (zmedico)
0 siblings, 0 replies; 28+ messages in thread
From: Zac Medico (zmedico) @ 2009-02-25 6:48 UTC (permalink / raw
To: gentoo-commits
zmedico 09/02/25 06:48:13
Modified: gtk-sharp-module.eclass
Log:
Fix invalid combination of >= and * in gnome-desktop-sharp and gnome-panel-sharp deps.
Revision Changes Path
1.17 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.16&r2=1.17
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gtk-sharp-module.eclass 24 Feb 2009 22:04:56 -0000 1.16
+++ gtk-sharp-module.eclass 25 Feb 2009 06:48:13 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.16 2009/02/24 22:04:56 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.17 2009/02/25 06:48:13 zmedico Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -191,10 +191,10 @@
;;
#gnome-desktop-sharp tarball
gnome-desktop-sharp-*)
- add_depend ">=gnome-base/gnome-desktop-${PV_MAJOR}*"
+ add_depend ">=gnome-base/gnome-desktop-${PV_MAJOR}"
;;
gnome-panel-sharp-*)
- add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}*"
+ add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}"
;;
gnome-print-sharp-*)
add_depend ">=gnome-base/libgnomeprint-${API_VERSION}"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-03-03 10:41 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-03-03 10:41 UTC (permalink / raw
To: gentoo-commits
loki_val 09/03/03 10:41:22
Modified: gtk-sharp-module.eclass
Log:
Lock gnome-desktop-sharp to PV_MAJOR.
Revision Changes Path
1.18 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.17&r2=1.18
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gtk-sharp-module.eclass 25 Feb 2009 06:48:13 -0000 1.17
+++ gtk-sharp-module.eclass 3 Mar 2009 10:41:21 -0000 1.18
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.17 2009/02/25 06:48:13 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.18 2009/03/03 10:41:21 loki_val Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -191,7 +191,9 @@
;;
#gnome-desktop-sharp tarball
gnome-desktop-sharp-*)
- add_depend ">=gnome-base/gnome-desktop-${PV_MAJOR}"
+ # NOTE: This is REQUIRED to be locked to PV_MAJOR
+ # libgnome-desktop-2.so.INTEGER is hardcoded in gnomedesktop-sharp.dll.config
+ add_depend "=gnome-base/gnome-desktop-${PV_MAJOR}*"
;;
gnome-panel-sharp-*)
add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-03-09 1:02 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-03-09 1:02 UTC (permalink / raw
To: gentoo-commits
loki_val 09/03/09 01:02:13
Modified: gtk-sharp-module.eclass
Log:
Prepare eclass for gnome-sharp-2.24.1. Fix typo in eclass-manpages stuff.
Revision Changes Path
1.19 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.18&r2=1.19
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtk-sharp-module.eclass 3 Mar 2009 10:41:21 -0000 1.18
+++ gtk-sharp-module.eclass 9 Mar 2009 01:02:13 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.18 2009/03/03 10:41:21 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.19 2009/03/09 01:02:13 loki_val Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -83,7 +83,7 @@
TARBALL="gtk-sharp"
case ${PVR} in
2.12.*)
- SRC_URI="mirror://gentoo/gtk-sharp-2.12.7.patch.bz2"
+ SRC_URI="mirror://gentoo/${TARBALL}-2.12.7.patch.bz2"
#Upstream: https://bugzilla.novell.com/show_bug.cgi?id=$bugno
#Upstream bug #470390 for the gtk-sharp-2.12.7.patch
PATCHES=(
@@ -100,6 +100,17 @@
add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
has "${GTK_SHARP_MODULE}" "${gapi_users_list}" && \
add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*"
+ case ${PVR} in
+ 2.24.1*)
+ SRC_URI="mirror://gentoo/${TARBALL}-2.24.1.patch.bz2"
+ PATCHES=(
+ "${WORKDIR}/${TARBALL}-2.24.1.patch"
+ )
+ EAUTORECONF="YES"
+ add_bdepend "=sys-devel/automake-1.10*"
+ add_bdepend ">=sys-devel/autoconf-2.61"
+ ;;
+ esac
;;
gnome-desktop|gnome-print|gnome-panel|gtkhtml|gtksourceview|nautilusburn|rsvg|vte|wnck)
TARBALL="gnome-desktop-sharp"
@@ -244,7 +255,7 @@
add_bdepend ">=app-shells/bash-3.1"
IUSE="debug"
-# @ECLASS-VARIABLE: HOMEPAGE
+# @ECLASS-VARIABLE: S
# @DESCRIPTION:
# Default value: ${WORKDIR}/${TARBALL}-${PV}
S="${WORKDIR}/${TARBALL}-${PV}"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-03-09 1:11 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-03-09 1:11 UTC (permalink / raw
To: gentoo-commits
loki_val 09/03/09 01:11:53
Modified: gtk-sharp-module.eclass
Log:
Add link to upstream bug.
Revision Changes Path
1.20 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.19&r2=1.20
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gtk-sharp-module.eclass 9 Mar 2009 01:02:13 -0000 1.19
+++ gtk-sharp-module.eclass 9 Mar 2009 01:11:53 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.19 2009/03/09 01:02:13 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.20 2009/03/09 01:11:53 loki_val Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -103,6 +103,7 @@
case ${PVR} in
2.24.1*)
SRC_URI="mirror://gentoo/${TARBALL}-2.24.1.patch.bz2"
+ # Upstream bug: https://bugzilla.novell.com/show_bug.cgi?id=483251
PATCHES=(
"${WORKDIR}/${TARBALL}-2.24.1.patch"
)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-03-17 13:39 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-03-17 13:39 UTC (permalink / raw
To: gentoo-commits
loki_val 09/03/17 13:39:25
Modified: gtk-sharp-module.eclass
Log:
Upstream say gnome-sharp-2.24.x will probably be the last release, so relax binding to PV. Fix typos in eclass-manpages stuff. Bind gconf-sharp's glade-sharp dep tightly to GTK_SHARP_REQUIRED_VERSION to not pull in mismatching versions of the gtk-sharp stuff into the depgraph.
Revision Changes Path
1.21 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.20&r2=1.21
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gtk-sharp-module.eclass 9 Mar 2009 01:11:53 -0000 1.20
+++ gtk-sharp-module.eclass 17 Mar 2009 13:39:25 -0000 1.21
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.20 2009/03/09 01:11:53 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.21 2009/03/17 13:39:25 loki_val Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -45,7 +45,7 @@
# The first two components of the PV variable.
PV_MAJOR=$(get_version_component_range 1-2)
-# @FUNCTION: add_bdepends
+# @FUNCTION: add_bdepend
# @USAGE: <package atom>
# @DESCRIPTION:
# Adds to the DEPEND variable
@@ -54,7 +54,7 @@
DEPEND="${DEPEND} $@"
}
-# @FUNCTION: add_rdepends
+# @FUNCTION: add_rdepend
# @USAGE: <package atom>
# @DESCRIPTION:
# Adds to the RDEPEND variable
@@ -116,7 +116,7 @@
gnome-desktop|gnome-print|gnome-panel|gtkhtml|gtksourceview|nautilusburn|rsvg|vte|wnck)
TARBALL="gnome-desktop-sharp"
add_depend "=dev-dotnet/gtk-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
- add_depend "=dev-dotnet/gnome-sharp-${PV_MAJOR}*"
+ add_depend "=dev-dotnet/gnome-sharp-2.24*"
add_bdepend "=dev-dotnet/gtk-sharp-gapi-${GTK_SHARP_REQUIRED_VERSION}*"
;;
*)
@@ -194,7 +194,7 @@
;;
gconf-sharp-*)
add_depend ">=gnome-base/gconf-${PV_MAJOR}"
- add_depend ">=dev-dotnet/glade-sharp-${GTK_SHARP_REQUIRED_VERSION}"
+ add_depend "=dev-dotnet/glade-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
add_depend "~dev-dotnet/gnome-sharp-${PV}"
add_depend "~dev-dotnet/art-sharp-${PV}"
;;
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-03-17 16:33 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-03-17 16:33 UTC (permalink / raw
To: gentoo-commits
loki_val 09/03/17 16:33:28
Modified: gtk-sharp-module.eclass
Log:
Fix depends for gnome-sharp. Gnome-panel bindings have been moved to gnome-panel-sharp (obviously). Gnome-sharp requires gtk+-2.14.
Revision Changes Path
1.22 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.21&r2=1.22
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtk-sharp-module.eclass 17 Mar 2009 13:39:25 -0000 1.21
+++ gtk-sharp-module.eclass 17 Mar 2009 16:33:28 -0000 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.21 2009/03/17 13:39:25 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.22 2009/03/17 16:33:28 loki_val Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -187,10 +187,10 @@
;;
gnome-sharp-*)
add_depend ">=gnome-base/libgnomeui-${PV_MAJOR}"
- add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}"
add_depend "~dev-dotnet/gnomevfs-sharp-${PV}"
add_depend "~dev-dotnet/art-sharp-${PV}"
add_depend ">=gnome-base/libgnomecanvas-${GNOMECANVAS_REQUIRED_VERSION}"
+ add_depend ">=x11-libs/gtk+-2.14.0"
;;
gconf-sharp-*)
add_depend ">=gnome-base/gconf-${PV_MAJOR}"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-03-18 11:14 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-03-18 11:14 UTC (permalink / raw
To: gentoo-commits
loki_val 09/03/18 11:14:09
Modified: gtk-sharp-module.eclass
Log:
Nautilus-cd-burner is deprecated and replaced by brasero. Update deps for nautilusburn-sharp to not depend on PV_MAJOR since new releases are not expected.
Revision Changes Path
1.23 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.22&r2=1.23
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtk-sharp-module.eclass 17 Mar 2009 16:33:28 -0000 1.22
+++ gtk-sharp-module.eclass 18 Mar 2009 11:14:09 -0000 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.22 2009/03/17 16:33:28 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.23 2009/03/18 11:14:09 loki_val Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -224,7 +224,7 @@
add_depend ">=x11-libs/gtksourceview-${GTKSOURCEVIEW_REQUIRED_VERSION}:2.0"
;;
nautilusburn-sharp-*)
- add_depend ">=gnome-extra/nautilus-cd-burner-${PV_MAJOR}"
+ add_depend ">=gnome-extra/nautilus-cd-burner-2.24.0"
;;
rsvg-sharp-*)
add_depend ">=gnome-base/librsvg-${RSVG_REQUIRED_VERSION}"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2009-08-23 0:14 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2009-08-23 0:14 UTC (permalink / raw
To: gentoo-commits
loki_val 09/08/23 00:14:31
Modified: gtk-sharp-module.eclass
Log:
The gnome-desktop-sharp assembly is currently locked to libgnome-desktop.so.11. Since it seems Gnome upstream will not make ABI-incompatible changes for now, we can relax dependencies. Solves bug 279072.
Revision Changes Path
1.25 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.24&r2=1.25
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gtk-sharp-module.eclass 3 May 2009 20:03:10 -0000 1.24
+++ gtk-sharp-module.eclass 23 Aug 2009 00:14:31 -0000 1.25
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.24 2009/05/03 20:03:10 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.25 2009/08/23 00:14:31 loki_val Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -203,9 +203,11 @@
;;
#gnome-desktop-sharp tarball
gnome-desktop-sharp-*)
- # NOTE: This is REQUIRED to be locked to PV_MAJOR
- # libgnome-desktop-2.so.INTEGER is hardcoded in gnomedesktop-sharp.dll.config
- add_depend "=gnome-base/gnome-desktop-${PV_MAJOR}*"
+ # NOTE: libgnome-desktop-2.so has been known to make binary-
+ # incompatible changes, requiring .so bumps. gnome-desktop-sharp
+ # is locked to a specific .so.n version, so strict dependencies
+ # may be required in the future (as it has in the past).
+ add_depend ">=gnome-base/gnome-desktop-${PV_MAJOR}"
;;
gnome-panel-sharp-*)
add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2010-11-18 9:06 Pacho Ramos (pacho)
0 siblings, 0 replies; 28+ messages in thread
From: Pacho Ramos (pacho) @ 2010-11-18 9:06 UTC (permalink / raw
To: gentoo-commits
pacho 10/11/18 09:06:18
Modified: gtk-sharp-module.eclass
Log:
Update for gnome-sharp-2.24.2.
Revision Changes Path
1.27 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.26&r2=1.27
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtk-sharp-module.eclass 3 Jan 2010 19:10:49 -0000 1.26
+++ gtk-sharp-module.eclass 18 Nov 2010 09:06:18 -0000 1.27
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.26 2010/01/03 19:10:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.27 2010/11/18 09:06:18 pacho Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -111,6 +111,9 @@
add_bdepend "=sys-devel/automake-1.10*"
add_bdepend ">=sys-devel/autoconf-2.61"
;;
+ 2.24.2*)
+ add_depend ">=dev-lang/mono-2.7"
+ ;;
esac
;;
gnome-desktop|gnome-print|gnome-panel|gtkhtml|gtksourceview|nautilusburn|rsvg|vte|wnck)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2011-01-25 14:15 Pacho Ramos (pacho)
0 siblings, 0 replies; 28+ messages in thread
From: Pacho Ramos (pacho) @ 2011-01-25 14:15 UTC (permalink / raw
To: gentoo-commits
pacho 11/01/25 14:15:50
Modified: gtk-sharp-module.eclass
Log:
Use slotted dependencies where possible for future Gnome3 stuff.
Revision Changes Path
1.28 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.27&r2=1.28
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gtk-sharp-module.eclass 18 Nov 2010 09:06:18 -0000 1.27
+++ gtk-sharp-module.eclass 25 Jan 2011 14:15:50 -0000 1.28
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.27 2010/11/18 09:06:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.28 2011/01/25 14:15:50 pacho Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -193,7 +193,7 @@
add_depend "~dev-dotnet/gnomevfs-sharp-${PV}"
add_depend "~dev-dotnet/art-sharp-${PV}"
add_depend ">=gnome-base/libgnomecanvas-${GNOMECANVAS_REQUIRED_VERSION}"
- add_depend ">=x11-libs/gtk+-2.14.0"
+ add_depend ">=x11-libs/gtk+-2.14.0:2"
;;
gconf-sharp-*)
add_depend ">=gnome-base/gconf-${PV_MAJOR}"
@@ -210,7 +210,7 @@
# incompatible changes, requiring .so bumps. gnome-desktop-sharp
# is locked to a specific .so.n version, so strict dependencies
# may be required in the future (as it has in the past).
- add_depend ">=gnome-base/gnome-desktop-${PV_MAJOR}"
+ add_depend ">=gnome-base/gnome-desktop-${PV_MAJOR}:2"
;;
gnome-panel-sharp-*)
add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}"
@@ -232,7 +232,7 @@
add_depend ">=gnome-extra/nautilus-cd-burner-2.24.0"
;;
rsvg-sharp-*)
- add_depend ">=gnome-base/librsvg-${RSVG_REQUIRED_VERSION}"
+ add_depend ">=gnome-base/librsvg-${RSVG_REQUIRED_VERSION}:2"
;;
vte-sharp-*)
add_depend ">=x11-libs/vte-${VTE_REQUIRED_VERSION}"
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2011-03-21 21:52 Nirbheek Chauhan (nirbheek)
0 siblings, 0 replies; 28+ messages in thread
From: Nirbheek Chauhan (nirbheek) @ 2011-03-21 21:52 UTC (permalink / raw
To: gentoo-commits
nirbheek 11/03/21 21:52:51
Modified: gtk-sharp-module.eclass
Log:
gtk-sharp-module.eclass: add slot-deps to gnome libs
Revision Changes Path
1.29 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.28&r2=1.29
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gtk-sharp-module.eclass 25 Jan 2011 14:15:50 -0000 1.28
+++ gtk-sharp-module.eclass 21 Mar 2011 21:52:51 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.28 2011/01/25 14:15:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.29 2011/03/21 21:52:51 nirbheek Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -182,7 +182,7 @@
add_depend "~dev-dotnet/gdk-sharp-${PV}"
add_depend "~dev-dotnet/gtk-sharp-${PV}"
add_depend "~dev-dotnet/pango-sharp-${PV}"
- add_depend ">=gnome-base/libglade-2.3.6"
+ add_depend ">=gnome-base/libglade-2.3.6:2.0"
;;
#gnome-sharp tarball
art-sharp-*)
@@ -196,13 +196,13 @@
add_depend ">=x11-libs/gtk+-2.14.0:2"
;;
gconf-sharp-*)
- add_depend ">=gnome-base/gconf-${PV_MAJOR}"
+ add_depend ">=gnome-base/gconf-${PV_MAJOR}:2"
add_depend "=dev-dotnet/glade-sharp-${GTK_SHARP_REQUIRED_VERSION}*"
add_depend "~dev-dotnet/gnome-sharp-${PV}"
add_depend "~dev-dotnet/art-sharp-${PV}"
;;
gnomevfs-sharp-*)
- add_depend ">=gnome-base/gnome-vfs-${PV_MAJOR}"
+ add_depend ">=gnome-base/gnome-vfs-${PV_MAJOR}:2"
;;
#gnome-desktop-sharp tarball
gnome-desktop-sharp-*)
@@ -216,14 +216,14 @@
add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}"
;;
gnome-print-sharp-*)
- add_depend ">=gnome-base/libgnomeprint-${API_VERSION}"
+ add_depend ">=gnome-base/libgnomeprint-${API_VERSION}:2.2"
;;
gtkhtml-sharp-*)
#NOTE: gtkhtml dependency must follow gtkhtml-sharp version.
#i.e. gtkhtml-sharp-2.24.0 >=gtkhtml-3.24
# gtkhtml-sharp-2.16.0 >=gtkhtml-3.16
# See bug 249540 for unpleasant side effects.
- add_depend ">=gnome-extra/gtkhtml-$(($(get_version_component_range 1) + 1 )).$(get_version_component_range 2)"
+ add_depend ">=gnome-extra/gtkhtml-$(($(get_version_component_range 1) + 1 )).$(get_version_component_range 2):3.14"
;;
gtksourceview-sharp-*)
add_depend ">=x11-libs/gtksourceview-${GTKSOURCEVIEW_REQUIRED_VERSION}:2.0"
@@ -235,10 +235,10 @@
add_depend ">=gnome-base/librsvg-${RSVG_REQUIRED_VERSION}:2"
;;
vte-sharp-*)
- add_depend ">=x11-libs/vte-${VTE_REQUIRED_VERSION}"
+ add_depend ">=x11-libs/vte-${VTE_REQUIRED_VERSION}:0"
;;
wnck-sharp-*)
- add_depend ">=x11-libs/libwnck-${PV_MAJOR}"
+ add_depend ">=x11-libs/libwnck-${PV_MAJOR}:1"
;;
esac
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2011-05-06 4:24 Peter Alfredsen (loki_val)
0 siblings, 0 replies; 28+ messages in thread
From: Peter Alfredsen (loki_val) @ 2011-05-06 4:24 UTC (permalink / raw
To: gentoo-commits
loki_val 11/05/06 04:24:31
Modified: gtk-sharp-module.eclass
Log:
Missing depend gnome-base/libgnomeprintui added. Almost-silent build failure would result if this were not present, only caught by presence of too few files.
Revision Changes Path
1.30 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.29&r2=1.30
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gtk-sharp-module.eclass 21 Mar 2011 21:52:51 -0000 1.29
+++ gtk-sharp-module.eclass 6 May 2011 04:24:31 -0000 1.30
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.29 2011/03/21 21:52:51 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.30 2011/05/06 04:24:31 loki_val Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -216,7 +216,8 @@
add_depend ">=gnome-base/gnome-panel-${PV_MAJOR}"
;;
gnome-print-sharp-*)
- add_depend ">=gnome-base/libgnomeprint-${API_VERSION}:2.2"
+ add_depend "gnome-base/libgnomeprint:2.2"
+ add_depend "gnome-base/libgnomeprintui:2.2"
;;
gtkhtml-sharp-*)
#NOTE: gtkhtml dependency must follow gtkhtml-sharp version.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass
@ 2011-07-29 13:57 Jeremy Olexa (darkside)
0 siblings, 0 replies; 28+ messages in thread
From: Jeremy Olexa (darkside) @ 2011-07-29 13:57 UTC (permalink / raw
To: gentoo-commits
darkside 11/07/29 13:57:30
Modified: gtk-sharp-module.eclass
Log:
Fix for Gentoo Prefix, bug 360939
Revision Changes Path
1.31 eclass/gtk-sharp-module.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.30&r2=1.31
Index: gtk-sharp-module.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gtk-sharp-module.eclass 6 May 2011 04:24:31 -0000 1.30
+++ gtk-sharp-module.eclass 29 Jul 2011 13:57:29 -0000 1.31
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.30 2011/05/06 04:24:31 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.31 2011/07/29 13:57:29 darkside Exp $
# @ECLASS: gtk-sharp-module.eclass
# @MAINTAINER:
@@ -16,6 +16,11 @@
inherit eutils mono multilib libtool autotools base versionator
+case ${EAPI:-0} in
+ 2|3|4) ;;
+ *) die "Unknown EAPI." ;;
+esac
+
# @ECLASS-VARIABLE: GTK_SHARP_MODULE
# @DESCRIPTION:
# The name of the Gtk# module.
@@ -412,6 +417,7 @@
# local assemblies to the installed ones. Is only called by src_prepare when
# $GTK_SHARP_MODULE is a member of $gtk_sharp_module_list.
gtk-sharp-tarball-post_src_prepare() {
+ has "${EAPI:-0}" 2 && ! use prefix && EPREFIX=
cd "${S}/${GTK_SHARP_MODULE_DIR}"
sed -i \
-e "s; \$(srcdir)/../glib/glib-api.xml; $(get_sharp_apis --bare glib-sharp-2.0);" \
@@ -424,8 +430,8 @@
-e "s; \.\./atk/atk-sharp.dll; $(get_sharp_assemblies --bare atk-sharp-2.0);g" \
-e "s; \.\./gdk/gdk-sharp.dll; $(get_sharp_assemblies --bare gdk-sharp-2.0);g" \
-e "s; \.\./gtk/gtk-sharp.dll; $(get_sharp_assemblies --bare gtk-sharp-2.0);g" \
- -e "s;\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe;/usr/bin/gapi2-fixup;" \
- -e "s;\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe;/usr/bin/gapi2-codegen;" \
+ -e "s;\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe;${EPREFIX}/usr/bin/gapi2-fixup;" \
+ -e "s;\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe;${EPREFIX}/usr/bin/gapi2-codegen;" \
-e "s:\$(SYMBOLS) \$(top_builddir)/parser/gapi-fixup.exe:\$(SYMBOLS):" \
-e "s:\$(INCLUDE_API) \$(top_builddir)/generator/gapi_codegen.exe:\$(INCLUDE_API):" \
$(find . -name Makefile.in) || die "failed to fix ${TARBALL}-tarball makefiles"
@@ -487,11 +493,12 @@
# Is only called by gtk-sharp-module_src_configure when $GTK_SHARP_MODULE
# is a member of $gnome_sharp_module_list.
gnome-sharp-tarball_src_configure() {
+ has "${EAPI:-0}" 2 && ! use prefix && EPREFIX=
pkg_check_modules_override GLADESHARP glade-sharp-2.0
pkg_check_modules_override GAPI gapi-2.0
- ac_path_prog_override GAPI_PARSER /usr/bin/gapi2-parser
- ac_path_prog_override GAPI_CODEGEN /usr/bin/gapi2-codegen
- ac_path_prog_override GAPI_FIXUP /usr/bin/gapi2-fixup
+ ac_path_prog_override GAPI_PARSER "${EPREFIX}"/usr/bin/gapi2-parser
+ ac_path_prog_override GAPI_CODEGEN "${EPREFIX}"/usr/bin/gapi2-codegen
+ ac_path_prog_override GAPI_FIXUP "${EPREFIX}"/usr/bin/gapi2-fixup
}
# @FUNCTION: gtk-sharp-module_src_configure
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2011-07-29 13:57 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-21 21:52 [gentoo-commits] gentoo-x86 commit in eclass: gtk-sharp-module.eclass Nirbheek Chauhan (nirbheek)
-- strict thread matches above, loose matches on Subject: below --
2011-07-29 13:57 Jeremy Olexa (darkside)
2011-05-06 4:24 Peter Alfredsen (loki_val)
2011-01-25 14:15 Pacho Ramos (pacho)
2010-11-18 9:06 Pacho Ramos (pacho)
2009-08-23 0:14 Peter Alfredsen (loki_val)
2009-03-18 11:14 Peter Alfredsen (loki_val)
2009-03-17 16:33 Peter Alfredsen (loki_val)
2009-03-17 13:39 Peter Alfredsen (loki_val)
2009-03-09 1:11 Peter Alfredsen (loki_val)
2009-03-09 1:02 Peter Alfredsen (loki_val)
2009-03-03 10:41 Peter Alfredsen (loki_val)
2009-02-25 6:48 Zac Medico (zmedico)
2009-02-24 22:04 Peter Alfredsen (loki_val)
2009-02-08 17:23 Peter Alfredsen (loki_val)
2009-01-29 22:48 Peter Alfredsen (loki_val)
2009-01-23 20:28 Peter Alfredsen (loki_val)
2009-01-23 19:58 Peter Alfredsen (loki_val)
2009-01-06 19:37 Fabian Groffen (grobian)
2009-01-05 22:10 Peter Alfredsen (loki_val)
2009-01-05 20:49 Peter Alfredsen (loki_val)
2008-12-03 20:44 Peter Alfredsen (loki_val)
2008-11-28 0:20 Peter Alfredsen (loki_val)
2008-11-27 5:24 Peter Alfredsen (loki_val)
2008-11-26 14:03 Peter Alfredsen (loki_val)
2008-11-26 10:03 Peter Alfredsen (loki_val)
2008-11-26 0:54 Peter Alfredsen (loki_val)
2008-11-25 23:52 Peter Alfredsen (loki_val)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox