If building with USE=nocxx, neuter lzma-utils to only provide decompressor #220899 by Ulrich Müller.

Package-Manager: portage-2.2_pre5

4 files changed, 53 insertions, 10 deletions

diff --git a/app-arch/lzma-utils/ChangeLog b/app-arch/lzma-utils/ChangeLog
index 1e98b8fd7932..96e89b63dc80 100644
--- a/app-arch/lzma-utils/ChangeLog
+++ b/app-arch/lzma-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/lzma-utils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/ChangeLog,v 1.31 2008/04/03 18:19:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/ChangeLog,v 1.32 2008/05/10 08:35:08 vapier Exp $
+
+  10 May 2008; Mike Frysinger <vapier@gentoo.org> +files/lzma-nocxx.sh,
+  lzma-utils-4.32.5.ebuild:
+  If building with USE=nocxx, neuter lzma-utils to only provide decompressor
+  #220899 by Ulrich Müller.
 
   03 Apr 2008; Raúl Porcel <armin76@gentoo.org> lzma-utils-4.32.5.ebuild:
   Add ~sparc-fbsd
diff --git a/app-arch/lzma-utils/Manifest b/app-arch/lzma-utils/Manifest
index a3318be5ba55..099afbbf33a8 100644
--- a/app-arch/lzma-utils/Manifest
+++ b/app-arch/lzma-utils/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX lzma-nocxx.sh 205 RMD160 f5078c11d2460c5515a955cc6c7ef46bc6bc32e9 SHA1 945f1821e32fc341226a2b8439618cc294f2820b SHA256 27679e21f407a92ef06433df3b416b7b0d4cac4e1b36f8da4dea5547029b3252
 DIST lzma-4.32.5.tar.gz 472975 RMD160 af7e8badb6468c338ad1cc69e00564257668a237 SHA1 5b8b5e399c1b2bbb89bc455b860d5c2cfb87ab31 SHA256 908933eeaba8975bbee22645df019c8cc3920615d9bf618d9ff819e2e30a1ed7
-EBUILD lzma-utils-4.32.5.ebuild 645 RMD160 3e8f120d5d30993e7a798ab31d64468e49e8bd7a SHA1 124093e30d682731c83c8ce8f9ff09e6e92ad3eb SHA256 53f397648c074fe9f9a6d043d917db1dd31ae023f1d645fd1d358d5f63204cbb
-MISC ChangeLog 3760 RMD160 972ee0cc4925da42561ab108d85d9e52531d76e5 SHA1 aa80b4080462bda39e86d152da13878e034d0f2f SHA256 bfe6ccc99b8077b5aa425360db26286187a17c9eba3229bf0695d1c61b46ac2d
+DIST lzma-utils-4.32.5-nocxx.patch.bz2 9853 RMD160 fc5adcd187f567b47b60485e65c7f0532d07d2bf SHA1 a5d84a7a0932965841a00d7282fc49b7f3978beb SHA256 3c80278f9903374c69b51bca44a7967a21bb553bf9f02aa27cf289ea0165720b
+EBUILD lzma-utils-4.32.5.ebuild 1183 RMD160 a0f1e8b0794e944bb0d0a46d374d6c880671bd28 SHA1 665fbf34c7d871a81ca175e1522d20fb062b0121 SHA256 62eac6c8e4cb094fcf9bd170942734d5a89fb9f3cc7597757b8cc037304a1471
+MISC ChangeLog 3966 RMD160 f92333d1898e1adfc78acdef5bf25dc35292812c SHA1 edd0cb503b649a12c851549511c958f4e9cefbd2 SHA256 df23bf95682b960d3a44e7c76e7a3118376a9b03a47c3a8374cec611669b974e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIHoqwj9hvisErhMIRAvLVAKDRuHBUse5xiLGCis5kIg2otWmTFQCgnSM6
-d/ZC9an9106Z5B/x5qjks+o=
-=SlGy
+iD8DBQFIJV5Cj9hvisErhMIRAgMHAJ4yIou8RbZ5dOHmb2krz6r2p1y31wCeIJRh
+lfwJWcyZu45lM3XkK3GYEGM=
+=G/Ar
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lzma-utils/files/lzma-nocxx.sh b/app-arch/lzma-utils/files/lzma-nocxx.sh
new file mode 100755
index 000000000000..cc81029b4d61
--- /dev/null
+++ b/app-arch/lzma-utils/files/lzma-nocxx.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "$1" = "-dc" ] ; then
+	shift
+	cat "$@" | lzmadec
+else
+	(
+	echo "You've built lzma-utils without C++ support."
+	echo "If you want lzma support, rebuild with C++ support."
+	) 1>&2
+	exit 1
+fi
diff --git a/app-arch/lzma-utils/lzma-utils-4.32.5.ebuild b/app-arch/lzma-utils/lzma-utils-4.32.5.ebuild
index a6701d0e78c2..40a606aa9d36 100644
--- a/app-arch/lzma-utils/lzma-utils-4.32.5.ebuild
+++ b/app-arch/lzma-utils/lzma-utils-4.32.5.ebuild
@@ -1,21 +1,45 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/lzma-utils-4.32.5.ebuild,v 1.8 2008/04/03 18:19:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/lzma-utils-4.32.5.ebuild,v 1.9 2008/05/10 08:35:08 vapier Exp $
 
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+inherit eutils
+
+MY_P="lzma-${PV/_}"
 DESCRIPTION="LZMA interface made easy"
 HOMEPAGE="http://tukaani.org/lzma/"
-SRC_URI="http://tukaani.org/lzma/lzma-${PV/_}.tar.gz"
+SRC_URI="http://tukaani.org/lzma/${MY_P}.tar.gz
+	nocxx? ( mirror://gentoo/${P}-nocxx.patch.bz2 )"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE=""
+IUSE="nocxx"
 
 RDEPEND="!app-arch/lzma"
 
-S=${WORKDIR}/lzma-${PV/_}
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if use nocxx ; then
+		epatch "${WORKDIR}"/${P}-nocxx.patch
+		epunt_cxx
+	fi
+}
 
 src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS
+	use nocxx && newbin "${FILESDIR}"/lzma-nocxx.sh lzma
+}
+
+pkg_postinst() {
+	if use nocxx ; then
+		ewarn "You have a neutered lzma package install due to USE=nocxx."
+		ewarn "You will only be able to unpack lzma archives."
+	fi
 }