Fix SONAME, thanks adr in bug #465668

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)

4 files changed, 110 insertions, 57 deletions

diff --git a/gnustep-base/libobjc2/ChangeLog b/gnustep-base/libobjc2/ChangeLog
index 21f20af2c448..b4e0615c3ec2 100644
--- a/gnustep-base/libobjc2/ChangeLog
+++ b/gnustep-base/libobjc2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-base/libobjc2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/ChangeLog,v 1.13 2013/09/27 20:09:55 voyageur Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/ChangeLog,v 1.14 2015/05/20 11:27:34 voyageur Exp $
+
+*libobjc2-1.7-r1 (20 May 2015)
+
+  20 May 2015; Bernard Cafarelli <voyageur@gentoo.org> -libobjc2-1.6.ebuild,
+  +libobjc2-1.7-r1.ebuild, +files/libobjc2-1.7-fix_soname.patch:
+  Fix SONAME, thanks adr in bug #465668
 
   27 Sep 2013; Bernard Cafarelli <voyageur@gentoo.org> libobjc2-1.7.ebuild,
   metadata.xml:
diff --git a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch b/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch
new file mode 100644
index 000000000000..ba1aa8ecea91
--- /dev/null
+++ b/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch
@@ -0,0 +1,58 @@
+diff -Naur libobjc2-1.7.orig/CMakeLists.txt libobjc2-1.7/CMakeLists.txt
+--- libobjc2-1.7.orig/CMakeLists.txt	2013-06-27 13:30:41.000000000 +0200
++++ libobjc2-1.7/CMakeLists.txt	2015-05-20 13:20:55.214244088 +0200
+@@ -8,7 +8,8 @@
+ set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
+ set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
+ 
+-set(libobjc_VERSION 4.6)
++set(libobjc_SOVERSION 4)
++set(libobjc_VERSION 4.6.0)
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
+ # Build configuration
+@@ -204,7 +205,8 @@
+ 			add_library(objcxx SHARED ${libobjcxx_CXX_SRCS})
+ 			set_target_properties(objcxx PROPERTIES
+ 				LINKER_LANGUAGE C
+-				SOVERSION ${libobjc_VERSION}
++            SOVERSION ${libobjc_SOVERSION}
++            VERSION ${libobjc_VERSION}
+ 				)
+ 			target_link_libraries(objcxx ${CXX_RUNTIME})
+ 			set(CXX_RUNTIME "")
+@@ -220,7 +222,8 @@
+ 		add_library(objcxx SHARED ${libobjcxx_CXX_SRCS})
+ 		set_target_properties(objcxx PROPERTIES
+ 			LINKER_LANGUAGE C
+-			SOVERSION ${libobjc_VERSION}
++         SOVERSION ${libobjc_SOVERSION}
++         VERSION ${libobjc_VERSION}
+ 			)
+ 		set(CXX_RUNTIME "")
+ 		list(APPEND INSTALL_TARGETS objcxx)
+@@ -241,7 +244,8 @@
+ 
+ set_target_properties(objc PROPERTIES
+ 	LINKER_LANGUAGE C
+-	SOVERSION ${libobjc_VERSION}
++   SOVERSION ${libobjc_SOVERSION}
++   VERSION ${libobjc_VERSION}
+ 	OUTPUT_NAME ${LIBOBJC_NAME}
+ 	LINK_FLAGS "${objc_LINK_FLAGS}"
+ 	)
+@@ -349,3 +353,14 @@
+ 	add_subdirectory(Test)
+ endif (TESTS)
+ 
++
++MESSAGE(STATUS "<<< Gentoo configuration >>>
++Build type      ${CMAKE_BUILD_TYPE}
++Install path    ${CMAKE_INSTALL_PREFIX}
++Compiler flags:
++C               ${CMAKE_C_FLAGS}
++C++             ${CMAKE_CXX_FLAGS}
++Linker flags:
++Executable      ${CMAKE_EXE_LINKER_FLAGS}
++Module          ${CMAKE_MODULE_LINKER_FLAGS}
++Shared          ${CMAKE_SHARED_LINKER_FLAGS}\n")
diff --git a/gnustep-base/libobjc2/libobjc2-1.6.ebuild b/gnustep-base/libobjc2/libobjc2-1.6.ebuild
deleted file mode 100644
index 4f4e3dafa609..000000000000
--- a/gnustep-base/libobjc2/libobjc2-1.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/libobjc2-1.6.ebuild,v 1.3 2012/02/20 10:10:43 voyageur Exp $
-
-EAPI=4
-inherit multilib
-
-# We need gnustep-make, but gnustep-make can depend on libobjc
-# Use a temporary setup to install in /usr/
-GSMAKE=gnustep-make-2.6.2
-DESCRIPTION="GNUstep Objective-C runtime"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="http://download.gna.org/gnustep/${P}.tar.bz2
-	ftp://ftp.gnustep.org/pub/gnustep/core/${GSMAKE}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boehm-gc"
-
-RDEPEND="boehm-gc? ( dev-libs/boehm-gc )"
-DEPEND="${DEPEND}
-	>=sys-devel/clang-2.9"
-
-GSMAKE_S=${WORKDIR}/${GSMAKE}
-
-src_prepare() {
-	# Multilib-strict
-	cd "${GSMAKE_S}"
-	sed -e "s/lib/$(get_libdir)/g" \
-		-i FilesystemLayouts/fhs-system || die "multilib path sed failed"
-}
-
-src_configure() {
-	export CC=clang
-
-	cd "${GSMAKE_S}"
-	econf --with-layout=fhs-system
-}
-
-src_compile() {
-	local gb
-	use boehm-gc \
-		&& gb="boehm_gc=yes" \
-		|| gb="boehm_gc=no"
-	emake GNUSTEP_MAKEFILES="${GSMAKE_S}" messages=yes ${gb}
-}
-
-src_install() {
-	emake GNUSTEP_MAKEFILES="${GSMAKE_S}" \
-		GNUSTEP_CONFIG_FILE="${GSMAKE_S}"/GNUstep.conf \
-		GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
-		messages=yes \
-		DESTDIR="${D}" install
-}
diff --git a/gnustep-base/libobjc2/libobjc2-1.7-r1.ebuild b/gnustep-base/libobjc2/libobjc2-1.7-r1.ebuild
new file mode 100644
index 000000000000..c801403197f2
--- /dev/null
+++ b/gnustep-base/libobjc2/libobjc2-1.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/libobjc2/libobjc2-1.7-r1.ebuild,v 1.1 2015/05/20 11:27:34 voyageur Exp $
+
+EAPI=5
+inherit cmake-utils eutils
+
+DESCRIPTION="GNUstep Objective-C runtime"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="http://download.gna.org/gnustep/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boehm-gc cxx test"
+
+RDEPEND="boehm-gc? ( dev-libs/boehm-gc )
+	cxx? ( sys-libs/libcxx )"
+DEPEND="${DEPEND}
+	>=sys-devel/clang-2.9"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix_soname.patch
+
+	if ! use cxx;
+	then
+		sed -e 's/addtest_flags(CXXExceptions.*//' \
+			-i Test/CMakeLists.txt || die "test sed failed"
+	fi
+}
+
+src_configure() {
+	export CC=clang
+	export CXX=clang++
+
+	export PREFIX=/usr
+	local mycmakeargs=(
+		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
+		$(cmake-utils_use boehm-gc BOEHM_GC)
+		$(cmake-utils_use_enable cxx OBJCXX)
+		$(cmake-utils_use test TESTS)
+	)
+	cmake-utils_src_configure
+}