summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/atk/Manifest2
-rw-r--r--dev-libs/atk/atk-1.24.0.ebuild6
-rw-r--r--eclass/multilib-xlibs.eclass19
-rw-r--r--sets/paludis/32bit-xlibs.conf33
-rw-r--r--x11-libs/cairo/Manifest2
-rw-r--r--x11-libs/cairo/cairo-1.8.6-r1.ebuild11
6 files changed, 61 insertions, 12 deletions
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 02851026d..53b1328a8 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,2 +1,2 @@
DIST atk-1.24.0.tar.bz2 701798 RMD160 63ce673732286f001f908316f06b8eb08c256943 SHA1 85ff5bd8f1879d2a43dfcf4842fc5ea9125dec11 SHA256 03a0b66efb6d69754ca18c133ca4d489dd8675bf366c03f58cc7b39f55a45d56
-EBUILD atk-1.24.0.ebuild 760 RMD160 d003ca980b049016b4f8cef437d3c6e06121eba2 SHA1 5712b87a446d964b7c64ab71e147460cdbb7dcdc SHA256 92d1479c35ed2091e10f620cbb269ae2647b99610ab9d35f0ba9e12c1c3a4221
+EBUILD atk-1.24.0.ebuild 655 RMD160 16aa7371839a7dcd0aefbacf01912e7f4d3a8e66 SHA1 156fb09fd923f6e59ec3f65b7a5af3a22a18a1fe SHA256 3ce631afd9610527517f4ce228df71a67a1e33ce711e9ff450ad681419056a85
diff --git a/dev-libs/atk/atk-1.24.0.ebuild b/dev-libs/atk/atk-1.24.0.ebuild
index e267d22b9..266cabd6a 100644
--- a/dev-libs/atk/atk-1.24.0.ebuild
+++ b/dev-libs/atk/atk-1.24.0.ebuild
@@ -21,9 +21,3 @@ DEPEND="${RDEPEND}
doc? ( >=dev-util/gtk-doc-1 )"
DOCS="AUTHORS ChangeLog NEWS README"
-
-multilib-xlibs_src_install_internal() {
- make DESTDIR="${D}" install || die
- cd "${S}"
- dodoc ${DOCS}
-}
diff --git a/eclass/multilib-xlibs.eclass b/eclass/multilib-xlibs.eclass
index 48d5e67fd..b86890a64 100644
--- a/eclass/multilib-xlibs.eclass
+++ b/eclass/multilib-xlibs.eclass
@@ -19,10 +19,10 @@ inherit base multilib
case "${EAPI:-0}" in
2)
- EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install pkg_postinst
+ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install pkg_postinst
;;
*)
- EXPORT_FUNCTIONS src_compile src_install pkg_postinst
+ EXPORT_FUNCTIONS pkg_setup src_compile src_install pkg_postinst
;;
esac
@@ -31,6 +31,13 @@ EMULTILIB_OCXXFLAGS=""
EMULTILIB_OCHOST=""
EMULTILIB_OSPATH=""
+# @FUNCTION: multilib-xlibs_pkg_setup
+# @USAGE:
+# @DESCRIPTION:
+multilib-xlibs_pkg_setup() {
+ multilib-xlibs_src_generic pkg_setup
+}
+
# @FUNCTION: multilib-xlibs_src_prepare
# @USAGE:
# @DESCRIPTION:
@@ -198,6 +205,14 @@ multilib-xlibs_check_inherited_funcs() {
echo ${declared_func}
}
+# @FUNCTION: multilib-xlibs_pkg_setup_internal
+# @USAGE: override this function if you arent using x-modules eclass and want to use a custom pkg_setup.
+# @DESCRIPTION: needed for gnome2
+multilib-xlibs_pkg_setup_internal() {
+ [[ "${ECLASS_DEBUG}" == "yes" ]] && einfo "Using $(multilib-xlibs_check_inherited_funcs pkg_setup) ..."
+ $(multilib-xlibs_check_inherited_funcs pkg_setup)
+}
+
# @FUNCTION: multilib-xlibs_src_prepare_internal
# @USAGE: override this function if you arent using x-modules eclass and want to use a custom src_configure.
# @DESCRIPTION:
diff --git a/sets/paludis/32bit-xlibs.conf b/sets/paludis/32bit-xlibs.conf
new file mode 100644
index 000000000..49ff913d0
--- /dev/null
+++ b/sets/paludis/32bit-xlibs.conf
@@ -0,0 +1,33 @@
+* media-libs/fontconfig[lib32]
+* media-libs/freeglut[lib32]
+* media-libs/freetype[lib32]
+* media-libs/mesa[lib32]
+* x11-libs/libdrm[lib32]
+* x11-libs/libICE[lib32]
+* x11-libs/libSM[lib32]
+* x11-libs/libX11[lib32]
+* x11-libs/libXau[lib32]
+* x11-libs/libXaw[lib32]
+* x11-libs/libxcb[lib32]
+* x11-libs/libXcomposite[lib32]
+* x11-libs/libXcursor[lib32]
+* x11-libs/libXdamage[lib32]
+* x11-libs/libXdmcp[lib32]
+* x11-libs/libXext[lib32]
+* x11-libs/libXfixes[lib32]
+* x11-libs/libXft[lib32]
+* x11-libs/libXi[lib32]
+* x11-libs/libXinerama[lib32]
+* x11-libs/libXmu[lib32]
+* x11-libs/libXp[lib32]
+* x11-libs/libXpm[lib32]
+* x11-libs/libXrandr[lib32]
+* x11-libs/libXrender[lib32]
+* x11-libs/libXScrnSaver[lib32]
+* x11-libs/libXt[lib32]
+* x11-libs/libXtst[lib32]
+* x11-libs/libXv[lib32]
+* x11-libs/libXvMC[lib32]
+* x11-libs/libXxf86dga[lib32]
+* x11-libs/libXxf86vm[lib32]
+* x11-libs/pixman[lib32]
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index fd46604a8..72cefb799 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,4 +1,4 @@
AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 RMD160 e50d5bf17cbead688a8b808a78fe4104c09af52e SHA1 f63131fd75bb496db59e3ce6bc755bbfb70baacb SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a
AUX cairo-1.8.6-status-return-fix.patch 784 RMD160 cfa21d49438ad4493fd27f619c2ec3286dc4ce97 SHA1 448a1a5c188ac8543c410700dfefa7938c37fcb5 SHA256 9ac4c13454d7ba44a4e3998bf1e25ff3b6dc937885e2f5275de74b9a825bf056
DIST cairo-1.8.6.tar.gz 6616544 RMD160 2374236afabbe248a642bf1cac6a5996f64bed62 SHA1 d1e5479d4eeb7b1a3589672e3ef8f4899e7c5eba SHA256 93a347af0cecf258be8fb54265b16a0fb16317df4a32896141d2987c30773535
-EBUILD cairo-1.8.6-r1.ebuild 3072 RMD160 7a35c8c7d289b5ee36f17781b548801d5827d2c7 SHA1 250cd9e1fb1ad635e189597e0c457e403c424551 SHA256 3bf4992bb93bd4e4dab31055cfabe4fe73a6e066ca132d3e826f51a88f477192
+EBUILD cairo-1.8.6-r1.ebuild 3205 RMD160 46bd500ce3f257da5baf57dd82c7128928a59acb SHA1 f2732defdbbdba78b28b24462bdf313c788d27cd SHA256 e2722a95dcd7e83cae95e4dcc78906bd2ad78168dae91b6a74e20c2ca6f4e23e
diff --git a/x11-libs/cairo/cairo-1.8.6-r1.ebuild b/x11-libs/cairo/cairo-1.8.6-r1.ebuild
index cf3c5a9a9..fab82c4a6 100644
--- a/x11-libs/cairo/cairo-1.8.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.8.6-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="media-libs/fontconfig[lib32?]
media-libs/libpng
>=x11-libs/pixman-0.12.0[lib32?]
directfb? ( >=dev-libs/DirectFB-0.9.24 )
- glitz? ( >=media-libs/glitz-0.5.1 )
+ glitz? ( >=media-libs/glitz-0.5.1[lib32?] )
svg? ( dev-libs/libxml2 )
X? ( >=x11-libs/libXrender-0.6[lib32?]
x11-libs/libXext[lib32?]
@@ -73,8 +73,15 @@ multilib-xlibs_src_configure_internal() {
export glitz_LIBS=$(pkg-config --libs glitz-glx)
fi
+ local myconf
+ if use lib32 && [[ "${ABI}" == "x86" ]]; then
+ myconf="--enable-directfb=no"
+ else
+ myconf="$(use_enable directfb)"
+ fi
+
econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
- $(use_enable directfb) $(use_enable xcb) \
+ ${myconf} $(use_enable xcb) \
$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
$(use_enable debug test-surfaces) --enable-pdf --enable-png \
--enable-ft --enable-ps \