From 49153167c6a62521d5749c3ee769d80710b0ce4b Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 27 Jul 2011 15:51:25 +0000 Subject: [PATCH] Revision bump to fix multilib strictness. Fixes bug #376627. Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- media-gfx/graphite2/ChangeLog | 9 +++++++- media-gfx/graphite2/Manifest | 11 +++++----- .../files/graphite2-multilib-strict.patch | 21 +++++++++++++++++++ ...0.9.4.ebuild => graphite2-0.9.4-r1.ebuild} | 3 ++- 4 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 media-gfx/graphite2/files/graphite2-multilib-strict.patch rename media-gfx/graphite2/{graphite2-0.9.4.ebuild => graphite2-0.9.4-r1.ebuild} (94%) diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog index 7d5ace21621b..5b4726c590b1 100644 --- a/media-gfx/graphite2/ChangeLog +++ b/media-gfx/graphite2/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/graphite2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.3 2011/07/27 10:06:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.4 2011/07/27 15:51:25 scarabeus Exp $ + +*graphite2-0.9.4-r1 (27 Jul 2011) + + 27 Jul 2011; Tomáš Chvátal + +files/graphite2-multilib-strict.patch, -graphite2-0.9.4.ebuild, + +graphite2-0.9.4-r1.ebuild: + Revision bump to fix multilib strictness. Fixes bug #376627. 27 Jul 2011; Tomáš Chvátal graphite2-0.9.4.ebuild: Fix CFLAGS parameters. Should fix build on gcc-4.6. Fixes bug #376567. diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest index 0a64320b2f27..ce5336aa11e9 100644 --- a/media-gfx/graphite2/Manifest +++ b/media-gfx/graphite2/Manifest @@ -3,14 +3,15 @@ Hash: SHA1 AUX graphite2-disablefonttest.patch 3239 RMD160 05de65868555648df40abd219f18855d24440ffe SHA1 4ae5238eaf376ac362e0e70c6f5ba5eded404b3f SHA256 4f216133001c45c0748f870fdfb2afce03be3369409ff63717edecec7b5f2e9d AUX graphite2-includes-libs-perl.patch 536 RMD160 ae964c2aacd8a8d6383b25c1f045fe4771558b09 SHA1 9209a91a11f3e9feb6fd3a449b85d8d1b185788f SHA256 84a1bff6793b9fd49268b9e5927ac249e960d34cac119fe17b8cf35032c9f11b +AUX graphite2-multilib-strict.patch 1190 RMD160 09079fa143c030621ea2d013baa2491335c780ac SHA1 1f40393332628e3feaa473a238e5fc762f437d14 SHA256 c6a7eb3b6f500ef27808cb90287b4e183ac4acf13a47832da7d484bebca8a2a4 DIST graphite2-0.9.4.tgz 3548861 RMD160 6181dd3ecc9741f36255cc431a630243fc7c90cb SHA1 bf7c359c5338b8e0ea54a72985c6c9adb16f6fb8 SHA256 75ea41360ddf0d84364a790c0494708a4e14643915ad517309d330ceb34b60ee -EBUILD graphite2-0.9.4.ebuild 1792 RMD160 e50a8c09dfab23ef525657c5a78888f84a8e24a4 SHA1 00b001790b26b77bcca97603e35805cced4fc791 SHA256 8e2c2ac9a439feed0365a1c20c914f2bec8101bb9d019a405d611282a14ae20e -MISC ChangeLog 771 RMD160 af56f68e4c73eb27402ff73dd35692339af47d0c SHA1 5d6b9439e6671b205bdad4a3c550fcfe0ebf8bf8 SHA256 63a924d240c9687be7747048c1845ede0d7cafe4566b4116cfb671ab7d1fc744 +EBUILD graphite2-0.9.4-r1.ebuild 1838 RMD160 02e81519bd23c95dac4279daa93baaa9f9f2aa4f SHA1 9bf12e3c6560fceb40e7eb892264033695101062 SHA256 832863ddf00611e3b38b2ffcca1496f0ded0b0eee6cc77e278d6651b6a7a5f3e +MISC ChangeLog 1022 RMD160 a4dc174daa982f296952fe30955d1c767a7709ba SHA1 52544cab50887b21cc9e9ed21bdb98654850a1bb SHA256 6763c39b1fc0fd31ac28230aebf5b727d838f429a4979e059c0caa887974ac75 MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4v4z0ACgkQHB6c3gNBRYcqqACeI4I2FfotwRFTos5/ILG/ue7+ -ldcAoK4IMUCFfuGlPkwBTy3vFz9kwq9f -=1YLZ +iEYEARECAAYFAk4wM/8ACgkQHB6c3gNBRYdweACfU9jsohrfXKazgOcyLaZDAqFL +fhwAn0Bh5XnFA+rzVc8GE/LyM8PV8i4v +=dYNF -----END PGP SIGNATURE----- diff --git a/media-gfx/graphite2/files/graphite2-multilib-strict.patch b/media-gfx/graphite2/files/graphite2-multilib-strict.patch new file mode 100644 index 000000000000..66d849a63369 --- /dev/null +++ b/media-gfx/graphite2/files/graphite2-multilib-strict.patch @@ -0,0 +1,21 @@ +diff -urN graphite2-0.9.4.old/CMakeLists.txt graphite2-0.9.4/CMakeLists.txt +--- graphite2-0.9.4.old/CMakeLists.txt 2011-07-27 17:45:26.000000000 +0200 ++++ graphite2-0.9.4/CMakeLists.txt 2011-07-27 17:48:30.000000000 +0200 +@@ -68,5 +68,5 @@ + + configure_file(graphite2.pc.in graphite2.pc) + +-install(FILES ${PROJECT_BINARY_DIR}/graphite2.pc DESTINATION lib/pkgconfig) ++install(FILES ${PROJECT_BINARY_DIR}/graphite2.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) + +diff -urN graphite2-0.9.4.old/src/CMakeLists.txt graphite2-0.9.4/src/CMakeLists.txt +--- graphite2-0.9.4.old/src/CMakeLists.txt 2011-07-27 17:45:26.000000000 +0200 ++++ graphite2-0.9.4/src/CMakeLists.txt 2011-07-27 17:48:04.000000000 +0200 +@@ -182,6 +182,6 @@ + endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + + +-install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin) ++install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin) + install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_) + diff --git a/media-gfx/graphite2/graphite2-0.9.4.ebuild b/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild similarity index 94% rename from media-gfx/graphite2/graphite2-0.9.4.ebuild rename to media-gfx/graphite2/graphite2-0.9.4-r1.ebuild index 4f50cb2cf399..7e3741d712a3 100644 --- a/media-gfx/graphite2/graphite2-0.9.4.ebuild +++ b/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-0.9.4.ebuild,v 1.3 2011/07/27 10:06:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild,v 1.1 2011/07/27 15:51:25 scarabeus Exp $ EAPI=4 @@ -31,6 +31,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-includes-libs-perl.patch" "${FILESDIR}/${PN}-disablefonttest.patch" + "${FILESDIR}/${PN}-multilib-strict.patch" ) pkg_setup() { -- 2.26.2