diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-08 05:06:31 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-08 05:06:31 +0000 |
| commit | e62531d9521f43fa4940713936a5e67df58a2dfa (patch) | |
| tree | b41cd2b5eb9d00772e872db556546e28cc504845 /sys-apps/dbus | |
| parent | New tarball (diff) | |
| download | gentoo-2-e62531d9521f43fa4940713936a5e67df58a2dfa.tar.gz gentoo-2-e62531d9521f43fa4940713936a5e67df58a2dfa.tar.bz2 gentoo-2-e62531d9521f43fa4940713936a5e67df58a2dfa.zip | |
Multilib fix for python.
(Portage version: 2.0.51.16)
Diffstat (limited to 'sys-apps/dbus')
| -rw-r--r-- | sys-apps/dbus/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-0.23-r2.ebuild | 13 | ||||
| -rw-r--r-- | sys-apps/dbus/files/dbus-0.23-pyexecdir.patch | 22 |
3 files changed, 38 insertions, 3 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index adfa0c957122..d07668b0e0d4 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/dbus # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.30 2005/02/06 17:09:45 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.31 2005/02/08 05:04:53 eradicator Exp $ + + 07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> + +files/dbus-0.23-pyexecdir.patch, dbus-0.23-r2.ebuild: + Multilib fix for python. *dbus-0.23-r2 (06 Feb 2005) diff --git a/sys-apps/dbus/dbus-0.23-r2.ebuild b/sys-apps/dbus/dbus-0.23-r2.ebuild index c888ea2c9709..6f8c35fe95c1 100644 --- a/sys-apps/dbus/dbus-0.23-r2.ebuild +++ b/sys-apps/dbus/dbus-0.23-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23-r2.ebuild,v 1.1 2005/02/06 17:09:45 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23-r2.ebuild,v 1.2 2005/02/08 05:04:53 eradicator Exp $ # because of the experimental nature debug by default -inherit debug eutils mono python +inherit debug eutils mono python multilib # FIXME : fix docs #IUSE="X gtk qt python mono doc xml2" @@ -49,6 +49,15 @@ src_unpack() { # add missing include (#78617) epatch ${FILESDIR}/${P}-fd_set.patch + # It stupidly tries to install python stuff to platform-independent + # libdir + epatch ${FILESDIR}/dbus-0.23-pyexecdir.patch + + # Don't rerun auto* + sleep 1 + touch ${S}/python/Makefile.in + sleep 1 + touch ${S}/configure } src_compile() { diff --git a/sys-apps/dbus/files/dbus-0.23-pyexecdir.patch b/sys-apps/dbus/files/dbus-0.23-pyexecdir.patch new file mode 100644 index 000000000000..b318b0cabf34 --- /dev/null +++ b/sys-apps/dbus/files/dbus-0.23-pyexecdir.patch @@ -0,0 +1,22 @@ +--- dbus-0.23/python/Makefile.am.orig 2004-06-23 07:59:44.000000000 -0700 ++++ dbus-0.23/python/Makefile.am 2005-02-07 20:54:31.666429469 -0800 +@@ -5,7 +5,7 @@ INCLUDES=-I$(top_builddir) -I$(top_build + dbusdir = $(pythondir) + dbus_PYTHON = dbus.py + +-dbusbindingsdir = $(pythondir) ++dbusbindingsdir = $(pyexecdir) + dbusbindings_LTLIBRARIES = dbus_bindings.la + + dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings +--- dbus-0.23/python/Makefile.in.orig 2005-01-12 14:21:19.000000000 -0800 ++++ dbus-0.23/python/Makefile.in 2005-02-07 20:57:07.574757812 -0800 +@@ -295,7 +295,7 @@ SUBDIRS = examples + INCLUDES = -I$(top_builddir) -I$(top_builddir)/dbus $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) $(PYTHON_INCLUDES) + dbusdir = $(pythondir) + dbus_PYTHON = dbus.py +-dbusbindingsdir = $(pythondir) ++dbusbindingsdir = $(pyexecdir) + dbusbindings_LTLIBRARIES = dbus_bindings.la + dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings + dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la |