Remove last remnants of qt3support, thanks to Tyrok and Rafał Mużyło, bug 394099

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
index a18a412b024a5095b8d48bdb6e0c1d5c471e8624..c1fa569a7b06d027ddbd11d92b37a6009d53132c 100644 (file)
--- a/media-gfx/freecad/ChangeLog
+++ b/media-gfx/freecad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/freecad
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.6 2012/01/07 16:09:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.7 2012/01/07 16:23:50 dilfridge Exp $
+
+  07 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  freecad-0.12.5284-r2.ebuild, +files/freecad-0.12.5284-qt3support.patch:
+  Remove last remnants of qt3support, thanks to Tyrok and Rafał Mużyło, bug
+  394099
 
 *freecad-0.12.5284-r2 (07 Jan 2012)
 

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 521c6dfb92f024633df1c8e0045890442da90b08..c5ba739236ef80a0c2d361ade0a3cfa7735594db 100644 (file)
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -6,27 +6,28 @@ AUX freecad-0.12.5284-gcc46.patch 424 RMD160 1c88a1b7dccd92d9d906d7a01edf3a2bac3
 AUX freecad-0.12.5284-glu.patch 441 RMD160 b72b8bb579b6d08c62abbc65d6ca727244241804 SHA1 f57286bc450f7267c6bc76e3e9b791e1394456e6 SHA256 7375de7bd4880070afd6c45ea7c9f5c2214b4f76f028ad89c1cd013883c802e0
 AUX freecad-0.12.5284-nodir.patch 776 RMD160 49cc0092e4cacefc9cd12c07239ba55bb1a47ec3 SHA1 6cb199641e299b455221dd9942735fc3edbff2f9 SHA256 9ce3f5897311c4b26678d432a9f725d5469eaff855de59d97cb1fd12e320bb3b
 AUX freecad-0.12.5284-nopivy.patch 751 RMD160 0864c7aba43f669496ae75ee29405d0fde33d58d SHA1 994dfc400fefbe4aae127bc001400a46a882e7bf SHA256 3424f2630cd739ecb5ddcd7824469c44d6e89c2fe97a9e123090d7b8d04dfcfd
+AUX freecad-0.12.5284-qt3support.patch 1819 RMD160 fa2aa6715cde302c6caab83fb2c32eb8927ff402 SHA1 5ed2e852e429138889d9ef24b327b7a55e7c766e SHA256 a04ffcbeefe04e52a771fbb93467e32392d2bdb41b59bda41d45c3018f6c0eef
 AUX freecad-0.12.5284-removeoldswig.patch 5165 RMD160 c157e9d72ede6ed96fc82b116b32dd2009ef10bf SHA1 48102dd88918f11b99b4e52df5ff72cde848833e SHA256 a5f44ac26071e1769c0686de30bbd2ca2a5fd03cb44222a1625f23c6f5ad6fc8
 DIST freecad-0.11.3729.tar.gz 16229615 RMD160 ac056ace72758d83dddfd075205bfeb81020df70 SHA1 fb683989e1a53a9292cc12940c98c41505124512 SHA256 94dcf25e6ae2934d7d23555e22a558643225a9809d443c898f096b39a1853261
 DIST freecad-0.12.5284.tar.gz 48399004 RMD160 6f8175509091592b72c74584b3a3418391022317 SHA1 29f80b84c5405d5dc9ab988db2c2a41018b90b15 SHA256 45486c6cc3ae212fd3eba994c603fd97962c7f505bf2a807d1533f9ee6d6026d
 EBUILD freecad-0.11.3729.ebuild 2306 RMD160 aa15612a86fedda3c63c26814fe7ebfe84c35c17 SHA1 5c90687979675f4dab1b7e972f977a37fbc9c6ab SHA256 826c345120f23701ad6aa69da12e0d0b88adcbb56987eb0cf2ceb0b3ca05e9c1
