Migrate to EAPI 5. Add missing dependencies. Fix .desktop validation. Improve underlinking patch. Fix build failure with freetype wrt bug #467998.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

6 files changed, 100 insertions, 24 deletions

diff --git a/media-gfx/kpovmodeler/ChangeLog b/media-gfx/kpovmodeler/ChangeLog
index ae3673af07c4..8888367e50f9 100644
--- a/media-gfx/kpovmodeler/ChangeLog
+++ b/media-gfx/kpovmodeler/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/kpovmodeler
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kpovmodeler/ChangeLog,v 1.9 2011/10/28 23:55:16 abcd Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kpovmodeler/ChangeLog,v 1.10 2013/06/03 17:12:22 kensington Exp $
+
+*kpovmodeler-1.1.3-r1 (03 Jun 2013)
+
+  03 Jun 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/kpovmodeler-1.1.3-desktop.patch,
+  +files/kpovmodeler-1.1.3-freetype-include.patch, +kpovmodeler-1.1.3-r1.ebuild,
+  files/kpovmodeler-1.1.3-underlinking.patch:
+  Migrate to EAPI 5. Add missing dependencies. Fix .desktop validation. Improve
+  underlinking patch. Fix build failure with freetype wrt bug #467998.
 
   28 Oct 2011; Jonathan Callen <abcd@gentoo.org> kpovmodeler-1.1.3.ebuild:
   Bump to EAPI=4
@@ -18,4 +27,3 @@
   20 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
   +kpovmodeler-1.1.3.ebuild:
   Initial commit wrt #293224, thanks to Erik Boritsch for reporting.
-
diff --git a/media-gfx/kpovmodeler/Manifest b/media-gfx/kpovmodeler/Manifest
index 43e991464c1c..d87666d09374 100644
--- a/media-gfx/kpovmodeler/Manifest
+++ b/media-gfx/kpovmodeler/Manifest
@@ -1,25 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX kpovmodeler-1.1.3-underlinking.patch 577 RMD160 24671353d1a2fec0b9c4327d6b143f9b54c8bbf4 SHA1 e358c766dff6aac171b65db30138ef72ddcac6b6 SHA256 00634ef1b8920fd6832bd9dafb1e1b04ba45cb7ba0f756ac0ea5288912488dee
-DIST kpovmodeler-1.1.3-kde4.1.1.tar.bz2 1875515 RMD160 85443185aaaf6fb4f7f9e145d41cacdf763702ea SHA1 3d8f1c44fa02670a6817a302c316abb1db62c9d5 SHA256 3cef42828234500452275542b84c9c077a12ec8640df68c0952f7706fde13867
-EBUILD kpovmodeler-1.1.3.ebuild 881 RMD160 ac43843ba03ccb71720c1187cad82308a2e8a350 SHA1 2beb5aadd7657b9e98e840db9f97a09d9a11b693 SHA256 ac940b82861b1db65f1400ca16614f08d07913e2139e8fa7843a0d68556c04f7
-MISC ChangeLog 768 RMD160 a7a021cad0d169c8efa14fdfbef69a25552eba88 SHA1 e81c399873ef724bc3af7990bfdad7592873c1ae SHA256 ea1d4a6f7845b0ef5e7e6e458eafacc69cebd3d16a59777176c563ca61d65660
-MISC metadata.xml 178 RMD160 2372d5dbc28a26f26e1a7f3d2f6f36a031870a1e SHA1 0cbf8db7e83adf5875de58605dc0aa239159624e SHA256 9cc4401ca95c4354dcb1dce1219e3df30c024bb07c72c2206fd84e0f9b199909
+AUX kpovmodeler-1.1.3-desktop.patch 482 SHA256 085f3f6341a1223594b40b673cd3369122ffc58df417c0113ff3137b0e9c36e5 SHA512 c20f7a0dfe5eb03e8e8a01ae6f99c494c9b7222de42f1e3413eb749f45a83aa32d88b04d1415b9b4454b3a278c4b8bc5d4d7b88dad4dc91b2b36fe9bb2813d92 WHIRLPOOL 5609fbbc62f8a82b3a6878ee6e076f7ab4fbfee55277705e9ee810f07b6e1c3a3f34213814425a99e3fe2489fd2dcc7b825694642d4fbe3d43bb59e7fcd778a3
+AUX kpovmodeler-1.1.3-freetype-include.patch 437 SHA256 506d82a9c92d135d77e106fc28eeee1f6e2c3c7a181e0e984918bdc1f9170b41 SHA512 44bc1a02e3f9c915685e3a33b7157806d619d93e2b6661756d6063ae25ea49010d326bf391e3777267148dab4cb1a2c2fcb787480718758f2a998473b2064ac4 WHIRLPOOL 7df0fce8c231fed39a39729a24f2686fc0109ba5f3918e95e04c08e6230b8d65372959194e66f8f23c07a6e3c5b5722e7252b8fc340b5f35a1cd772087f6f934
+AUX kpovmodeler-1.1.3-underlinking.patch 596 SHA256 927580a7ecdd25e4ae3904e05fa931b5c6e29a5648af0fbd15b1a1c91866bf15 SHA512 ebaeab7d4d996867c0e0061db9749929c594dd1098260b444782ae9f5bee2c6bc1b41819acb5edbc00a37cec30adc85fbe0788d29646ce7b5face411eb68715d WHIRLPOOL 9f8e739caf2c9805fdcec6ab8da46a5320ff830b89e850ac642f7ec7bbd69c470c17d9f0b6d85a18f2cf364cdd6f3560cd505ccc34263101057b4381b6cb16a8
+DIST kpovmodeler-1.1.3-kde4.1.1.tar.bz2 1875515 SHA256 3cef42828234500452275542b84c9c077a12ec8640df68c0952f7706fde13867 SHA512 8cfdde653ec93bc044d049ecf61b4d106d7415874668f6f56e9f59fb88f023e78717592e5e3a0aff071d0d4a84ac51f8457bedb5b1fa48e92f06c6d1d08385f6 WHIRLPOOL cfa950f200bda32eb6d42e0d200fd40afd4d8c36548f97929a04f383e324d0f6c6ff84e818d12ebfd8f88c0522f5058030e6ca3912e955a3dc3e0ab23e70e03f
+EBUILD kpovmodeler-1.1.3-r1.ebuild 1066 SHA256 72142a23b601280970f35d66394cf6bb149eefb399f923fa351421511785b33c SHA512 80f6defc420de430f69d3725efcbe049a4c78a25ffe65498d871d83396063b88cd8781914bf8d8d57f61dd723d5679ec51a596700a388b9de5917c06151359d9 WHIRLPOOL d2116dc6a9e0692b258e2bcedd12511ad9c8a097f10a4ec11d464a4c1a95f4f6b3c7b462c6f43ff1a588645f3ff87f67920377b1837e3e80919d4659d7e121f0
+EBUILD kpovmodeler-1.1.3.ebuild 881 SHA256 ac940b82861b1db65f1400ca16614f08d07913e2139e8fa7843a0d68556c04f7 SHA512 accb7149d96f78cd1434a0dbfcbb3accffeb9ecf1fa87faa2fe612cf2a611f9a462277a729a33feb7b4209ec19461ed5534c55e03b973e28e5623a866a84b207 WHIRLPOOL 8c311dc6c966951b5e67e78e8390653405aaad819fe6468ca8f217152b338bb5fa4d0e96633fd443965c89e985ce9697007dc56c7b9d189e538920aae0124aea
+MISC ChangeLog 1188 SHA256 00066c3d184223d3d94087d18981388d619dd8304939a5d56c5f76d1743358b2 SHA512 e40dc8942822a46aa1a91dbffc2702e7b7500757e399e7c3c1c1fa168d7d051fbf315a5d2b43810ae1acb70cd96ed8fbdf55fe1d671fc1675a6ba4249ae06527 WHIRLPOOL 210274a802a4f766b9be23552e438a9aa6c0f9b86e74d2a03c2f76d99a2f7455d4da5ca75d3e601282a7412afb4793e8317886025ca7f2c1b89cd0e05743a9b0
+MISC metadata.xml 178 SHA256 9cc4401ca95c4354dcb1dce1219e3df30c024bb07c72c2206fd84e0f9b199909 SHA512 0ebcf9b0fdf0acf86f6b0501797449affb95d185f31bdc55efe18a053f0ab8d24c08d800b726f1a0cda51abdcefc1b65273b453cb630bea14bc7e94a59705e50 WHIRLPOOL c280441296b6c77589daf8a953b928fb186b0fc54b11c43928436e48746b1bd590e190ea6807d276c43dd6cf04179ecb810efd3f87985cd89ea773469c41f60f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOq0DpAAoJELHSF2kinlg4uEQP/1mRGK8KRN6iHl7S+E2ZaZ7N
-LufJyIzjlcxT8drKuE0KbM5C44nSlYgr2Ndl4KbRZmpdljhWdhejie1MIK1D7IZb
-zIR9o2dtygFKRnLeHTGlfBjxsRYtHobV/o8uPjT9zcTJ5RsK3QQ3wZ/F5Yc5k83t
-xJTa8Y5Q+UGOnr/1t5PdLnDe9bxbLxYQcRw5Nh56fqVfrLQZ/kPP8FS+mRtiIPv5
-QRoaBqh+5uiGy9hQEG7w8toSw2oZ3SGQ0jUWxUIKhGj5z9BNPVZU1hNU3NkQEGH7
-VNyTTcX6DGGPWqsKKOMS0NjVZ8TG6nXHrMD4N2aEZNfdD74mCCOewPpr0I77KqBh
-oYyOIPuokNiKB7io1+XpfIgqxW9WnQxKf/UxEEyXycPcP0+5fNw7+14ib/61IB9O
-E0ie+Vk+wrXivJy4td3Mf8MvIXHW/+mOMmIwRj8pe36Jzmz0fkW40e4IEe+NRAsU
-5wZOttAo/VCwBFS4iKBKOeL2UGTsg7xkekyM+Sfp67QRIK0twNkjhG6KYMq3wy7i
-6G/lIM2TaddsPI8F0NaSFDQ7W4qP79wTaEn+J8RIdIzADS6PnPNCajtgNFYAcvPj
-eTWL5RmxSXsXT2jCzpig7TgiQvo1pLDKes7awp9s15nD/U7dWHRHPnqoRdW+F+C6
-DgQt4s22EgwF7zdgGB6/
-=GVqQ
+iQEcBAEBCAAGBQJRrM4nAAoJEMbwO6tnXQ0sSGIH/2xxrXR6m+1cDMPzXE1s/o8/
+/VelLL6iXHupuvO6IsiwkJuqbJdxw28GTgTUZ/RLFgZnC7Oo6BHwiaL8Zjgz+/pg
+AZyYG0qsNkkeo73Q/qMAiKbnz78j7K7MFod58NZAPeZNES//rAKSs4aDvmbwYFF6
+7Entahfa3lBzJ3IvmDgfotqFrCXu8Yd6FIfevi3eBzWHw8b10pqnglktqEvwfKh0
+hwAUtQqCDJ7+jb0sgHrUSjGbrmXZLQTzjxAW7tVd7RPA/cVpz2MWjNAHPp/2SRyT
+6LpYqA68oc+l40s5xo1D9RDhPHq597LXMo/wQtBzOV9jtxi1SNPNHl7WuySF5bU=
+=v1xT
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-desktop.patch b/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-desktop.patch
new file mode 100644
index 000000000000..04013e22dad0
--- /dev/null
+++ b/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-desktop.patch
@@ -0,0 +1,17 @@
+Remove deprecated/useless entries causing validation warnings.
+
+--- kpovmodeler.desktop
++++ kpovmodeler.desktop
+@@ -49,12 +49,8 @@
+ GenericName[tr]=Povray Modelleyici
+ GenericName[x-test]=xxPovray Modelerxx
+ GenericName[zh_HK]=Povray 建模器
+-Path=
+ ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart,Browser/View,KPovModeler/Document
+-SwallowExec=
+-SwallowTitle=
+ Terminal=false
+ Type=Application
+ X-KDE-Library=libkpovmodelerpart
+ Categories=Qt;KDE;Graphics;
+-Encoding=UTF-8
diff --git a/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-freetype-include.patch b/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-freetype-include.patch
new file mode 100644
index 000000000000..9939780a4250
--- /dev/null
+++ b/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-freetype-include.patch
@@ -0,0 +1,15 @@
+Use the correct freetype include directory to avoid a build failure.
+
+Gentoo bug #467998.
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -11,7 +11,7 @@
+ 
+ configure_file(config-kpovmodeler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kpovmodeler.h )
+ 
+-include_directories(${FREETYPE_INCLUDE_DIR})
++include_directories(${FREETYPE_INCLUDE_DIRS})
+ add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+ 
+ ########### next target ###############
diff --git a/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch b/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch
index c32ac55c5ff1..9f70e5c06b82 100644
--- a/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch
+++ b/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch
@@ -6,7 +6,7 @@ diff -ruN kpovmodeler-1.1.3-kde4.1.1.orig/CMakeLists.txt kpovmodeler-1.1.3-kde4.
  kde4_add_executable(kpovmodeler ${kpovmodeler_SRCS})
  
 -target_link_libraries(kpovmodeler  ${KDE4_KDECORE_LIBS} lkpovmodeler )
