Cleanup ebuild, patch makefile, QA variables

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 631fde781aa748e7cad8c33a73fb553ccf9d9cad..1ad66d4b9eb5f2aa23d28d1ba238d55133ebd56b 100644 (file)
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,6 @@
+AUX makemkv-1.6.16-makefile.linux.patch 579 RMD160 453bb183983c69e97754b8f6e57be37c98bffaa1 SHA1 d2f71b520cbe28c922c54b7bf6506f8714bc1add SHA256 3a9e523f244afb4456757f6664c63db2f106e7923a129c6b6e9a9c5f68449859
 DIST makemkv_v1.6.16_bin.tar.gz 5877692 RMD160 9b22f4d4d2aa14d8cefae5070c35fe4955aef2f9 SHA1 fa5e26439a9c0bb238ceb53a84a2900a262dcca0 SHA256 0f0b2df68b7fc294834d7cbeda21d54884caf9e13a9b0190921dae27d7418309
 DIST makemkv_v1.6.16_oss.tar.gz 438026 RMD160 0fca584fe4a574a2a6a420cb88db687a60b0358c SHA1 009e6e21e0f270255f9b1087b70f8c46c95520ed SHA256 2cff47e51f465259704b0840717433f90e938d13fd7e18a01d674174b747f85b
-EBUILD makemkv-1.6.16.ebuild 1967 RMD160 4c203ddc56d1a6dea9c02ad7a951727c05f51e09 SHA1 c4b907f1123e1ea09d24ca31d67efff202e8376e SHA256 e229f3a5a80647f3674d508bab1ece2cb7b80870ce09ef4c1461e0d4622a2990
+EBUILD makemkv-1.6.16.ebuild 2087 RMD160 7d8e47d738b7d00c4c1866a529e1adfaab0e4441 SHA1 5e6d9e16b8b6437aa558d3278f818779ff8a588b SHA256 1c70ea376ce6cdee6731018a1ab0d15cdaa0844072531cc38d91798fc4660ec0
 MISC ChangeLog 377 RMD160 1bdb848dd03518820b5242b1feaad05b9d18653e SHA1 f9d49857aa1134e08d38f144cc54238a0968171d SHA256 f05c2ed75df146c1e53c2c502b67b50c8747f6d2bf18213f9db574f6cff2b8fa
 MISC metadata.xml 224 RMD160 71a1b9f875b9de0f7a9f0dd00557874d936c5021 SHA1 2bca68cdbca3845abaaa36497a91b789eb1a89d0 SHA256 98cfdec9b1c16d801783412e122d81d3a42627c9b9595f5f8d0d8bf5ecb33e32

diff --git a/media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch
new file mode 100644 (file)
index 0000000..72faa15
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch
@@ -0,0 +1,20 @@
+--- makemkv_v1.6.16_oss/makefile.linux.orig    2011-12-02 15:26:10.997323145 -0700
++++ makemkv_v1.6.16_oss/makefile.linux 2011-12-02 16:28:26.966323351 -0700
+@@ -8,7 +8,7 @@
+ MOC=moc
+ endif
+ 
+-CXXOPTS=-Os -D_GNU_SOURCE -D_linux_
++CXXOPTS=-D_GNU_SOURCE -D_linux_
+ 
+ BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine)
+ BUILDINFO_BUILD_DATE=$(shell date)
+@@ -33,7 +33,7 @@
+       install -t $(DESTDIR)/usr/bin out/makemkv
+ 
+ out/%: out/%.full
+-      objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
++      objcopy --discard-all $< $@ 
+ 
+ out/libdriveio.so.0.full:
+       mkdir -p out

diff --git a/media-video/makemkv/makemkv-1.6.16.ebuild b/media-video/makemkv/makemkv-1.6.16.ebuild
index 5897c5f35ef71a780b4b62db23cbe52a685fc40e..65be47056f51c133961aa484e18864bfb8b006b3 100644 (file)
--- a/media-video/makemkv/makemkv-1.6.16.ebuild
+++ b/media-video/makemkv/makemkv-1.6.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.6.16.ebuild,v 1.2 2011/12/02 20:50:54 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.6.16.ebuild,v 1.3 2011/12/02 23:32:34 beandog Exp $
 
 EAPI=3
 
@@ -27,7 +27,11 @@ DEPEND="x11-libs/qt-gui:4
        x11-libs/qt-dbus:4"
 RDEPEND="${DEPEND}"
 
+QA_PRESTRIPPED="/usr/bin/makemkvcon"
+QA_EXECSTACK="usr/bin/makemkvcon"
+
 src_prepare() {
+       epatch "${FILESDIR}/${P}-makefile.linux.patch"
        cd "${MY_P}"
 }