Sed madness removed and integrated to no-strip.patch

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x34E69781

4 files changed, 52 insertions, 17 deletions

diff --git a/media-libs/openctm/ChangeLog b/media-libs/openctm/ChangeLog
index 1cfa99946d3c..776d9b6728d6 100644
--- a/media-libs/openctm/ChangeLog
+++ b/media-libs/openctm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openctm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/ChangeLog,v 1.5 2014/08/18 23:11:10 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/ChangeLog,v 1.6 2014/08/20 10:58:35 amynka Exp $
+
+  20 Aug 2014; Amy Winston <amynka@gentoo.org> +files/openctm-no-strip.patch,
+  openctm-1.0.3.ebuild:
+  Sed madness removed and integrated to no-strip.patch
 
   18 Aug 2014; Amy Winston <amynka@gentoo.org> openctm-1.0.3.ebuild:
   bad sed repaired
diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index 575d24ed3776..13420d716c09 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX openctm-fix-makefiles.patch 6908 SHA256 821da3d78579b566bb2e533e3a695ee14491826f79013a4c48e41e9bf36cb9ca SHA512 448a015695f98969320af6b80410f6596bf46b2fba9529637be7e51851552c6056871b1de21e98db01d255db1e71711f78c3e51d161c85dcb52dc5341545be74 WHIRLPOOL 367121b35e450c075d65d7e61730953655f3adefcb9d8f23ce03ac424deb24f45b9a9ba66f269e6707f6e1d481df2d8a7db297f058eeb9568fc549a42eba2d10
+AUX openctm-no-strip.patch 1654 SHA256 1ed768f41c41a75e807cad1005b6e9debfdd167c2af6644fcaf12616dd60db10 SHA512 a38c4647a0113892d2294efec96efb073cec4d5771c383cd7454422195f230b0326610905534e758fb1f1bf36a6dca1810005f603f70d73584093b8895a99ec0 WHIRLPOOL eacc3d2bfb3e7e935201d0c93ea22229f98a2120fae9f679aefced3f9070f8c56c38676c23b4054245c9487f5da2df76d6103160b993ecd4a8eb6764e2f17217
 DIST openctm_1.0.3+dfsg1.orig.tar.bz2 179792 SHA256 b72bae806d65dcb4d55b88f17bb636c9908717871cbebff6c32024399f50a074 SHA512 4ea8c9230e01b57fce4d741df77713df8fb0493fbb20c8d4b183e3e8cec16f97e8003d2569b1c7cac07a17d334711673c0fed0c6c050bbdb901028ee9f6c32f6 WHIRLPOOL 954ce30a418fba80649cd2f0eae604391c42a64e627a9d66171097da6fee55fba94229054350dc18cd311cc7d7fb0e1b5a6f9d7db0dce5d91451821df33da5f7
-EBUILD openctm-1.0.3.ebuild 949 SHA256 b881b3089fd45683e33d1b7c9921c52c80a1c649ea594e5087950478c03efee8 SHA512 afba035d2288e86ddf365cfedf41a515d3c3d8ae5d82ef2f8627da2820fb85763c747b4f85461e02cdee4eef692671e6f5f39dc6375c1fba4a517e12fd2f9b6b WHIRLPOOL fc2e7da5b6b1c97870efdb26f047c3096d688c0dfa75e3520f878d831dace04f2142cd8a1402ca387b4ba111cb18d5cb09d7c2a6b2aada95bc4672348e52ef5d
-MISC ChangeLog 882 SHA256 4585aae6ec048a0fad6feb843066a6748dd60c5f57f07913484758777f767e81 SHA512 1d7e4891080fc41161fadf65d5d23fa51ca9cfc0c200fca4b8aac48bbc150f14181554ea575626d19869f9728a59bd730bbec2afbf4f7383648ed97c768718a1 WHIRLPOOL 88c3ca2efd81bbb86eda1484a602dab6a886713938d336e1563922c818805f6d6b9232b00b23ac941ca6658cebb7cfd0077511ce4eb60ac29f5be347240a54e2
+EBUILD openctm-1.0.3.ebuild 876 SHA256 d6e3d7f243e100d75e95d77b30a0d3c8bacb1a0dca7a55bed8240695e35d26c9 SHA512 053418fab93652bc0768209b2d102eacc2b3e1a41b1bccbf2e5788a4b64b3a5907da43435e1944a5c0b3f0df0343c853216701568b83ff82494dabae3e794145 WHIRLPOOL 212db573dd5bc61848b0deb1c34e3915f55f6382480bdc1939948d317da921f2271fa9256489c67413e24b991c5e3868db5d4c436ee5eab70bdd961c11c4d638
+MISC ChangeLog 1040 SHA256 986ba111de6725d68eb14d22cc04c4b772beeb34e5a5d2da459f0987bbc88373 SHA512 84157aebd2e5214e7ee911c25f54bc4b8146b68f1d332d4ea868c149294531d2e01d5859e0cb0c87a5fb838821c5b710fe23b97f1856cf71030a65d553b70b74 WHIRLPOOL c3b3a4f629c56c19dc9940fcf36af180ea0f9af6fc85ce212b7ee06d90e320c8d62338bf37463affa9f615bd086dbbbca407c50153b6cad0a15d27c67ec21e7e
 MISC metadata.xml 408 SHA256 b8790e3619803316f037b5b4453987244b83cc01a52441ce2635ae557359e0f4 SHA512 280a95fb81d6790f12dd4895bd970c22e6edb2d8709107b2c50bfbd695a0d439f0f5018fc30f2039bfeed2ff5554f63e7110dd1519f74327c87c62acbedef05a WHIRLPOOL 3792b2d312e79d7b8badfca763865100c2f9fb53ca1b455eb56c68050ec4474ed2fb66ef53af4a9e47996cf657b79c52b3800ae407e352af1fc85a571923de97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT8ogbAAoJEDuJ1FA05peBRswH+wZGxgvs+afynK4k/tRLB9bR