-EBUILD freecad-0.12.5284-r2.ebuild 2047 RMD160 ce0697e24d0e8c0cc761d0972a064c89b923ed9e SHA1 f6b00d4ca788156b4ca527268e2ace9088f9565f SHA256 59d20cf61c3db567eec471719969ce690211ef6fc59ada61ee30ec741a36049b
-MISC ChangeLog 1445 RMD160 c4fe8a2c799dc4e94dad0e0d6c1669601949d349 SHA1 98fb4332663dfbde910a95bd7c5527fff3d75f57 SHA256 14ffbe874029c3d90d2e840f6209b1c55ccfc9d6d2496dd02cfd4ce6f58a1a35
+EBUILD freecad-0.12.5284-r2.ebuild 2084 RMD160 ea0b56ae4d37ebc1488f5d99d5191c602f13f715 SHA1 c1461f8256511bbafb2caeaab209f3b94da8b649 SHA256 e53e16f35a92bd8c9fe54f9783e7e74e4822c7e633fb1551aaac333d368b96a4
+MISC ChangeLog 1665 RMD160 f0ec879790708f54d036c1593fc07f944b53e6d1 SHA1 7ef34f3d314a3cdafc75446e87639ef8c4cba82f SHA256 4043a79d881d6e69717591076664a8a0fccfd3299c866dccbc9836d32741d38c
 MISC metadata.xml 217 RMD160 aa960d9d3f7d900bcaf1a9413f17c3662adc0820 SHA1 a8a3016deab1f6aca4951ea86977cfe5d509b695 SHA256 756924c88548f738071c2d39fa7e18737b063e3b8f4376737eb88ac307571478
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPCG5HAAoJEEb+UGWnxTyH3jIQAJhVpavQqlKAYd1B0KBxmn3r
-qYDjk9hk9ai2mx8cpIa0y+8Csfk685jWf3kcBYdMXhw3Wo0BYLD1Ct6Z6Q1vkQlP
-tQM2AAnapnXHNcqKXkE87ChOqFANCAGdxkrXVgtdKo9uh4TAc9t46LMj8w5voXRN
-b1L1hdIv7VV6AHjmIgsamhgCUzXJpsn2rW/Mms56lBdQAKZNTultAWKLWFwHX25d
-V2Pt7GG8T8Ag+6mhm3H1o8N5Lzcbj15huGDIdYfToznsuTjH5TDzxzIbOrw/s0ym
-8UvFBxLCmidD2H/8nKEpbeOrvysp2DWaphxsJMyNls4L9uyniXMs+1dCZDeWWENR
-EQEeb4hFm1CZRkZfShB8yCNuyxEDjB5iOGoa2LNKAo8Id1quQyJesFwS0e7PW0TF
-Ky4Mu8XP94glAAtvE/0VHpP3aK8TOoVJk1NYC8hgjoKC6H3BjtHoIaGqRE8Kmz2r
-zUVGVjYA3y8qv1uHsxj9s2acb/nl09WQbSxgv1OwhJGXeG1BA7k2dKjcT3emE2A4
-f1j7Liio1DA298O9WobqZB68euTOvSUugHhHjAN31pE9TOK3IqmTTqU9+yaF1rJJ
-WSFhCe6p2L1HU9Qo7+pwrP0HqBsFvTkhLD2kMSjh4I/NcrMZQr+2VRnx3JGBY+dR
-IwUoI1ebuwEO4VWRaxAr
-=czEe
+iQIcBAEBCgAGBQJPCHGeAAoJEEb+UGWnxTyH4/UQALmIxiIQSJ7mdkuRmXvxO7n4
+mWHOAnVd3WvaBYVx6KCjCVRrOuvnW/nvqcvkBJEA+XfLlGxb8kt0cMXWrKZzIwCl
+jI2lqSsez1KVE0l5omMRiSdpQ4Sdg7CzWBdLyYvpE4/zpPYzBxokgqCfdMXCsPeT
+hWE6eMko+HEu+BK4Q3T98Im5purKrQr2eR1uyZ6Eyswdky59mHMz2YTM0Dppyiqq
+5kGJEx1cRO5gyNbJjD0yIZ9QBjxAcBYZpoltN7NBMT3sePTlPGHXAJ6bFXb/tznL
+oQhaK8F3CiABX4rrpzreDEoK1WmVN8Ct3hxr2MqUSQ44rPan+rwJMTvQNfu5//d+
+W9G85vGEsejquqzg5fyheoqWwU61TfILOa5rmGCCRaY2JpBC2ea+zVno34lVak53
+tpXiiKfTzEHSWh3uUkgoB9l5EJ0iDbAZZFWvg6MpYkBtJwtTpjDIAYYOZV1sJCtZ
+BpobEyfvQEZycF5Rff+Qda5rwJ8faCqs0+j+uaB1Uds8d7l09dSsIDOWBRmgiKty
+sDVwfnIppEaQYR5U58ugcMajYprHDI2vJso4aK30SVdHKN/pzM/8ReX0ARAqHaEE
+CkteaERHDhFKcYAOFELfPqmSZL/SG8zs2leq2c3ZP2FZN9gQ3pmB6WpOErCFhyEw
+uQKoGaQSktKKW4p92fu8
+=VT41
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/freecad/files/freecad-0.12.5284-qt3support.patch b/media-gfx/freecad/files/freecad-0.12.5284-qt3support.patch
new file mode 100644 (file)
index 0000000..1548c2f
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.12.5284-qt3support.patch
@@ -0,0 +1,36 @@
+diff -ruN FreeCAD-0.12.5284.orig/src/Mod/Arch/Resources/ui/archprefs-base.ui FreeCAD-0.12.5284/src/Mod/Arch/Resources/ui/archprefs-base.ui
+--- FreeCAD-0.12.5284.orig/src/Mod/Arch/Resources/ui/archprefs-base.ui 2012-01-03 13:26:11.000000000 +0100
++++ FreeCAD-0.12.5284/src/Mod/Arch/Resources/ui/archprefs-base.ui      2012-01-07 17:15:29.000000000 +0100
+@@ -133,7 +133,7 @@
+   </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11"/>
+- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
++ <pixmapfunction></pixmapfunction>
+  <customwidgets>
+   <customwidget>
+    <class>Gui::ColorButton</class>
+diff -ruN FreeCAD-0.12.5284.orig/src/Mod/Draft/Resources/ui/userprefs-base.ui FreeCAD-0.12.5284/src/Mod/Draft/Resources/ui/userprefs-base.ui
+--- FreeCAD-0.12.5284.orig/src/Mod/Draft/Resources/ui/userprefs-base.ui        2012-01-03 13:25:30.000000000 +0100
++++ FreeCAD-0.12.5284/src/Mod/Draft/Resources/ui/userprefs-base.ui     2012-01-07 17:15:11.000000000 +0100
+@@ -957,7 +957,7 @@
+   </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11"/>
+- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
++ <pixmapfunction></pixmapfunction>
+  <customwidgets>
+   <customwidget>
+    <class>Gui::FileChooser</class>
+diff -ruN FreeCAD-0.12.5284.orig/src/Mod/Draft/Resources/ui/userprefs-import.ui FreeCAD-0.12.5284/src/Mod/Draft/Resources/ui/userprefs-import.ui
+--- FreeCAD-0.12.5284.orig/src/Mod/Draft/Resources/ui/userprefs-import.ui      2012-01-03 13:25:30.000000000 +0100
++++ FreeCAD-0.12.5284/src/Mod/Draft/Resources/ui/userprefs-import.ui   2012-01-07 17:14:50.000000000 +0100
+@@ -411,7 +411,7 @@
+   </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11"/>
+- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
++ <pixmapfunction></pixmapfunction>
+  <customwidgets>
+   <customwidget>
+    <class>Gui::FileChooser</class>

diff --git a/media-gfx/freecad/freecad-0.12.5284-r2.ebuild b/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
index 0716b84902e809d18d5af757b916073bf4045c45..d0aa75e67dd1af9daf2bd6b902e939498428ba9c 100644 (file)
--- a/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r2.ebuild,v 1.1 2012/01/07 16:09:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r2.ebuild,v 1.2 2012/01/07 16:23:50 dilfridge Exp $
 
 EAPI=4
 PYTHON_DEPEND=2
@@ -55,6 +55,7 @@ PATCHES=(
        "${FILESDIR}/${P}-glu.patch"
        "${FILESDIR}/${P}-nodir.patch"
        "${FILESDIR}/${P}-nopivy.patch"
+       "${FILESDIR}/${P}-qt3support.patch"
 )
 
 pkg_setup() {