Fix SONAME, thanks adr in bug #465668

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

5 files changed, 129 insertions, 64 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/Manifest b/gnustep-base/libobjc2/Manifest
index 50b5faae306f..3701a2bc394d 100644
--- a/gnustep-base/libobjc2/Manifest
+++ b/gnustep-base/libobjc2/Manifest
@@ -1,19 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libobjc2-1.7-fix_soname.patch 1827 SHA256 57d4a0c848925b65c111384b2b5278e91411e7f8bc22f6936e424eaf5d785c27 SHA512 d6ce4a6840e7f3ea22db3f63574a08fe9fad2fd3ebeaac764097935b322f038baa4ec9d0f19124dd84cb6ffe010e267bdb60f76f5d24dd508f520bdb38124ead WHIRLPOOL 1b2e99f245b9c31909b30d71c7208da2b1b525b3423482d45df5c625165e2117c0079f3fb6d42cc0f402fd889009173c0d2e5abe893b568d3265c0c24798a022
 DIST gnustep-make-2.6.2.tar.gz 562770 SHA256 7a95b3fc5bf14f6b06c4f1f716b48e9de13a11c1fa972aa3cc87736cd98f3e3a SHA512 5ef7889418e7e5acc40cd045772b08d178333dd7cb396b46bfcc117b8953c868cffff5ad41153f6cf2029f1d78d7213516cf1c2cfc88f028ffb883d0e83ea6a4 WHIRLPOOL 73f0953ba044323349a60393ca644031bac13ea48dab6ccbbf533ee5e52daa8411f6b7bdc4fc8928536c37c5edcaf3a6ef40c3c2ee335c0608b5c8d3a6d890d5
 DIST libobjc2-1.6.1.tar.bz2 116263 SHA256 941764684e764f25864d3f318d5cac80b5b899df40d485c521742431fc13e2f9 SHA512 e43bf867ca734e76274826a222a10e9b603e085a9dd245912ee16603bb61e276fcd9388918f61aba7d0bded0c045bc9799f7e24b309d670d144175707662f9c8 WHIRLPOOL e3c259ffdbc6978d531f0e91ccc522fcc9832f95f173dfe0be67650654b1e048ea14b49c2ac0b81df916aafd712b084a004fd13e970bbbc0c03e8a6d7a206d3e
-DIST libobjc2-1.6.tar.bz2 114767 SHA256 cad4556d612e871f60ae19531474045075fab3ffab055f76140e3fed30a0c51d SHA512 e36d03021f3824baab0d07a0031739abea0d6f6d40ac0d95fa273d5a437eeda5633a9a645e48199cac63e6adfda75128d2664df663ef4b4e45b62d433146fb52 WHIRLPOOL a8a6cd3fc30e4e3dc4280d388000b98a9cba063d623282a7f35d43c47a70ec5d8a333621e57d586c71c8c3c53d934b5191b546773fc806b54ad748375b33b20c
 DIST libobjc2-1.7.tar.bz2 132662 SHA256 3a1b4af6ff6f3d8e57bfb27401d1b249670ac2e92ba54ad5683ff3d4439d3cc1 SHA512 d44631ec39533128d4d4a1138cfb3c00c9383cd1b722c3dcb8ed679832c00b559516072af6fdd5e464aa1de493358127a37c295994244a1573f4ff86056c24a9 WHIRLPOOL 1dabe89e48cc446c56a509b07c5b3fba84686116bf57d456ed29fd583b8ab6cd035712c24f9c584a8433b72347fa3f4e412bc22ea2ce6985793f7d93cf6758eb
 EBUILD libobjc2-1.6.1.ebuild 1453 SHA256 7f89e099809a1af6094af10ede7dbf425d56b4bf185b4089899ad19104fe133d SHA512 8fdcd09c3606b829675ded61d7d1f32d2a217842d052f9ba719abffdd2907218d59f3cb0a8acdf159a5201a7de61c4d8a4468f711fee84c0ae241aef44750eb2 WHIRLPOOL f658c73e12e0ec7e42be2d525a8feedcafd3c537d1abd126a8ff7bef972f000ef44a32c187e6c29b6bd8937f2af3228ff93dbd3d71269afdda8d649af85f40bf
