diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2011-12-09 04:08:03 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2011-12-09 04:08:03 +0000 |
| commit | 12392839f9b6b4ee18ad6604e8c5ea5f82dfc545 (patch) | |
| tree | ab9e7034fc794db3823fbda343efb97a1d815dcd /x11-libs | |
| parent | Also ignore warnings when trying to delete old .keep files if the rcscripts/ ... (diff) | |
| download | historical-12392839f9b6b4ee18ad6604e8c5ea5f82dfc545.tar.gz historical-12392839f9b6b4ee18ad6604e8c5ea5f82dfc545.tar.bz2 historical-12392839f9b6b4ee18ad6604e8c5ea5f82dfc545.zip | |
Remove stray DESTDIR from collision patch that created a broken symlink in
binpkgs (bug #384725 by Thomas Rausch).
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/wxGTK/Manifest | 10 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index 1810b1607827..91f17d221afd 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/wxGTK # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.276 2011/12/09 03:42:26 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.277 2011/12/09 04:08:03 dirtyepic Exp $ + + 09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> + files/wxGTK-2.8.11-collision.patch: + Remove stray DESTDIR from collision patch that created a broken symlink in + binpkgs (bug #384725 by Thomas Rausch). 09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> -wxGTK-2.8.10.1-r5.ebuild, -files/wxGTK-2.8.10-collision.patch: diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 1f79c73d8ed7..0e9d9c219b57 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -10,7 +10,7 @@ AUX wxGTK-2.8.10.1-CVE-2009-2369.patch 2348 RMD160 0b0c37a21bd68a99d837592c7745b AUX wxGTK-2.8.10.1-gsocket.patch 480 RMD160 8aa2654dfe926980388235a91d78aa73fc8471d1 SHA1 885442567f2f80f78f9ed4f0ac2483c6fc932efe SHA256 a2955800a8ece8d3e328d0a287bd73d021cf7e14898432b1771e708a1f960fac AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 RMD160 2444b56d28dacf4def2e329419596a491e88f2a2 SHA1 80039dc3e6a796c6fa86088d0c2d6ccda1a3d040 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698 AUX wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch 1620 RMD160 5263552010efd258e94251f215d26ed0b2cedd38 SHA1 a18887d73b8c04a865f10521f5197ed217ec6c6d SHA256 28574bdcdddf6223038727d2bb0637611d3e39bb6613ed8353634e7d2621658f -AUX wxGTK-2.8.11-collision.patch 5720 RMD160 afce2ed0ce4247f43d6db92e6652f739f58aa97e SHA1 8fc4d98b5bfc0cdf755795fff9eb6c8cb8009cdd SHA256 f2fc90c35c798b9546117707b3f9d81d627a122b9bf395657d78c79355ae717d +AUX wxGTK-2.8.11-collision.patch 5710 RMD160 fd89803d48791e2900fec6ef4de1db8c650b3cdf SHA1 1a8c83d14fd8035843095cd18ecbc277bd63bf88 SHA256 b4a34748a0e3c8f784d777b197f903de9d681baf12395fa1b8a5d2b2636c9ffe AUX wxGTK-2.8.11-libpng15.patch 1390 RMD160 0f835458016a5eddda4f865ddadc6f96da72be58 SHA1 44c6086e3651c669df468bd129161693d0ba3e55 SHA256 b04b82f0db227cd1b5d2d5cd332b917eac1cd18967eab84791e23375e6245982 AUX wxGTK-2.8.11-unicode-odbc.patch 624 RMD160 436cc03a4e45ed649298cf08a8ec134b97f4c4b5 SHA1 6cdf8f6e5140355d7bf6433d3afad483201c0961 SHA256 2e2cbeb2240770497611bf845127f737e67311c4b898d21446fc3d739941cb65 AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 SHA1 2c453b6a70de916ffc9e61518937fc6f487bd9bb SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85 @@ -24,12 +24,12 @@ EBUILD wxGTK-2.6.4.0-r6.ebuild 5079 RMD160 355f1a2077d296254dfd172d914555407d460 EBUILD wxGTK-2.8.11.0.ebuild 3607 RMD160 6c432fdde32ef01a5ea96101e78e4b0df950b260 SHA1 8d982b93d53c1829048d857b38fe6cdd4aa0bdec SHA256 468ea1693f80687de7cabf75f93a1a2b6c8588cf8d012be1489b8ada9e58a424 EBUILD wxGTK-2.8.12.0.ebuild 3979 RMD160 717015350f482fb45d264c46cadf74642422106a SHA1 7c930fc1f126bd93950a0fac183bc94b1fc019c8 SHA256 7797afed776dfa65b7dc0446c5ff86bdbdb0f2587cc9f6df8e7e7a3cfe38912a EBUILD wxGTK-2.9.1.1.ebuild 4173 RMD160 146b9a46d5f274e048d17620aadcf278c85ff2cd SHA1 aaa2dc23d443ebaadedfba1e5fe7859309e169b8 SHA256 1a37870888dcff024271330dfd4d2251a82c6a61211ebd390c04c5281e4e18c2 -MISC ChangeLog 43307 RMD160 b76d2951ee8ecc74e0d134f4f6c8cc39ea3c4021 SHA1 c600232db00e6289a8089dd34f112df9da27e31a SHA256 24ff5aac4f7621bc80192e3c2ab4ccdd98f8a4a019b9f78a918c3706a641f5ef +MISC ChangeLog 43513 RMD160 01a9a6a24551c3e9033579f3d3d54c8fb80fec71 SHA1 30ea452284f9e6f57f9998dfa327784cc931a75b SHA256 00e9410d572b6c383df19a937833a1e4328025072ee6ab5753cf3c2297cb0c06 MISC metadata.xml 670 RMD160 af633c7a38fd8d4fce77e2e05836d38c3ecccf54 SHA1 a463ce81e4784cb35f53a5fb7551a508fa5fce19 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7hhgEACgkQiqiDRvmkBmJ3KgCffmRUcvsx8/lnvBIEOqP0bk3X -yPoAn21bcN3q9P1P1QzWr0/flqJ1Y8sU -=OiDS +iEYEARECAAYFAk7hjAIACgkQiqiDRvmkBmJS4gCfaRSqbTZyvzxGg1FR/FfHvNAO +n9kAoLQUrRMIT4uphVtCkzQ/LP9+L90T +=XLaE -----END PGP SIGNATURE----- diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch index c41743a34ac0..1401b7fb922c 100644 --- a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch +++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch @@ -29,7 +29,7 @@ Prevent file collisions between multiple installed SLOTs. $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config - (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ -+ && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) ++ && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale |