*/*: Attempt to resolve issues with "EAPI [01] is not supported"

17 files changed, 65 insertions, 103 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index df6c6f8e..0a3b880d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,12 +1,4 @@
-AUX scribus-1.3.3.12.desktop 2170 SHA256 b2b7d72c0a4ebc7c6afd82f0e0d75267e72567543d3f41a980f70452b857efd2 SHA512 2bdb40a1ba83405d9c9a35b07c8aff347ef66f256838b20f3b4b338ba0b54959774abb0f593f76cdef288e9c038122bae47140184b2961492bd06875b39eae53 WHIRLPOOL adeaee99faf171ef28f012b0feec0fd4cfa897e3c4d5799985144b5c8bcc16f1ddf9f4c6dcbbae273019f4d8e14991235e1c721d7797dd5c4601ecbabf70e537
-AUX scribus-1.3.3.13-cheaders.diff 1049 SHA256 fea1e15bd15635fec7fc4e3cfd777de8242fd435280575bff6aa2d92e8d614a3 SHA512 e2b26ef9ebbd749047c7f8454e58f1bbfaab21a99793e5b436cc678b6e3fefb5adf62cf10c1a81e593fdc072775d6663bad1142ac2b73609b8a6baead82a4119 WHIRLPOOL d2fa037d71d6ec40ba97c62297280cd1afb7012e789772efc3399b2a17102639f799824ebb9eaac7facf3e5a5ba9e3226877320917249a8c9f8dcda8ddb4cdf7
-DIST scribus-1.3.3.11.tar.bz2 13302366 SHA256 8685baf28a21d7c680b0f9ff62188818b837bb67c64dc15fce3acbdc9180a8ca
-DIST scribus-1.3.3.12.tar.bz2 13346822 SHA256 c025467b90d39a9f06175df0bfa5a0ffd673b9be8dd7cbf5bb51a4d51ad43b26
-DIST scribus-1.3.3.13.tar.bz2 14923426 SHA256 5a255e81d662f27729b2a3b658d6a8e2a6bc5caad328935b3d5a1fae5db3841a
-DIST scribus-1.3.4.tar.bz2 14798993 SHA256 a976be8f7dd9a990d03d8cc72620b50340803fb4fca24132543d937f56d089e7
-EBUILD scribus-1.3.3.11.ebuild 1113 SHA256 5f8ff474d64eaac8c378c7d84f2fc2c2b99608dec205d040b416bdb64ee29d8c SHA512 23de0de5164efc089e1d200365e43fd3506e8fb15788b17899c7990913d547dae6ecbac2c688f9b9ef07546d671cd62a2407e8c55a4d14e156f3dffa65035008 WHIRLPOOL 6c24189e9ea3b3380733afd947c8877d777a0de10f6e3453a1369c5848fc28ff293a6fb330ef5fb2686586c432c46712cd889dfa0072f183d499d2c0b48629bc
-EBUILD scribus-1.3.3.12-r1.ebuild 1380 SHA256 60dbb5fda142d58338b8624f1f1af086cc212acf43dc1406e09b146fb2912ff5 SHA512 8e059d9d3fc9ecce5b6353d15cf73f81470289430dc6b9a068b5c515b2aca94e0f8c1f6aa230f6ea4412810dc61ca4319971018a1006784786e2ffca19283471 WHIRLPOOL 533af17b7460a4b6a0bbd2a2a00f39baaaaaa539a49a9c67d34332e93e4ea54b3db65880df691b8440a1470b98d575dd1c5765af12a573b64a17e76709d4f255
-EBUILD scribus-1.3.3.13.ebuild 1216 SHA256 66994160a33930785aa5946327771653e130f9f1838a28270c9fd7a61f701365 SHA512 00492ea9e51f99321fa30912b6e7dc45089b703ec98e852134b561f0313d326651ba9bbf32668ee9c83939622063ef2c499cfea9842a6096ae10c57cab32870e WHIRLPOOL 4df93dc1c06a0308f3007ff2e4d570f67bcd460a0f9969418495af63d6db87429fced9115cff09d82c3ae00698efa3dc2e57a470c63c766f2fdf22bd6ef8b580
-EBUILD scribus-1.3.4-r1.ebuild 1112 SHA256 71315e856252e2fd54a017335f47ebed6233e0c1012c61018f66402ae5275b85 SHA512 de4b62f2b63fd71209071c908c805da6694019ad553406108e5261c46e914cc8af84682cee462581802e569a20d726ccaa928e97aa5592da9f20cdef74514413 WHIRLPOOL 9d345fe9c66744060497533955ccf8b156e82f9634c908ef38790c3262ef78e993f1a26148632235f5f3730716cfe4c532ac2086271c9501dea0b8b968218197
-MISC ChangeLog 13776 SHA256 cd9ada9d4d07110f2b08f6b57e259c22fdd7c95e466fdd6a6f034c5f06cb14bf SHA512 3ba1d5784daa0542f29bf26f21da178c44720df2c67a4823ceaabfbe105afcb2b8b2a7291671dd88a57e3fe971e467d4689110807fa6ac6076fb6c0989e8eabf WHIRLPOOL aef759cf1ab4cecdc646bb1a9edcf66ffb6e54366ccdb6ad4689da151a8f2fb36c996ab1a763ad5f77e7b071f280cd8d66900fa360b85f293d44439155beeb2a
-MISC metadata.xml 217 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669 SHA512 694122a8a305a838ec5b902a9895ba97676993ff86f199135eea1fe42692109adb9247382852617f586a9c8fd3bdef3baafe1134d43285be8b6e0789751e6105 WHIRLPOOL 347e1339e8b67d541100aed627d7e85c9b0acf9cadfbff11fd5e29f1c76e4f8b8e604d6572c29f3f6da884d862d07670f61d32798daeb8db1a27bc8b21199eb2
+DIST scribus-1.3.3.11.tar.bz2 13302366 BLAKE2B af9405a51c7689ffc8a7b812762e62d2691845a118120f70a8e71225a237604b39a068c128d57b7e9e8885ddcbc99fc7d978fb6b8d2fed08af098523f58004c1 SHA512 7b0d5c6f731ac9b09ccc33a369497e129b90163c94480c3f687d301ebc4cb634539a247b4d9901ccd65f75505ffd63cde9dd80903947c808a98540683c4aba7f
+DIST scribus-1.3.3.12.tar.bz2 13346822 BLAKE2B 007211212f38ea1589f14c346740ef6a0a2e0e7ad8835fe4c0b76451f60121188042067eab4025b2fac032b0319b93e928d11f80e722d6008316dbecac04bfad SHA512 3a6c26b7b1a17b30ba6d83d1413b23937e4ef42449f03a7628d628bc6ae4b78b09fa9753f622e289f3614db48312962769422ba0c1642cf66015eace9b4d9c2d
+DIST scribus-1.3.3.13.tar.bz2 14923426 BLAKE2B 8957e06ffd1858722e8c55f5a49b899ef9747b3bf4d05ba1f8f6944037a4b70a4b86baac023e2d71dbfa3a66dc212dc8069ac2472e21f66ec66c7e3c49156f53 SHA512 bf59e3de2c9595a3f6195df9df2a1302e66d3d91f17341f18a7514f13ac58d65ee0f42d0b6739791e02d25b2342e3a866e16c837fe715cd155ec29909cd08793
+DIST scribus-1.3.4.tar.bz2 14798993 BLAKE2B 38389a0e97c58b37b46ddc90dd0bd3b762868bd3b00785241fb62742ecde55f87f6f36e2dd458a665ab12ada55a4fb72847a092c195a812807585ac4e253376b SHA512 7ec32050a2567b1e43237ff5da33bdcaf794fc5418115928174cbd0b0affde168dfc896983b60e90c5ef5cb396f980f78507aa855eb429cc5dad52f5ccf3fade
diff --git a/app-office/scribus/scribus-1.3.3.11.ebuild b/app-office/scribus/scribus-1.3.3.11.ebuild
index f3bc9379..462d3cc8 100644
--- a/app-office/scribus/scribus-1.3.3.11.ebuild
+++ b/app-office/scribus/scribus-1.3.3.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.3.11.ebuild,v 1.7 2008/07/27 19:54:02 carlo Exp $
 
-EAPI=1
+EAPI=5
 
 inherit qt3 eutils
 
@@ -21,28 +21,19 @@ DEPEND="dev-qt/qt-meta:3
 	>=media-libs/libart_lgpl-2.3.8
 	>=sys-devel/gcc-3.0.0
 	>=dev-libs/libxml2-2.6.0
-	cairo? ( >=x11-libs/cairo-1.0 )"
+	cairo? ( >=x11-libs/cairo-1.0[X] )"
 
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl"
 
-pkg_setup() {
-	if use cairo && ! built_with_use 'x11-libs/cairo' 'X' ; then
-		eerror "You must build cairo with X support"
-		die "x11-libs/cairo built without X"
-	fi
-}
+DOCS=( AUTHORS ChangeLog README TODO )
 
-src_compile() {
-	econf `use_enable cairo` || die
-	emake || die
+src_configure() {
+	econf $(use_enable cairo)
 }
 
 src_install() {
-	einstall || die
-
-	dodoc AUTHORS ChangeLog README TODO
-
+	default
 	domenu scribus.desktop
 	doicon scribus/icons/scribusicon.png
 }
diff --git a/app-office/scribus/scribus-1.3.3.12-r1.ebuild b/app-office/scribus/scribus-1.3.3.12-r1.ebuild
index bcfffa19..5b81693e 100644
--- a/app-office/scribus/scribus-1.3.3.12-r1.ebuild
+++ b/app-office/scribus/scribus-1.3.3.12-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.3.12-r1.ebuild,v 1.5 2008/11/21 13:30:04 hanno Exp $
 
-EAPI=1
+EAPI=5
 
 inherit qt3 eutils cmake-utils
 
@@ -25,22 +25,15 @@ DEPEND="dev-qt/qt-meta:3
 	dev-python/imaging
 	media-libs/fontconfig
 	cups? ( net-print/cups )
-	cairo? ( >=x11-libs/cairo-1.4.10 )"
+	cairo? ( >=x11-libs/cairo-1.4.10[X,svg] )"
 
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl"
 
-pkg_setup() {
-	if ! built_with_use 'x11-libs/cairo' 'X' 'svg'; then
-		eerror "You must build cairo with X and svg support"
-		die "x11-libs/cairo built without X and/or svg"
-	fi
-}
-
-src_compile() {
+src_configure() {
 	local mycmakeargs="$(cmake-utils_use_want cairo CAIRO) \
 		$(cmake-utils_use_enable cups)"
-	cmake-utils_src_compile || die "compile failed"
+	cmake-utils_src_configure
 }
 
 src_install() {
diff --git a/app-office/scribus/scribus-1.3.3.13.ebuild b/app-office/scribus/scribus-1.3.3.13.ebuild
index 096d071a..49cb768a 100644
--- a/app-office/scribus/scribus-1.3.3.13.ebuild
+++ b/app-office/scribus/scribus-1.3.3.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.3.13.ebuild,v 1.1 2009/07/30 19:09:14 hanno Exp $
 
-EAPI=2
+EAPI=5
 
 inherit qt3 eutils cmake-utils
 
@@ -30,19 +30,16 @@ DEPEND="dev-qt/qt-meta:3
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-cheaders.diff" || die
-}
+PATCHES=( "${FILESDIR}/${P}-cheaders.diff" )
 
-src_compile() {
+src_configure() {
 	local mycmakeargs="$(cmake-utils_use_want cairo CAIRO) \
 		$(cmake-utils_use_enable cups)"
-	cmake-utils_src_compile || die "compile failed"
+	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-
 	domenu scribus.desktop
-	doicon scribus/icons/scribus.png || die "doicon failed"
+	doicon scribus/icons/scribus.png
 }
diff --git a/app-office/scribus/scribus-1.3.4-r1.ebuild b/app-office/scribus/scribus-1.3.4-r1.ebuild
index 562445d1..77d7e253 100644
--- a/app-office/scribus/scribus-1.3.4-r1.ebuild
+++ b/app-office/scribus/scribus-1.3.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.4-r1.ebuild,v 1.3 2008/07/27 19:54:02 carlo Exp $
 
-EAPI=1
+EAPI=5
 
 inherit qt3 eutils
 
@@ -21,27 +21,19 @@ DEPEND="dev-qt/qt-meta:3
 	>=media-libs/libart_lgpl-2.3.8
 	>=sys-devel/gcc-3.0.0
 	>=dev-libs/libxml2-2.6.0
-	>=x11-libs/cairo-1.4.0"
+	>=x11-libs/cairo-1.4.0[X,svg]"
 
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl"
 
-pkg_setup() {
-	if ! built_with_use 'x11-libs/cairo' 'X' 'svg'; then
-		eerror "You must build cairo with X and svg support"
-		die "x11-libs/cairo built without X and/or svg"
-	fi
-}
+DOCS=( AUTHORS ChangeLog README TODO )
 
-src_compile() {
+src_configure() {
 	econf --enable-cairo || die
-	emake || die
 }
 
 src_install() {
-	einstall || die
-
-	dodoc AUTHORS ChangeLog README TODO
+	default
 
 	domenu scribus.desktop
 	doicon scribus/icons/scribusicon.png
diff --git a/app-pda/libopensync-plugin-kdepim/Manifest b/app-pda/libopensync-plugin-kdepim/Manifest
index b0ba2e46..e0637ca4 100644
--- a/app-pda/libopensync-plugin-kdepim/Manifest
+++ b/app-pda/libopensync-plugin-kdepim/Manifest
@@ -1,11 +1,11 @@
-DIST libopensync-plugin-kdepim-0.21.tar.bz2 300998 RMD160 2f991fbbd1c7161d6d0a5d8f6155aa9f49d9b0bc SHA1 3ec29d20ee317455df3c9bcec202f236b92030e8 SHA256 4e85e23bfe9fa4cc3a16aa3a591979a978260ef1c05ff72fe04d2ad70dea8807
-DIST libopensync-plugin-kdepim-0.22.tar.bz2 307922 RMD160 a85c85e1fef0cc56c63750f2c78881097f3bdc1a SHA1 591fa5ebdaa87bb75fe557156bb09d8bbffd2ebd SHA256 87c3b6d1a23e10eb181a99c71541c7cd4a8039bf97ae024d5020d274e8ff4dd3
-DIST libopensync-plugin-kdepim-0.35.tar.bz2 38860 RMD160 9c474551c27c6490842d282315457ecc5c454285 SHA1 8e0bd25568a00cd686b149f19cc6f467dfb350b0 SHA256 eb1cd3843a8fca710c8133ffc819a81b691c755e335bbfb49173f57f1e4bb8ab
-DIST libopensync-plugin-kdepim-0.36.tar.bz2 38994 RMD160 6a3e1c014ccb5d015d5e003640c0c9e020f2f22c SHA1 54d83ab203cb850fca89937b258ad8b34b69ab29 SHA256 b0e1cc02094423bafdbb3cdfcc3aa29289ebf0b65516f4a5f022990614bd908b
-EBUILD libopensync-plugin-kdepim-0.21.ebuild 752 RMD160 f2163f915d0be427b588152721059aca29623feb SHA1 335dd2a2de5db8121f9a4dacabc8ed438de99187 SHA256 5cb60d77b27ade99907c0566cb916b7b4c4a16fa05e569f8a6dc45563bddfce1
-EBUILD libopensync-plugin-kdepim-0.22.ebuild 752 RMD160 c9de81ca46cabfc4750e29da3ab5e5b4bf805eff SHA1 606a54caf8334958a166bf7984eff108e5ac589f SHA256 61f7a0ab8d2b4ee83da4e5ba19224475238fc2d68a90376c5f75c86ff60c7e25
-EBUILD libopensync-plugin-kdepim-0.35.ebuild 612 RMD160 8f176dfc121fabbee7feeaf3de56800daeed8370 SHA1 dd49c2fb460ba0e0fd81e7b9a57bc832ac6f8886 SHA256 9176a157aab2e4b2c9708f0f4778a3c7a52934ae0ed93c5a5c7e5037c51b8dd6
-EBUILD libopensync-plugin-kdepim-0.36.ebuild 618 RMD160 4b0a5742ccda2cb710f0f88f7eeb8c0e7db18a24 SHA1 faedcf7abb7911b39ce7ce377b82626ae6f28e7c SHA256 210d58efc92f0b92a662c1d791f1985b5852cf405d6017f31117f4ecf95bdf41
-EBUILD libopensync-plugin-kdepim-9999.ebuild 608 RMD160 e0c830c94bdfdb4af0153032099b247231c48e94 SHA1 0ca3a30e4f3f049273a65d3a95cd8eeb77080956 SHA256 a4ab71043fe329b3c6e1bf6f1093a90b82cf052af797944c73050281f2379f27
-MISC ChangeLog 2240 RMD160 fe233bed9602ca0620c5232f17b11451d6e3f639 SHA1 be606ad8ca758be3594de2950d6346239a854a8a SHA256 74bcca2403876717492acfed11d3f413da19e63fd51aac44301a72788b9c1b8b
-MISC metadata.xml 304 RMD160 1da32fded95735800bc96b0ff4c0a3af4691a724 SHA1 b96c72c417192c099990a616b12a1d2f55a06064 SHA256 7fa8df0f64197f3f6c018ed0d6c4cc4da014fbcc9af2da9b633f71657470236a
+DIST libopensync-plugin-kdepim-0.21.tar.bz2 300998 SHA256 4e85e23bfe9fa4cc3a16aa3a591979a978260ef1c05ff72fe04d2ad70dea8807
+DIST libopensync-plugin-kdepim-0.22.tar.bz2 307922 SHA256 87c3b6d1a23e10eb181a99c71541c7cd4a8039bf97ae024d5020d274e8ff4dd3
+DIST libopensync-plugin-kdepim-0.35.tar.bz2 38860 SHA256 eb1cd3843a8fca710c8133ffc819a81b691c755e335bbfb49173f57f1e4bb8ab
+DIST libopensync-plugin-kdepim-0.36.tar.bz2 38994 SHA256 b0e1cc02094423bafdbb3cdfcc3aa29289ebf0b65516f4a5f022990614bd908b
+EBUILD libopensync-plugin-kdepim-0.21.ebuild 773 SHA256 a1695b78f29e756f60038bbb2d6e67d14210d6df836b777435cdfc84917cb25e SHA512 981154bd7955f3ca9a83c32cd7504e7e862b984d38a0dfc806b5237695d880597950ce3b7fc745417341c6415524342eb9ad006ec47ae476b2782d7ebf591e98 WHIRLPOOL 9df36e615f225c529ff979deb67242e7c4c67dda17c0f03ff56f96f5593d096d70e98cf7362e46dc90888af821278e3f4f8d7b3eb7cfb69746f0f9a20a5e7499
+EBUILD libopensync-plugin-kdepim-0.22.ebuild 773 SHA256 d8adfbd611225b3d1713bf76e68fb3e142c71bc9271984812fb2691c7fa5d4cd SHA512 96da07b47b2600e277b9026c8abc302f7fee53fa80ad174ec072ee282758a01f7607cc15fcc0df1df05c35da847835e4dda3bcf45d0892aa970b085f9fb09f80 WHIRLPOOL c82715c509905c00b032b892950372d6f4f4a2d94234874d480490bfdb586b6a288f1b8664aa22727539529c4ebf9d19302a04be4580bd23c67e05ec94cd748d
+EBUILD libopensync-plugin-kdepim-0.35.ebuild 612 SHA256 b31accc373f904c524b8625bd0981cc0caca67198c52576d0f3b80c6ae900a7e SHA512 cfcb3a15f71270aa137e28e5e187dd0c49fe7689252c16be957a73a15153a46f95dbc08cf5d55942858d73f56e46bd65a83409ff406ded6eec1b36057267e4b4 WHIRLPOOL 6afd623562634c111f518b7acc017af4018c9e32cc5dadcc018082dfd9702e7e4d8b54c80d8524ed64d5af6bd14a1b3a4243116ec23cbdc50673829f74495c6a
+EBUILD libopensync-plugin-kdepim-0.36.ebuild 618 SHA256 e41a05c05e3ae2c01bb1d8d94102d9852ce68b6a7442fbb0be03f4886578598b SHA512 ae58a382ab50cb65faf606b21aff629d62ee0551f5bf92c4d5e97ca281932a8d2ceb3432d2a5efe52e08e82cf7ae5f708db55c163d6ed287a5b61bd49b91cb1b WHIRLPOOL 8bc8846a5dc4b5bd633f2868a46941210ae4ff5323458cda753f8410a6c2cabd9619367edae5c491bf90ab2655b6dd61241bcb7403df27edf0f822aecbab85c3
+EBUILD libopensync-plugin-kdepim-9999.ebuild 608 SHA256 5d893e6e13ab6ef564fb4d7720ddbdf611426567df9b5b6528e469d3ebcbf549 SHA512 1b967de83fc741e2d26f057e39c19a1843117dad2bcdd3b1849b781f2c524be686e9d8ebab206bf282ac2c0140f5c6e92d87b86f3cf1ec8086cee06970db0bd5 WHIRLPOOL ec9238047531cd13f292d4c18d5d3db1f4aad0065c61759fc3ee8a9c4ff94ec1e523ee7f5ca02a26b61158c2d49682fdfe3a3f88110b03c0a6022fa4cf1b4948
+MISC ChangeLog 2240 SHA256 74bcca2403876717492acfed11d3f413da19e63fd51aac44301a72788b9c1b8b SHA512 9a3b81fd85a3e7130b5a9e393cae8afefacc700f02f0a570c895cdf5047c2b422fceb9d374a677dcc81ac48e8a52d152cec1970d296ca9de30ef2b6d368011c2 WHIRLPOOL 4b1f16b5da9321ab90d1d0b93ee4f7113ddfae7d3186cc119f3be84ca30463160f70b51e6ac2f7f4a3d9cf462d1a03175c365b2de2a141c9b06681b2a43b5bf8
+MISC metadata.xml 304 SHA256 7fa8df0f64197f3f6c018ed0d6c4cc4da014fbcc9af2da9b633f71657470236a SHA512 4ac1fd48af82f90c8d862b5a833476f2cd0d42fee10c5822c92ee20722089940aadb21aac35fc44e9315ccae11d2152d9c2c2fb02b336cc93ecdac3eae9b9b12 WHIRLPOOL 46d37de0cf2b3c0e065e04cbe6307b1fcabf39d75f76df79998cff01b585fb6209e6c302981ed7b2b8edef5d223d8336d6789fb33233e11ab3fcc55e209f436c
diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.21.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.21.ebuild
index 757be0bf..c661b986 100644
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.21.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.21.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.21.ebuild,v 1.2 2007/02/14 20:24:38 peper Exp $
 
-EAPI=1
+EAPI=3
 
 inherit qt3
 
@@ -23,8 +23,11 @@ RDEPEND="${DEPEND}"
 # interactive and broken
 RESTRICT="test"
 
-src_compile() {
+src_configure() {
 	econf --without-arts
+}
+
+src_compile() {
 	emake || die "emake failed"
 }
 
diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.22.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.22.ebuild
index e214de56..3fe5f235 100644
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.22.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.22.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.22.ebuild,v 1.1 2007/03/28 20:20:29 peper Exp $
 
-EAPI=1
+EAPI=3
 
 inherit qt3
 
@@ -23,8 +23,11 @@ RDEPEND="${DEPEND}"
 # interactive and broken
 RESTRICT="test"
 
-src_compile() {
+src_configure() {
 	econf --without-arts
+}
+
+src_compile() {
 	emake || die "emake failed"
 }
 
diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.35.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.35.ebuild
index dc066528..7ce3a5e5 100644
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.35.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.35.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.35.ebuild,v 1.1 2007/12/21 23:15:45 peper Exp $
 
-EAPI=1
+EAPI=3
 
 inherit cmake-utils kde-functions
 
diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.36.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.36.ebuild
index c244d92c..00920868 100644
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.36.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.36.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.36.ebuild,v 1.2 2008/07/13 07:07:12 josejx Exp $
 
-EAPI=1
+EAPI=3
 
 inherit cmake-utils kde-functions
 
diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-9999.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-9999.ebuild
index 7ccda2fd..caeb4466 100644
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-9999.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-9999.ebuild,v 1.1 2007/11/26 20:19:47 peper Exp $
 
-EAPI=1
+EAPI=3
 
 inherit cmake-utils subversion kde-functions
 
diff --git a/kde-misc/kdocker/Manifest b/kde-misc/kdocker/Manifest
index 45076fb8..660bbc11 100644
--- a/kde-misc/kdocker/Manifest
+++ b/kde-misc/kdocker/Manifest
@@ -1 +1 @@
-DIST kdocker-1.3.tar.gz 90402 SHA256 f4dcb52c812ea1171a70b0720624d6869c6eb7b5ba55930f9da9b45d74e3ef20
+DIST kdocker-1.3.tar.gz 90402 BLAKE2B 69d25b3202455d75f947632908dcc9a6be1b4b509872ad5cb36aa3c7460b1fbbf93bab253c803a64a96b596feb29b93e6492123d177ff0c54805dd02624d9b06 SHA512 17b9336f5b9d88678d440e61a183f6ec514c27056a53eb88070ec3219dd30c5029a8118bf610dc98ba537ccc35e8dd31b7a0dbb1cba24608b386b28e0e34ad58
diff --git a/kde-misc/kdocker/kdocker-1.3.ebuild b/kde-misc/kdocker/kdocker-1.3.ebuild
index 94949cdc..12f24b0b 100644
--- a/kde-misc/kdocker/kdocker-1.3.ebuild
+++ b/kde-misc/kdocker/kdocker-1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/kde-misc/kdocker/kdocker-1.3.ebuild,v 1.3 2008/07/27 20:52:18 carlo Exp $
 
-EAPI=1
+EAPI=4
 
 inherit eutils qt3
 
@@ -25,10 +25,7 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-desktop_file.patch
 	epatch "${FILESDIR}"/${PN}-installdir.patch
 }
@@ -41,7 +38,8 @@ src_compile() {
 		QMAKE_RPATH= \
 		"CONFIG += no_fixpath release thread" \
 		|| die "couldn't create fresh Makefiles"
-	emake || die "make failed"
+
+	emake
 
 	# langpacks
 	cd "${S}"/i18n
diff --git a/kde-misc/strigiapplet/Manifest b/kde-misc/strigiapplet/Manifest
index 68a8dd7e..fa79f743 100644
--- a/kde-misc/strigiapplet/Manifest
+++ b/kde-misc/strigiapplet/Manifest
@@ -1,4 +1,4 @@
-DIST strigiapplet-0.5.7.tar.bz2 32034 RMD160 ae10841fc75d3bf9c42e449fea28e02b7c227176 SHA1 9fb4d20f1fe58999268d57196f0ea44383fdebfc SHA256 5bbe932c52116d5754a77fdc64b5e5ef38fa9b7a1aead6597e1cba74788b5e7e
-EBUILD strigiapplet-0.5.7.ebuild 2146 RMD160 1d868615070258e477a56d5e2333723146005109 SHA1 4bbf2be6d678adc32b6d51e709f8b21477f260ac SHA256 573c81934fd0147321fb76f0921d386a061dabc3c902182eebfbf5b41f5037b7
-MISC ChangeLog 960 RMD160 9e5910ea09a004799cf0f51442e9ae78de39ab01 SHA1 e904b64c35ff93a31a2c59f87d10789bbcc67523 SHA256 39fae20ccfe3330396dda67421496da9c7cb885c49d01237c4684f4a00c9fd3d
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+DIST strigiapplet-0.5.7.tar.bz2 32034 SHA256 5bbe932c52116d5754a77fdc64b5e5ef38fa9b7a1aead6597e1cba74788b5e7e
+EBUILD strigiapplet-0.5.7.ebuild 2154 SHA256 eca8aab1eaf830af8a1fb87eb246f3c44c6799e5f40733d96f51491d963a6e4e SHA512 53f3f563b2b2eef7b87d0d8d9a514151da1f5485fa18445067ee1e16f5465a25e8468cd758206e14be8f676fb774839b4e8ef54f83dd72c3933318a7e0793c50 WHIRLPOOL cb7f7a773265453d9a1e6736584b9374ffb7fc24908ef337e9c152225bd7c2e42f0b65f54ab508d4c7f260d73b0941b999bc959d002739f247de4e7d56eee1ec
+MISC ChangeLog 960 SHA256 39fae20ccfe3330396dda67421496da9c7cb885c49d01237c4684f4a00c9fd3d SHA512 c8243b9c79ce02ebfc4b7ee2e64a5289ccee6bc161ac47d687e6e4484ec5624e21883e04bea77d58a566236187b986e67b7c0985f62b913e8dba00ae6b2f00bf WHIRLPOOL 7c6b290914ef5453286a327edfb782c424adb53c9e7d425af082ddc612afe786949653b22c43b5ccffc3065d8031aba1c20fc60ed0b62f499140fdd98c102f89
+MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
diff --git a/kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild b/kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild
index b6b9a9b3..255a69d4 100644
--- a/kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild
+++ b/kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/kde-misc/strigiapplet/strigiapplet-0.5.7.ebuild,v 1.4 2009/03/30 13:22:08 loki_val Exp $
 
+EAPI=3
+
 inherit kde multilib cmake-utils
 
 DESCRIPTION="KDE kicker applet to use strigi."
@@ -20,7 +22,9 @@ RDEPEND="${DEPEND}
 
 need-kde 3.5
 
-src_compile() {
+src_prepare() {
+	cmake-utils_src_prepare
+
 	# Fix multi-lib issues
 	sed -i -e "/SET (LIB_DESTINATION/s:\"lib\":\"$(get_libdir)\":" \
 		"${S}"/CMakeLists.txt || die "sed 1 for multilib failed"
@@ -46,6 +50,4 @@ src_compile() {
 		"${S}"/CMakeLists.txt || die "sed to include find_package(Qt3) failed."
 	sed -i -e 's:qt-mt:${QT_LIBRARIES}:' \
 		"${S}"/src/kickerapplet/CMakeLists.txt || die "sed to link libqt-mt.so failed."
-
-	cmake-utils_src_compile
 }
diff --git a/x11-themes/gtk-engines-qt/Manifest b/x11-themes/gtk-engines-qt/Manifest
index c2bedcac..66f5984c 100644
--- a/x11-themes/gtk-engines-qt/Manifest
+++ b/x11-themes/gtk-engines-qt/Manifest
@@ -1,10 +1 @@
-AUX 1.1-firefoxOpenFileDialogFix.patch 1737 RMD160 93329dfc083ff8c72c648f3421c1551409d26f64 SHA1 1d960aa94645d9c68fcbcfc0a5a103bd05c45c78 SHA256 0f752eb39c852620abc1a33c91b42d827c0be39c9e8f5aecb05c463c8d8d24de
-AUX 1.1-fixsegfault.patch 403 RMD160 5e4f08ce2d2bb8dc6370d780502014d3df7f4edb SHA1 f797028403ac84942dbd82acb7a3c5984cfb19aa SHA256 4c23126459623532e8c0a0b654ff735e3941d8eac6fd7f06b3e49715045294b5
-AUX 1.1-scrollbar.patch 711 RMD160 cacf19987ddbc668f7d026925d78776c48cd2eda SHA1 78cb0c5a5cf23941fe7f51b1ba9b1deb015ed27d SHA256 81b17860efaaad25a6680fc888059a1e8498a24789748c8d8a8b5f8fabec4c01
-AUX 1.1-stdlib.patch 340 RMD160 c9cccc1716fcf52369c3da8a5760723afa57cae8 SHA1 07210aabdbdb6b2ff7d8fa216e68a856410f2d89 SHA256 ffc45b4c00e9a62c13130a6a84f45ae4bdd40b46fb959a7d9d9b23714382f398
-AUX gtk-engines-qt-0.8-konq-flash.patch 953 RMD160 9f7e840d577a3db28d31f2cb94cc114138e51e54 SHA1 2cff12bc4aebca210ac5e05aa8f98520c0c22c98 SHA256 cc39a430b167f9ac5d54c2629e80985fa099702c3cebfe45464f6e395cfbd31a
-AUX gtk-engines-qt-0.8-optional-bonobo.patch 1628 RMD160 17f7add642d7220d69ee5fe883358f7e6483b5ef SHA1 bb036d4331f2d4fe5871d3bde49b563bf3d7ffdd SHA256 f82f990e3077ddd1c4458dfb6b440f0d8a898e9946c9fd4769f1bb5b4a9cec83
-DIST gtk-qt-engine-0.8.tar.bz2 59472 RMD160 05a825ff51180ee70a85338a970d40509aae16eb SHA1 0d22143068dda220fd6f4c98a3f750114f282803 SHA256 6658bdbd3f2120d34f5c59b5bc3cfed5ef83a2aa8572d775483aa304396b0d45
-EBUILD gtk-engines-qt-0.8-r4.ebuild 1645 RMD160 72fa29e9be5070fe512f6016e13f4cf85b470417 SHA1 caa00b6f1d9e12640a3ec493bc50d8ec2e742cda SHA256 34eaefa17131a598eba46768235de1f50fd1d07a9de5ad442380de3f1ed881bf
-MISC ChangeLog 10716 RMD160 eb9771e2f6e0df4cf4f4b4fec0cd4598f25fdf66 SHA1 bae579542df7b7a8d2dd451b204b4c737218a54b SHA256 9ce39ff45302770a8070d684d0415011fbfe1530e6ae8c140d426cee7323618c
-MISC metadata.xml 291 RMD160 c1bf203e799299cb3a988ce5346569970c9ba9ec SHA1 b6526aaa544636c7ccb82cebc82be738daafe1d7 SHA256 de2087a657c2f973f620e254857bfda1dd1e3eef106438adfe2ba4c2d9d4fcc8
+DIST gtk-qt-engine-0.8.tar.bz2 59472 BLAKE2B 52b50052b286528df05b4dbbdb9f4622b8bb92e6868f3bbb6edac814c552cbc3874e8cf5463c7e036903696e27db16e1d2eaf75897b9b965d0f6062e287871f6 SHA512 f9014ca60c3374ea1abda8f006678b0d9aa6c5dcec3dfe2e16fb3f42ad30f953ec4ec8dfe4885e34d034f73913e7f090a24d86cefffd13954f290a050d98d835
diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
index ccd410f8..5000ea8e 100644
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
@@ -40,12 +40,12 @@ PATCHES=(
 	"${FILESDIR}/gtk-engines-qt-0.8-optional-bonobo.patch"
 )
 
-src_compile() {
+src_configure() {
 	# enable or disable bonobo support based on gnome useflag (bug #206568)
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_enable gnome BONOBO)"
 	CMAKE_IN_SOURCE_BUILD=1
-	cmake-utils_src_compile
+	cmake-utils_src_configure
 }
 
 src_install() {