-EBUILD libobjc2-1.6.ebuild 1341 SHA256 00764026dcfe8a9877d42ac2687edc12af0b7976caf1d3f9682a625e25a6965a SHA512 7bff28898bbf79adfb02718e13a18ad547fc43ebda54d3e388e9c24b9e588b23f232006f4ee3f88301ac44a49cc0e6c67c1e92dff096c0ff2f2ebc81368835f3 WHIRLPOOL f0c4d800e7ab4b9df0306155e992141241676dbba058819d06ef40c406132cf3832ea0161ea8fd924ad6d690aa8a67c2de6156a600325f35cae5d360829c1708
+EBUILD libobjc2-1.7-r1.ebuild 1048 SHA256 b859cc731a1598da05a481918a8c23be1c327a83876becd2b5d6c3b8e1ba2ac1 SHA512 4b7a668deaa21b3b762dd6b1cdadce45cfce0a0d194e5cd63016d6ed59b2e41f493722b92ebcd78b83659b176c09cfd14dd4012b4a2a25a735f06ed5ff20480c WHIRLPOOL 32e719fd8e7b44124dd144ca110d514ffa3d14e4bddd26ae715a72fb12f37ffd55235ea5276de0a30752269bb858f3c6ff8f52f6926c62790f34120d7d64ef05
 EBUILD libobjc2-1.7.ebuild 993 SHA256 c0f8cf39bad4719754458306fb0bcdd4cf34a203ceca502638443b1f41fe67af SHA512 972d1c312d3007827ac3ca0e5134d3577af143a93ac58bc8b609bded704a34df345513d64f0fcacf08acd06650d5cbbd6220af05ad11bfad63eed34288ed0846 WHIRLPOOL 61f02bdd74fbc546c51041418932fc4a956f1fdfd9396bb299afc5e68949b130da272d43f99b0d309897bd105f782e0cd1f1983c6429c17566cfaa04042071a0
-MISC ChangeLog 2404 SHA256 3f4a8e7765c10f441ab73d4dc6d6529b36f53e1dca014e03e20726fe46706763 SHA512 6ef8df97e3387028d704d17cb255889f45eb13dc19d73198e29ae7f2adcf2d2f46a54209d26c5fde454975a6c8c85e63f6f4d0338dc15f1e26d41fbb3f6591ec WHIRLPOOL 761eeac9870441a8a7a47848cd87d8ec6fef9b3c4f993249b85c867d41e3df264cbe81854c5b57f7f938066e4e6438521da3d0e311143b5eef8339462c1005b9
+MISC ChangeLog 2619 SHA256 5ba230cab14dfa2e7fb67fc7ee25c18854eb312755c0de8ebef552edb2f54019 SHA512 c007a08b5f9d2d0894b7a13a325d92b00abd5cd5899cbd1b3a07c862bf5caa90cfca9ed1b0628dae767ac72ef04a0d4e9c8d56733f2ee94fabd90a95ce81777e WHIRLPOOL b63bfebb28f77b0ca3d2a9f6dda624195ecfbad82e3db0faf3c8f76e7498e8eeadb598ef86eca428805cf828230acda1779363f877540785b2bc03a67399e0d0
 MISC metadata.xml 1175 SHA256 89d0f8fe4f076133d18d37dfb42483c197d119aff66512e0242efa28ab121c23 SHA512 304949e6b8e63504fbbeef871b54cbb132fb17da444204244013405957e9cc411dbbc017f959f5ee2e4774cf82a55b978f311b9aa0f556ed539d534f39cea664 WHIRLPOOL 91a63dde94b74efb269188c28f2e6eba91bdb825727c89f01833acfb5161723e3ef3d5fd9e7cf73118815a950dcf5dec93b9fcd6af5f5a39d09c8c41e5815aa7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.1
 
-iF4EAREIAAYFAlJF5hgACgkQFYEBGcdFJfJ7dgD9E98TghYI6jZxFLSXm5W+RXJA
-/+8qkqQM8n0WnCkqwloA/jhXy3pDdDTaH3n2a3HjIMFpfW8vgGB72pgDY0bAA42j
-=Onuj
+iQJ8BAEBCABmBQJVXG+oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/XDsP/jimtIQe5A4WDQ5Upd3NJMCf
+8+OFgGVIv3YGKzeSOIx+ycR3BtGaE8FQBNVHzQ6KZGuvCmh89S8C0Q25lKiGzc9F
+ZAst5bK/KAA5PGjmxME6De4gOAnfjLJiZN0xBIDy1xq52wir64uacYZKeYer9nRB
+NnE+C0pG0D+l//5CMEE00ftQD2PaH/RZNaZWC0VaEXY8pv50hMPnEfIEI4fVovHD
+W3TOVrlOjaTbh57Nj/qwUTLnhXI4519lxDDauYH52DYIxD5IEEzIaIE1diRKdEo6
+Ont86W82+YL3ntFImFO6AO8P59cZcVgUOEo1skvMCsTvymmMIJK6+LuQriAVke7t
+3ee1lMfLP4xaiKEOdNTYKw37KZ86AZao51bF9v7bQGR/yskmFP1jNfvh3jL7YJVH
+aFVYPUa05v0nwBOTmAsOR9rXvMatXoxpxDMI6k6bk+31Ss7qMNDfLqUoWLs4F37Q
+oxAzttEQD8Ela3WAgqcJwLhnuXL1AhXzJXz1RK5ldn1gs1YIWC3bGlr7oNiO6SRs
+KxaImQtCENu9hTqVfiE/tDtGEywN/UiQeRljHClmF7z6/uReF43oLD5R4rgVcK3E
+yEKHiJjSZ5Vj1WCPd1RYB6CPpkcv60n9sH8kw784hSGlbVYstQhF8/5PSPcdCg2I
+ZXJWw6aXfzcpYXrrK8zl
+=hkXE
 -----END PGP SIGNATURE-----
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
+}