Remove icu 50.1.1 which has broken abi, compared the abi between 50.1 and 50.1.2 and it seems they are equal so use the same subslot and for further refference whomever touches this package must check the abi and adjust the subslot correctly. If that won't be done I will bring my pitchfork and do naughty stuff to such dev.

(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

4 files changed, 13 insertions, 123 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index f41a279bcaf7..7262ee3ef498 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.228 2013/02/06 14:53:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.229 2013/03/06 21:41:31 scarabeus Exp $
+
+  06 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> -icu-50.1.1.ebuild,
+  icu-50.1-r2.ebuild, icu-50.1.2.ebuild:
+  Remove icu 50.1.1 which has broken abi, compared the abi between 50.1 and
+  50.1.2 and it seems they are equal so use the same subslot and for further
+  refference whomever touches this package must check the abi and adjust the
+  subslot correctly. If that won't be done I will bring my pitchfork and do
+  naughty stuff to such dev.
 
   06 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org> +files/icu-50.1.2-bsd.patch,
   icu-50.1.2.ebuild:
diff --git a/dev-libs/icu/icu-50.1-r2.ebuild b/dev-libs/icu/icu-50.1-r2.ebuild
index 5672df035360..1841c317c52c 100644
--- a/dev-libs/icu/icu-50.1-r2.ebuild
+++ b/dev-libs/icu/icu-50.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1-r2.ebuild,v 1.5 2013/02/02 10:53:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1-r2.ebuild,v 1.6 2013/03/06 21:41:31 scarabeus Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.icu-project.org/"
 SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
 
 LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0/50.1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
 IUSE="debug doc examples static-libs"
 
diff --git a/dev-libs/icu/icu-50.1.1.ebuild b/dev-libs/icu/icu-50.1.1.ebuild
deleted file mode 100644
index f35e3db416b3..000000000000
--- a/dev-libs/icu/icu-50.1.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1.1.ebuild,v 1.5 2013/02/02 10:53:04 aballier Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs base autotools
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-	)
-"
-
-S="${WORKDIR}/${PN}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch"
-	"${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch"
-)
-
-src_prepare() {
-	local variable
-
-	base_src_prepare
-
-	# Do not hardcode flags in icu-config and icu-*.pc files.
-	# https://ssl.icu-project.org/trac/ticket/6102
-	for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
-		sed \
-			-e "/^${variable} =.*/s: *@${variable}@\( *$\)\?::" \
-			-i config/icu.pc.in \
-			-i config/Makefile.inc.in \
-			|| die
-	done
-
-	# Disable renaming as it is stupind thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	local cross_opts
-
-	# bootstrap for cross compilation
-	if tc-is-cross-compiler; then
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		./configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-		mkdir -p "${WORKDIR}/host/"
-		cp -a {bin,lib,config,tools} "${WORKDIR}/host/"
-		emake clean
-
-		cross_opts="--with-cross-build=${WORKDIR}/host"
-	fi
-
-	econf \
-		--disable-renaming \
-		$(use_enable debug) \
-		$(use_enable examples samples) \
-		$(use_enable static-libs static) \
-		${cross_opts}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-src_install() {
-	default
-
-	dohtml ../readme.html
-
-	use doc && dohtml -p api -r doc/html/
-}
diff --git a/dev-libs/icu/icu-50.1.2.ebuild b/dev-libs/icu/icu-50.1.2.ebuild
index 4a95559bc913..e0ca07b03857 100644
--- a/dev-libs/icu/icu-50.1.2.ebuild
+++ b/dev-libs/icu/icu-50.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1.2.ebuild,v 1.3 2013/02/06 14:53:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1.2.ebuild,v 1.4 2013/03/06 21:41:31 scarabeus Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.icu-project.org/"
 SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
 
 LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0/50.1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc examples static-libs"