diff --git a/dev-php/pecl-gmagick/Manifest b/dev-php/pecl-gmagick/Manifest
index 61d11e5..beca155 100644
--- a/dev-php/pecl-gmagick/Manifest
+++ b/dev-php/pecl-gmagick/Manifest
@@ -1,4 +1,4 @@
 DIST gmagick-1.1.7RC3.tgz 97860 SHA256 1d2a35811a29e0744e852dda526f30c8a0cba516ef611758dd5bd4837ecba1fd SHA512 a51f148dc16322bcd5586b4af059389159edab1de4ada5743a5ef6dd8d4f001a21f955dc8fd2dac2969a5048db89e3b8031da3a2f519d59fcb1f8e6afa4d8dd9 WHIRLPOOL 2c139e017fdb70d512ea34223d422f3acd27b06d1bc65fbb877d84970f3bdcd0e2019c6d92081f8329cdc070a461b018e4b7b015cf4cab059ad554ef81418b16
 DIST gmagick-2.0.4RC1.tgz 125025 SHA256 4ead19640bebebfa68be41dc0097a93a7bf9beb56ea82b27343dba8ea4c5ecfa SHA512 c8d877ab371fe57e07134bbe09bb24dcf20cd3d6310a212c395c89e27e783cb939c05ff80efdd6c47580ef54e315d75793e5c85c90b11c79796e60315e063916 WHIRLPOOL d0dc4049e5a0a44bd04a655cc38734c3cb700183ae95b8feea13a3a23732cbc6fda44ce3d84a0b5247e2f8f35277982f3b31bc9025b674c8c1db80b388ca2a61
-EBUILD pecl-gmagick-1.1.7_rc3.ebuild 542 SHA256 0d148517f548b428234b07527e81bf51921d949d0559a6f3bd1063285f6a7866 SHA512 781f1f9542cb96b735bf3ac93625735255746bf0581d7f509c990dc837226ad6a8794062cb2c01dbe0617ff9a6584d7f7d6b55c3ddb2908c155bf3676779e924 WHIRLPOOL db4b930fc538c9466b04fa391b84d85ec4cf64648a80683b8391bb8ca33d14974472be95737becf060dc2507e4ee7be29e2bf81fbb61c9f1b079865ce248a105
-EBUILD pecl-gmagick-2.0.4_rc1.ebuild 536 SHA256 3db33b3b2f0b93edbc0b2da6403c0c564fd2cc863efe2cab03add12255710132 SHA512 230c6901dc0031d011e6177016241bb2eeaf98401aedb65d11715ae5889eb9b57b17d924ff6711ebdf01626c3510388f5d51dac8e5dfb9e24fa88f3141b98400 WHIRLPOOL 5a4152bfb0ddebcae36a06a20c8dd82144dd88e0643ef66c9c1efb6279638043914f9d68c27786be1440250f38df7c8b0147c2523c7da9a22323d543401f2a73
+EBUILD pecl-gmagick-1.1.7_rc3.ebuild 575 SHA256 7945702c91036a8db720e416abc0d840554ade6469abf5bf0ecae0496a2aad35 SHA512 e56f2541f32f702933d661455a7907770e6033de7ecb89e10173c5d41bde579a1e0ece3179acfe14608c6db577ffa4f62f40acfd6b2f2b5b367aaa599b1ebada WHIRLPOOL 8ac6e5896bb9995ebb02dd96e6f6213d657f4428f335ab388f8edeb6ae85d2fb131c914f4be6c1532f32fa69c9e60e14eef2a93021b509376a0d5854680dac9b
+EBUILD pecl-gmagick-2.0.4_rc1.ebuild 569 SHA256 7076521d6c36eee53fec957d8dc1f99a98483ad9b30004ce10229e90511fb162 SHA512 4cbe45a6964da4be3464344e0c5cc22551fda21ce5e3e575358863ce5d00b77d7d875180672a80db35e8da117b6c674810e06af0f04381d1045f703ff9c2e8a1 WHIRLPOOL 302767fef17428490cf61171831186495c38128e522516541096083e9ad3ec4b03162e5e1bfcff19e9d54939ec68194ee9a7143e2907e53dd4097a4b64d17640
diff --git a/dev-php/pecl-gmagick/pecl-gmagick-1.1.7_rc3.ebuild b/dev-php/pecl-gmagick/pecl-gmagick-1.1.7_rc3.ebuild
index 9d4cc94..7650a0e 100644
--- a/dev-php/pecl-gmagick/pecl-gmagick-1.1.7_rc3.ebuild
+++ b/dev-php/pecl-gmagick/pecl-gmagick-1.1.7_rc3.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PHP_EXT_NAME="gmagick"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS="TODO"
 
-MY_PV="${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${PN/pecl-/}-${PV/_rc/RC}.tgz"
 USE_PHP="php5-4 php5-5 php5-6"
 
-inherit php-ext-pecl-r2
+inherit php-ext-pecl-r3
 
 KEYWORDS="amd64 x86"
 
@@ -26,5 +26,5 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	my_conf="--with-gmagick=/usr"
-	php-ext-source-r2_src_configure
+	php-ext-source-r3_src_configure
 }
diff --git a/dev-php/pecl-gmagick/pecl-gmagick-2.0.4_rc1.ebuild b/dev-php/pecl-gmagick/pecl-gmagick-2.0.4_rc1.ebuild
index 9598bd4..d88c017 100644
--- a/dev-php/pecl-gmagick/pecl-gmagick-2.0.4_rc1.ebuild
+++ b/dev-php/pecl-gmagick/pecl-gmagick-2.0.4_rc1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PHP_EXT_NAME="gmagick"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS="TODO"
 
-MY_PV="${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${PN/pecl-/}-${PV/_rc/RC}.tgz"
 USE_PHP="php7-0 php7-1"
 
-inherit php-ext-pecl-r2
+inherit php-ext-pecl-r3
 
 KEYWORDS="amd64 x86"
 
@@ -26,5 +26,5 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	my_conf="--with-gmagick=/usr"
-	php-ext-source-r2_src_configure
+	php-ext-source-r3_src_configure
 }