diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-06-28 22:28:32 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-06-28 22:28:32 +0000 |
commit | 22833fc2922e11464b53b2abb03f2440ceb0579f (patch) | |
tree | bd70041ecd8334b71be4616b1475ba92bfd0bb22 /x11-libs | |
parent | old (diff) | |
download | historical-22833fc2922e11464b53b2abb03f2440ceb0579f.tar.gz historical-22833fc2922e11464b53b2abb03f2440ceb0579f.tar.bz2 historical-22833fc2922e11464b53b2abb03f2440ceb0579f.zip |
Fix prrll installation, 298803 and remoed broken test, #298802
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/guile-gtk/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/guile-gtk/Manifest | 14 | ||||
-rw-r--r-- | x11-libs/guile-gtk/files/2.1-brokentest.patch | 18 | ||||
-rw-r--r-- | x11-libs/guile-gtk/files/2.1-prll-install.patch | 13 | ||||
-rw-r--r-- | x11-libs/guile-gtk/guile-gtk-2.1.ebuild | 24 |
5 files changed, 56 insertions, 19 deletions
diff --git a/x11-libs/guile-gtk/ChangeLog b/x11-libs/guile-gtk/ChangeLog index d28479a12ef2..f83102a061c4 100644 --- a/x11-libs/guile-gtk/ChangeLog +++ b/x11-libs/guile-gtk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/guile-gtk # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/ChangeLog,v 1.34 2010/06/28 21:35:34 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/ChangeLog,v 1.35 2010/06/28 22:28:32 jlec Exp $ + + 28 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/2.1-brokentest.patch, + guile-gtk-2.1.ebuild, +files/2.1-prll-install.patch: + Fix prrll installation, 298803 and remoed broken test, #298802 28 Jun 2010; Christoph Mende <angelos@gentoo.org> guile-gtk-2.1.ebuild: Stable on amd64 wrt bug #326019 diff --git a/x11-libs/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest index 597cb908eaa0..63f895086c38 100644 --- a/x11-libs/guile-gtk/Manifest +++ b/x11-libs/guile-gtk/Manifest @@ -1,6 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 +AUX 2.1-brokentest.patch 540 RMD160 529624352d1d33ca288460e995763d470484c182 SHA1 94eab8d293c9da274d44d881e8706c8f999970a7 SHA256 0e12a50b48ab4aed771e56d137f6199cc5b3994970f97ae2125acad5aba6941c +AUX 2.1-prll-install.patch 421 RMD160 c0736b01e21b53622df840b95e9f63b3a417b37f SHA1 efd73f287772db2695f6fba4ed2530ed9f8f73b9 SHA256 9f2aa837ee4cae17e703e4367179e64e69c0759f601ad3acd74431222e420b0d AUX guile-gtk-0.19-Makefile.in.patch 556 RMD160 72b626b414a22de64987a442d73309b3b8fa30ff SHA1 55f6745826baaea37560fbb8659ced162a601372 SHA256 edfa2c0a22e339d19428499e03b05817a7cb13bfe1c1a5bbaab9843729d48cd7 AUX guile-gtk-2.0-g-object-ref.diff 1239 RMD160 5f7f7b567bf26ed1ca247bb031067e9deb3843c6 SHA1 5838fcb4fbed6af1a33cb72498eeedd281c31205 SHA256 fb68d90e21c8d7fb2b73c55a068b5528ae56c82336b200012f97b8abe56242fc DIST guile-gtk-0.41.tar.gz 697414 RMD160 6dc9f8e942c64ff8d10af561f1d7b6a577588b0b SHA1 850767d4239811a2ed83e8dee8d72246a0aed44b SHA256 1193faf62d176470d9eea846c590da019d2b980c8472960fdd8f2c55d502193d @@ -12,13 +14,13 @@ EBUILD guile-gtk-1.2.0.31.ebuild 805 RMD160 caa60d73352b9dc409826f6059660caddcf7 EBUILD guile-gtk-1.2.0.41.ebuild 796 RMD160 e87298f93d46146e7da32d16bb9194fcb4217ad4 SHA1 389bb28e15f7176d002efc1efb460a72c0bfdc1e SHA256 cab996b11517033bd1c86d77dcca3ef66e18c0dd5e568279fa7cfe29faf2e1e0 EBUILD guile-gtk-1.2.0.60.ebuild 776 RMD160 4d97b12f93a114e92f0edba93166002afc4b0e62 SHA1 69e08f490ebf6ff177faaac46c6fb8c8687e3462 SHA256 9f824a51a044c4bed34293662b88ea69d21e7f3dbabe0ec55f8c571ac8b19be5 EBUILD guile-gtk-2.0.ebuild 1080 RMD160 84fc8d60671c7a9a2fe5d51cbcb9f7c83228effb SHA1 902f4e69061b7c3075449828e1288772fe786dc8 SHA256 a9de52a986a831f8b7cddb7764fe42b4e8bdd33c08748fcc2e5de5c03f4dd169 -EBUILD guile-gtk-2.1.ebuild 1138 RMD160 93ad1464f7ce45a5a959c7c918cbab85b6c08eb3 SHA1 116812910d020878abebcbebf4b7f62a1da8a19b SHA256 9cbbddb614266f271e8c0e2bb9e75075030d67035ac972154f69b71cb78109b1 -MISC ChangeLog 4358 RMD160 f62484ca40443b3f01db723e3ac6192708c9ab77 SHA1 18c56053fc5ec480ab4d2b28ff1233ddb34f4ce8 SHA256 3e38775b0c00aacf32145d9aaab3c43f8500a6a8dd7b2aac7fc83f0c0d2689bf +EBUILD guile-gtk-2.1.ebuild 1203 RMD160 88194ffe3faafcbcb697548a075f626b67e59d5e SHA1 9f74faaa872f78b87106ae958539ffa4a8e5786c SHA256 98b6f39e0ad26fdcde18a3024f9080a6a2116ecc6eb3fa71a8dd97ac8b1077fe +MISC ChangeLog 4552 RMD160 2e8bff1706760ec6fd26a509f0113117f23b558b SHA1 6c8894c52c2e6b5c3b474b914333fc7685bdb99b SHA256 613384183f3d2294cbb816b736aaf6b934e657e6237f51beb308248070797c92 MISC metadata.xml 383 RMD160 594d1ff2899049ee525b97cfa541c7aeb3cc6d2d SHA1 75b1a5d6f5fdd1a328498f7e82c54ab62f6163c0 SHA256 703a18a1572fa929ca3f575b294703022e2f771d3fff0b22e895cd452076feaa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iF4EAREIAAYFAkwpFcUACgkQmWq1bYTyC0NDNwD/SoaXY/7HMjSJ/UxhIcXlQGc3 -OQG6ey4HxuWHYNn7nvYA/2eDROL5skSX75mOSAuHCHZBS4YM+efBnkqmoosOXA2Q -=2Lwa +iEYEARECAAYFAkwpIhYACgkQgAnW8HDreRZ+NACcDRRvc3dbNOjY3KC7b7TCoYwg +sw0AmgMP5h4XGDm4XmY/F8vcgJMMrw7r +=0bx6 -----END PGP SIGNATURE----- diff --git a/x11-libs/guile-gtk/files/2.1-brokentest.patch b/x11-libs/guile-gtk/files/2.1-brokentest.patch new file mode 100644 index 000000000000..9fe058cc6b12 --- /dev/null +++ b/x11-libs/guile-gtk/files/2.1-brokentest.patch @@ -0,0 +1,18 @@ +diff --git a/tests/gdk.scm b/tests/gdk.scm +index 6e08f9f..36941f5 100644 +--- a/tests/gdk.scm ++++ b/tests/gdk.scm +@@ -1106,13 +1106,6 @@ + ;; gdk-selection-property-get + ;; + +-(malloced-steady ;; with nothing ever requested +- (lambda () +- (let* ((win sample-win) +- (want '(#f NONE 0)) +- (got (gdk-selection-property-get win))) +- (test "gdk-selection-property-get" sample-win want got)))) +- + (malloced-steady ;; on a destroyed window + (lambda () + (let* ((win (gdk-window-new #f 100 100 '() 'input-output 'toplevel)) diff --git a/x11-libs/guile-gtk/files/2.1-prll-install.patch b/x11-libs/guile-gtk/files/2.1-prll-install.patch new file mode 100644 index 000000000000..b00fc29ca34a --- /dev/null +++ b/x11-libs/guile-gtk/files/2.1-prll-install.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 822a170..37f43b5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -72,7 +72,7 @@ gdkdefs = gdk-2.0.defs + defsdir = $(datadir)/guile-gtk/ + defs_DATA = $(gtkdefs) $(gdkdefs) + +-install-exec-local: ++install-exec-hook: + rm -f $(DESTDIR)$(bindir)/build-guile-gtk + rm -f $(DESTDIR)$(bindir)/guile-gtk + ln $(DESTDIR)$(bindir)/build-guile-gtk-2.0 $(DESTDIR)$(bindir)/build-guile-gtk diff --git a/x11-libs/guile-gtk/guile-gtk-2.1.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1.ebuild index b7b7cedf1b59..1ecd2bf5ad2e 100644 --- a/x11-libs/guile-gtk/guile-gtk-2.1.ebuild +++ b/x11-libs/guile-gtk/guile-gtk-2.1.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/guile-gtk-2.1.ebuild,v 1.4 2010/06/28 21:35:34 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/guile-gtk-2.1.ebuild,v 1.5 2010/06/28 22:28:32 jlec Exp $ -inherit virtualx eutils +EAPI="2" + +inherit autotools eutils virtualx DESCRIPTION="GTK+ bindings for guile" HOMEPAGE="http://www.gnu.org/software/guile-gtk/" @@ -18,9 +20,6 @@ RDEPEND="dev-scheme/guile >=x11-libs/gtkglarea-1.90" DEPEND="${RDEPEND}" -# needs X -RESTRICT="test" - pkg_setup() { if has_version =dev-scheme/guile-1.8*; then local flags="deprecated" @@ -29,19 +28,20 @@ pkg_setup() { fi } -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}/${PN}-2.0-g-object-ref.diff" + epatch "${FILESDIR}"/${PV}-prll-install.patch + epatch "${FILESDIR}"/${PV}-brokentest.patch + eautoreconf } -#src_test() { -# Xemake check || die "tests failed" -#} +src_test() { + Xemake check || die "tests failed" +} src_install() { # bug #298803 - emake -j1 DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" dodoc README AUTHORS ChangeLog NEWS TODO insinto /usr/share/doc/${PF}/examples doins -r examples/ |