-2tT96jUz1nBXKAjXDgbwNmYYJi824UsI80RGi0aI6U6BKcLW3m7Ed3MDMpx57EZF
-E+Ija5N1DS4nst9eKYPuhVUNJ+ziLPCGeWjaHhm0u96LQ4KW9gWXMPTkHimTm13O
-94dUnYK79PN1zORJ0vY/Az+7pjkzTa+xSquGHkUFpro6v6cHu4Gl/E8C/Om42S4M
-zlCXRFNLiRlFPBoOjRvFSO9Zf2vGVhqymFxz9x24DpZ5vZfLRuPV9jkp9H7oEuA/
-ZDBUm6vIZw7ZFSYt3UHzSp7sLinzFw+o8MMG9/kZXw0bdmOVrI727xhIhJ1lY2c=
-=LdcW
+iQEcBAEBCAAGBQJT9H9bAAoJEDuJ1FA05peB8FoH/0cj+A6EH4Rvp/nsG7BeXjuO
+jy/l0a6hWb4nxFAEdsLli+tk7txqOnyUfQsMPhOLfl1NY9rqUlMbR2uxrm01V27q
+eFMRG/SVCMArTl3IDRJY4NdQJlhi08tbD6qKu0z2DGTgzQ2BaFx16Zy3/KxGIjHa
+SUf1NSURzIQazYG6TLHiL7z37ka89sbTP7k0M1gDJBmwYlxGIr380NsPMzgp4Nxn
+dz+3/Bu2J/OWEm6lu8TNHXfciT+tZo17krAPjt/Fkn6Vhi6Zw6fnlICvD3+pofGK
+QvbjXbyCRsaLh54i6QVt7VHVHknMOBl1sFPjRd6mXavXF+FDFvDN2Nqr0LfvvHw=
+=wTuJ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openctm/files/openctm-no-strip.patch b/media-libs/openctm/files/openctm-no-strip.patch
new file mode 100644
index 000000000000..5e31d4017b68
--- /dev/null
+++ b/media-libs/openctm/files/openctm-no-strip.patch
@@ -0,0 +1,34 @@
+diff -urN OpenCTM-1.0.3.old/lib/Makefile.linux OpenCTM-1.0.3/lib/Makefile.linux
+--- OpenCTM-1.0.3.old/lib/Makefile.linux	2014-08-20 09:39:00.614744990 +0200
++++ OpenCTM-1.0.3/lib/Makefile.linux	2014-08-20 09:40:09.782667989 +0200
+@@ -72,7 +72,7 @@
+ 	$(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)

+ 

+ $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)

+-	$(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm

++	$(CC) $(LDFLAGS) -shared  -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm

+ 	ln -s $(DYNAMICLIB) $(SONAME)

+ 	ln -s $(DYNAMICLIB) $(LIBNAME)

+ 

+diff -urN OpenCTM-1.0.3.old/tools/Makefile.linux OpenCTM-1.0.3/tools/Makefile.linux
+--- OpenCTM-1.0.3.old/tools/Makefile.linux	2014-08-20 09:39:00.583745025 +0200
++++ OpenCTM-1.0.3/tools/Makefile.linux	2014-08-20 09:40:09.751668023 +0200
+@@ -52,15 +52,15 @@
+ 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
+ 
+ ctmconv: $(CTMCONVOBJS)
+-	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
++	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
+ 
+ ctmviewer: $(CTMVIEWEROBJS)
+-	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
++	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
+ 	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
+ 	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
+ 
+ ctmbench: $(CTMBENCHOBJS)
+-	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
++	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
+ 
+ %.o: %.cpp
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
diff --git a/media-libs/openctm/openctm-1.0.3.ebuild b/media-libs/openctm/openctm-1.0.3.ebuild
index 533f134db5a5..f8d4c157824b 100644
--- a/media-libs/openctm/openctm-1.0.3.ebuild
+++ b/media-libs/openctm/openctm-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/openctm-1.0.3.ebuild,v 1.4 2014/08/18 23:11:10 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/openctm-1.0.3.ebuild,v 1.5 2014/08/20 10:58:35 amynka Exp $
 
 EAPI=5
 
@@ -27,13 +27,9 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_PF}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/openctm-fix-makefiles.patch
+	epatch "${FILESDIR}"/openctm-fix-makefiles.patch \
+		"${FILESDIR}"/openctm-no-strip.patch
 	mv Makefile.linux Makefile
-
-	# do not use strip
-	sed -i -e 's:\(LDFLAGS.*\)-s :\1 :g' \
-		"${S}"/Makefile \
-		"${S}"/*/Makefile.linux || die
 }
 
 src_compile() {