| 1 |
Since we're using shared includes for multilib, the pkg-config needs |
| 2 |
to lie in /usr/share. I have tested that on amd64 both versions |
| 3 |
of the relevant headers are the same. |
| 4 |
--- |
| 5 |
x11-proto/xcb-proto/xcb-proto-9999.ebuild | 11 +++++++++++ |
| 6 |
x11-proto/xproto/xproto-9999.ebuild | 12 +++++++++++- |
| 7 |
2 files changed, 22 insertions(+), 1 deletion(-) |
| 8 |
|
| 9 |
diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild |
| 10 |
index 9fd53a0..793d323 100644 |
| 11 |
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild |
| 12 |
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild |
| 13 |
@@ -25,6 +25,17 @@ src_prepare() { |
| 14 |
xorg-2_src_prepare |
| 15 |
} |
| 16 |
|
| 17 |
+ |
| 18 |
+src_install() { |
| 19 |
+ xorg-2_src_install |
| 20 |
+ |
| 21 |
+ # We are using common includes for multilib, so we need |
| 22 |
+ # to move the pkg-config file to the common location. |
| 23 |
+ dodir /usr/share/pkgconfig |
| 24 |
+ mv "${ED}"/usr/$(get_libdir)/pkgconfig/${PN}.pc \ |
| 25 |
+ "${ED}"/usr/share/pkgconfig || die |
| 26 |
+} |
| 27 |
+ |
| 28 |
pkg_postinst() { |
| 29 |
python_mod_optimize xcbgen |
| 30 |
} |
| 31 |
diff --git a/x11-proto/xproto/xproto-9999.ebuild b/x11-proto/xproto/xproto-9999.ebuild |
| 32 |
index d8e824c..6897f8f 100644 |
| 33 |
--- a/x11-proto/xproto/xproto-9999.ebuild |
| 34 |
+++ b/x11-proto/xproto/xproto-9999.ebuild |
| 35 |
@@ -5,7 +5,7 @@ |
| 36 |
EAPI=4 |
| 37 |
|
| 38 |
XORG_DOC=doc |
| 39 |
-inherit xorg-2 |
| 40 |
+inherit multilib xorg-2 |
| 41 |
|
| 42 |
DESCRIPTION="X.Org xproto protocol headers" |
| 43 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 44 |
@@ -22,3 +22,13 @@ src_configure() { |
| 45 |
) |
| 46 |
xorg-2_src_configure |
| 47 |
} |
| 48 |
+ |
| 49 |
+src_install() { |
| 50 |
+ xorg-2_src_install |
| 51 |
+ |
| 52 |
+ # We are using common includes for multilib, so we need |
| 53 |
+ # to move the pkg-config file to the common location. |
| 54 |
+ dodir /usr/share/pkgconfig |
| 55 |
+ mv "${ED}"/usr/$(get_libdir)/pkgconfig/${PN}.pc \ |
| 56 |
+ "${ED}"/usr/share/pkgconfig || die |
| 57 |
+} |
| 58 |
-- |
| 59 |
1.8.1.1 |
Archives