diff --git a/dev-perl/CryptX/CryptX-0.006.ebuild b/dev-perl/CryptX/CryptX-0.006.ebuild
deleted file mode 100644
index 3755f48a4073c..0000000000000
--- a/dev-perl/CryptX/CryptX-0.006.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MODULE_AUTHOR="MIK"
-
-inherit perl-module
-
-DESCRIPTION="Self-contained crypto toolkit"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-perl/Module-Build"
diff --git a/dev-perl/CryptX/CryptX-0.012.ebuild b/dev-perl/CryptX/CryptX-0.012.ebuild
deleted file mode 100644
index 3755f48a4073c..0000000000000
--- a/dev-perl/CryptX/CryptX-0.012.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MODULE_AUTHOR="MIK"
-
-inherit perl-module
-
-DESCRIPTION="Self-contained crypto toolkit"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-perl/Module-Build"
diff --git a/dev-perl/CryptX/CryptX-0.25.0.ebuild b/dev-perl/CryptX/CryptX-0.25.0.ebuild
new file mode 100644
index 0000000000000..30b3de9e59f3f
--- /dev/null
+++ b/dev-perl/CryptX/CryptX-0.25.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MODULE_AUTHOR=MIK
+MODULE_VERSION=0.025
+inherit perl-module
+
+DESCRIPTION="Self-contained crypto toolkit"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.590.0
+	>=dev-perl/JSON-2.10.0
+	>=virtual/perl-MIME-Base64-3.110.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	dev-perl/Module-Build
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/CryptX/Manifest b/dev-perl/CryptX/Manifest
index a089502ee9b51..d82c34945e2d9 100644
--- a/dev-perl/CryptX/Manifest
+++ b/dev-perl/CryptX/Manifest
@@ -1,3 +1,2 @@
-DIST CryptX-0.006.tar.gz 1010671 SHA256 78affdbc28a0ce4de37fcefdf72f2097b2ba34c2e0b9100e1cc8f0b038102f4d SHA512 407b4e3adb406a61fccb14491d2ff794ec3655a1cf78f73c7fe2ea177aa72312f69bcc5d5fa17beefd86661233703194afaec0f1717cb0dc91a1847a7b228bcf WHIRLPOOL 3b85591597cc0f42c0231623c3fe82f044828e5e5a6e975ac53831f6cc1311fd4d97fb9f0becc2564172d41ca0bc89ca2a6e0f254e8af572d1377696930e693a
-DIST CryptX-0.012.tar.gz 1002487 SHA256 a3cff52cc57a28453b2997600bee040b9504446c9f9484a3009e860c85c6de2f SHA512 fb24cac81c650baee50d90f0fd2463cdfccaeb87d5e56ef01bb2c47ddf53553592958b5dc8a9b3fa9750f7b35d2d8e88dd2fc63407f29ceb6d8b9cda788e3161 WHIRLPOOL a5332d3730f742e4e5980bb1f168f1d599a101b505c1c623769a3db8dd562b1da4f874d8d8f427a49df553836dee02aac00dce4d2274c6eb7f66c0ff6769f5f6
 DIST CryptX-0.021.tar.gz 1230263 SHA256 155bf8ff158e8e8e252c16ff16655d1ec22866e56b10dea5e419e77e53d1b2f7 SHA512 091426d4bf7de82758c8e21a3db9e65d3e43bf7ef8071d76f50dfbb70b22939a963deafe0a32124a0a6f548ebeed5884997ed1a48007146b3425a9453214e7c7 WHIRLPOOL c2f5bba9d98feb5e7364f82386d56989896673ed89b52139db94cd1490f49850ecd993d9f49d08d8f5383720d51327cec1cfc9fbec67fb1b6da80239b204f10c
+DIST CryptX-0.025.tar.gz 1322492 SHA256 f8b7e3ec1713c8dfe3eef9d114f45f223b97e2340f81a20589b5605fa49cfe38 SHA512 73495601ff9ca70090dc2eb75ab382ef34ca1357b4f6cf82c07fe5c1a38ab5b4cf8fa79b44dcf9145be13ca0b2e7e5e99903d5a9fd425de2e46526fd4ac17554 WHIRLPOOL 12c338aca513b5ccbce69359acb99e5ca1182a61467d864050990e68fe8f2010604676f39fe650890ae8b37745954364f781e0d7ee6d20c1658a782c81500f65