-+target_link_libraries(kpovmodeler ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} lkpovmodeler )
++target_link_libraries(kpovmodeler ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} lkpovmodeler )
  
  install(TARGETS kpovmodeler  ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
diff --git a/media-gfx/kpovmodeler/kpovmodeler-1.1.3-r1.ebuild b/media-gfx/kpovmodeler/kpovmodeler-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..6319b15b0011
--- /dev/null
+++ b/media-gfx/kpovmodeler/kpovmodeler-1.1.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kpovmodeler/kpovmodeler-1.1.3-r1.ebuild,v 1.1 2013/06/03 17:12:22 kensington Exp $
+
+EAPI=5
+KDE_LINGUAS="af ar be bg br ca cs cy da de el en_GB es et eu fa fi fr ga gl he
+hi hr hu is it ja km lt mk ms nb nds ne nl nn oc pl pt pt_BR ro ru se sk sl sv
+ta tg tr uk vi xh zh_CN zh_TW"
+OPENGL_REQUIRED="always"
+inherit kde4-base
+
+MY_P=${P}-kde4.1.1
+
+DESCRIPTION="A modeling and composition program for creating POV-Ray(TM) scenes"
+HOMEPAGE="http://www.kpovmodeler.org/"
+SRC_URI="http://www.kpovmodeler.org/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="media-libs/freetype
+	virtual/glu
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	media-gfx/povray
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS BUGS ChangeLog README StyleConvention TODO )
+
+PATCHES=(
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-freetype-include.patch"
+	"${FILESDIR}/${P}-underlinking.patch"
+)