diff --git a/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0.ebuild b/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0-r1.ebuild similarity index 87% rename from dev-perl/Data-FormValidator/Data-FormValidator-4.810.0.ebuild rename to dev-perl/Data-FormValidator/Data-FormValidator-4.810.0-r1.ebuild index 015acb4e75ba5..bab1c2ac3387c 100644 --- a/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0.ebuild +++ b/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" IUSE="" -RDEPEND="dev-perl/ImageSize +RDEPEND="dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.17 >=dev-perl/MIME-Types-1.005 diff --git a/dev-perl/ImageInfo/ImageInfo-1.340.0.ebuild b/dev-perl/Image-Info/Image-Info-1.340.0.ebuild similarity index 86% rename from dev-perl/ImageInfo/ImageInfo-1.340.0.ebuild rename to dev-perl/Image-Info/Image-Info-1.340.0.ebuild index 03bc559ec3979..c93c2e10fec70 100644 --- a/dev-perl/ImageInfo/ImageInfo-1.340.0.ebuild +++ b/dev-perl/Image-Info/Image-Info-1.340.0.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -MY_PN=Image-Info MODULE_AUTHOR=SREZIC MODULE_VERSION=1.34 inherit perl-module diff --git a/dev-perl/ImageInfo/ImageInfo-1.360.0.ebuild b/dev-perl/Image-Info/Image-Info-1.360.0.ebuild similarity index 85% rename from dev-perl/ImageInfo/ImageInfo-1.360.0.ebuild rename to dev-perl/Image-Info/Image-Info-1.360.0.ebuild index e2b26231e90a4..338422ae97268 100644 --- a/dev-perl/ImageInfo/ImageInfo-1.360.0.ebuild +++ b/dev-perl/Image-Info/Image-Info-1.360.0.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -MY_PN=Image-Info MODULE_AUTHOR=SREZIC MODULE_VERSION=1.36 inherit perl-module diff --git a/dev-perl/ImageInfo/ImageInfo-1.380.0.ebuild b/dev-perl/Image-Info/Image-Info-1.380.0.ebuild similarity index 86% rename from dev-perl/ImageInfo/ImageInfo-1.380.0.ebuild rename to dev-perl/Image-Info/Image-Info-1.380.0.ebuild index 344487b238648..8abac59b8913e 100644 --- a/dev-perl/ImageInfo/ImageInfo-1.380.0.ebuild +++ b/dev-perl/Image-Info/Image-Info-1.380.0.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -MY_PN=Image-Info MODULE_AUTHOR=SREZIC MODULE_VERSION=1.38 inherit perl-module diff --git a/dev-perl/ImageInfo/Manifest b/dev-perl/Image-Info/Manifest similarity index 100% rename from dev-perl/ImageInfo/Manifest rename to dev-perl/Image-Info/Manifest diff --git a/dev-perl/ImageInfo/metadata.xml b/dev-perl/Image-Info/metadata.xml similarity index 100% rename from dev-perl/ImageInfo/metadata.xml rename to dev-perl/Image-Info/metadata.xml diff --git a/dev-perl/ImageSize/ImageSize-3.232.0-r1.ebuild b/dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild similarity index 87% rename from dev-perl/ImageSize/ImageSize-3.232.0-r1.ebuild rename to dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild index af889f2fd0b0a..e7f1021e1d445 100644 --- a/dev-perl/ImageSize/ImageSize-3.232.0-r1.ebuild +++ b/dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -MY_PN=Image-Size MODULE_AUTHOR=RJRAY MODULE_VERSION=3.232 inherit perl-module diff --git a/dev-perl/ImageSize/ImageSize-3.300.0.ebuild b/dev-perl/Image-Size/Image-Size-3.300.0.ebuild similarity index 89% rename from dev-perl/ImageSize/ImageSize-3.300.0.ebuild rename to dev-perl/Image-Size/Image-Size-3.300.0.ebuild index b9891a81703d9..7b8b7003b3623 100644 --- a/dev-perl/ImageSize/ImageSize-3.300.0.ebuild +++ b/dev-perl/Image-Size/Image-Size-3.300.0.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -MY_PN=Image-Size MODULE_AUTHOR=RJRAY MODULE_VERSION=3.300 inherit perl-module diff --git a/dev-perl/ImageSize/Manifest b/dev-perl/Image-Size/Manifest similarity index 100% rename from dev-perl/ImageSize/Manifest rename to dev-perl/Image-Size/Manifest diff --git a/dev-perl/ImageSize/metadata.xml b/dev-perl/Image-Size/metadata.xml similarity index 100% rename from dev-perl/ImageSize/metadata.xml rename to dev-perl/Image-Size/metadata.xml diff --git a/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r1.ebuild b/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r2.ebuild similarity index 92% rename from dev-perl/Panotools-Script/Panotools-Script-0.280.0-r1.ebuild rename to dev-perl/Panotools-Script/Panotools-Script-0.280.0-r2.ebuild index 9fd221c4fc49e..e59dff2a7d989 100644 --- a/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r1.ebuild +++ b/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,7 @@ IUSE="gui" RDEPEND="dev-perl/URI dev-perl/libwww-perl - >=dev-perl/ImageSize-2.9 + >=dev-perl/Image-Size-2.900.0 >=media-libs/exiftool-6 gui? ( gnome-extra/zenity )" DEPEND="" diff --git a/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r1.ebuild b/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild similarity index 80% rename from dev-perl/RTF-Writer/RTF-Writer-1.110.0-r1.ebuild rename to dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild index a8dee6fc0f015..4cdc9b6145d09 100644 --- a/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r1.ebuild +++ b/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64 x86" IUSE="" -RDEPEND="dev-perl/ImageSize" +RDEPEND="dev-perl/Image-Size" DEPEND="${RDEPEND}" SRC_TEST="do" diff --git a/media-gfx/llgal/llgal-0.13.17-r1.ebuild b/media-gfx/llgal/llgal-0.13.17-r2.ebuild similarity index 93% rename from media-gfx/llgal/llgal-0.13.17-r1.ebuild rename to media-gfx/llgal/llgal-0.13.17-r2.ebuild index a36320d7a6c56..bb94239e84539 100644 --- a/media-gfx/llgal/llgal-0.13.17-r1.ebuild +++ b/media-gfx/llgal/llgal-0.13.17-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -22,7 +22,7 @@ for i in ${LINS}; do done RDEPEND="media-gfx/imagemagick - dev-perl/ImageSize + dev-perl/Image-Size dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool )" diff --git a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild b/media-plugins/mythplugins/mythplugins-0.26.0_p20130922-r1.ebuild similarity index 97% rename from media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild rename to media-plugins/mythplugins/mythplugins-0.26.0_p20130922-r1.ebuild index ac217b1644de2..e6acfe47c29b5 100644 --- a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild +++ b/media-plugins/mythplugins/mythplugins-0.26.0_p20130922-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -70,7 +70,7 @@ DEPEND="!media-plugins/mytharchive mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 - dev-perl/ImageSize + dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r3.ebuild similarity index 98% rename from media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild rename to media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r3.ebuild index 740b4872f5a3f..8d1ce4201db1e 100644 --- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild +++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -111,7 +111,7 @@ DEPEND="!media-plugins/mytharchive dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 - dev-perl/ImageSize + dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r4.ebuild similarity index 99% rename from media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild rename to media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r4.ebuild index 8305e574ea3fb..a82d7ebb25aee 100644 --- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild +++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r4.ebuild @@ -111,7 +111,7 @@ DEPEND="!media-plugins/mytharchive dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 - dev-perl/ImageSize + dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple diff --git a/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild b/media-plugins/mythplugins/mythplugins-0.27_p20140321-r1.ebuild similarity index 97% rename from media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild rename to media-plugins/mythplugins/mythplugins-0.27_p20140321-r1.ebuild index d0311739a21a2..f888c76cafde9 100644 --- a/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild +++ b/media-plugins/mythplugins/mythplugins-0.27_p20140321-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -71,7 +71,7 @@ DEPEND="!media-plugins/mytharchive dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 - dev-perl/ImageSize + dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016 index d4f252eebe994..659fe80da8cd8 100644 --- a/profiles/updates/1Q-2016 +++ b/profiles/updates/1Q-2016 @@ -12,3 +12,5 @@ slotmove >=sci-libs/libint-2 0 2 move dev-ml/pa_test dev-ml/ppx_assert move dev-ml/custom_printf dev-ml/ppx_custom_printf move sci-mathematics/csdp sci-libs/coinor-csdp +move dev-perl/ImageInfo dev-perl/Image-Info +move dev-perl/ImageSize dev-perl/Image-Size diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild similarity index 92% rename from www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild rename to www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild index bea6836fa041e..aec92c54c20df 100644 --- a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild +++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -26,8 +26,8 @@ DEPEND="${DEPEND} =www-apache/libapreq2-2*[perl] >=media-libs/imlib2-1.0.6-r1 dev-perl/URI - >=dev-perl/ImageInfo-1.04-r2 - >=dev-perl/ImageSize-2.99-r1 + >=dev-perl/Image-Info-1.40.0 + >=dev-perl/Image-Size-2.990.0 dev-perl/text-template >=dev-perl/CGI-3.08 dev-perl/Image-Imlib2 diff --git a/www-apps/metadot/metadot-6.1.6.ebuild b/www-apps/metadot/metadot-6.1.6-r1.ebuild similarity index 95% rename from www-apps/metadot/metadot-6.1.6.ebuild rename to www-apps/metadot/metadot-6.1.6-r1.ebuild index 9d7c2de08aa53..8dc917a9643cd 100644 --- a/www-apps/metadot/metadot-6.1.6.ebuild +++ b/www-apps/metadot/metadot-6.1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -32,7 +32,7 @@ RDEPEND=" dev-perl/Spreadsheet-WriteExcel dev-perl/Date-Calc dev-perl/AppConfig - dev-perl/ImageSize + dev-perl/Image-Size dev-perl/Template-Toolkit virtual/perl-Time-HiRes dev-perl/Lingua-EN-NameParse diff --git a/www-apps/metadot/metadot-6.4.5.4.ebuild b/www-apps/metadot/metadot-6.4.5.4-r1.ebuild similarity index 95% rename from www-apps/metadot/metadot-6.4.5.4.ebuild rename to www-apps/metadot/metadot-6.4.5.4-r1.ebuild index 6ca41f9494cf8..e2a82c1f89833 100644 --- a/www-apps/metadot/metadot-6.4.5.4.ebuild +++ b/www-apps/metadot/metadot-6.4.5.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -32,7 +32,7 @@ RDEPEND=" >=dev-perl/Unicode-String-2.07 >=dev-perl/Spreadsheet-WriteExcel-0.41 >=dev-perl/Date-Calc-5.3 - >=dev-perl/ImageSize-2.991 + >=dev-perl/Image-Size-2.991.0 >=dev-perl/Template-Toolkit-2.09 >=virtual/perl-Time-HiRes-1.48 >=virtual/perl-Test-Harness-2.28