From: Ryan Hill Date: Sat, 7 Apr 2007 05:29:10 +0000 (+0000) Subject: De-crapify: X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c7f15cbba956d61c04df8d9aa855032526059df8;p=gentoo.git De-crapify: - move wxGTK from RDEPEND to DEPEND - don't use hardcoded wx-config - don't prestrip binaries Package-Manager: portage-2.1.2.3 --- diff --git a/app-crypt/wxchecksums/ChangeLog b/app-crypt/wxchecksums/ChangeLog index 9f0f64affb29..e7b292cecab1 100644 --- a/app-crypt/wxchecksums/ChangeLog +++ b/app-crypt/wxchecksums/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-crypt/wxchecksums # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/wxchecksums/ChangeLog,v 1.14 2007/01/03 03:10:34 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/wxchecksums/ChangeLog,v 1.15 2007/04/07 05:29:10 dirtyepic Exp $ + + 07 Apr 2007; Ryan Hill wxchecksums-1.2.2.ebuild: + De-crapify: + - move wxGTK from RDEPEND to DEPEND + - don't use hardcoded wx-config + - don't prestrip binaries 03 Jan 2007; Steve Dibb wxchecksums-1.2.2.ebuild: amd64 stable, bug 149964 diff --git a/app-crypt/wxchecksums/Manifest b/app-crypt/wxchecksums/Manifest index c70ada341bdf..1ab1d61a4661 100644 --- a/app-crypt/wxchecksums/Manifest +++ b/app-crypt/wxchecksums/Manifest @@ -11,14 +11,14 @@ MD5 df77eb16ff7069a9fa2e16b4d0c227a4 files/wxchecksums-gcc4.patch 313 RMD160 eca86ae3c76325086f2474bc175ac5a074255f1b files/wxchecksums-gcc4.patch 313 SHA256 1e76ae875ca6c2bbd03baf1fe2ba7713a8c7b77f52889f180ba762eabf207d3b files/wxchecksums-gcc4.patch 313 DIST wxChecksums-1.2.2-src.tar.bz2 718525 RMD160 e2f6c3323b1507c21cb14e3fd52283f78c4bca17 SHA1 030edf37b3aa74e50783fe85a8cff3546b89298b SHA256 92c3faa7594c6b8b89205b03f471e57e6e6a16914e326e17d4f4a5a28a61c289 -EBUILD wxchecksums-1.2.2.ebuild 1309 RMD160 407c71c82bbe629b4496f139dc01781c3ae310c5 SHA1 025deca07e7aaa3ce6dd8e74b887cc151ae3b8c4 SHA256 e9c8f5be5738da1a99e0fceb14bd1befaab3bdc56d7edf3ddf9c8ef1fe4a7e99 -MD5 48e2db665d29bf8eabfb1cb17216e4e9 wxchecksums-1.2.2.ebuild 1309 -RMD160 407c71c82bbe629b4496f139dc01781c3ae310c5 wxchecksums-1.2.2.ebuild 1309 -SHA256 e9c8f5be5738da1a99e0fceb14bd1befaab3bdc56d7edf3ddf9c8ef1fe4a7e99 wxchecksums-1.2.2.ebuild 1309 -MISC ChangeLog 2055 RMD160 0f5d1a2d2abd2fc441f25f40f7673854ff518f8c SHA1 d1668fb083758c738a271826c0e4a487fb2519fd SHA256 001e6b6bfcdba1d641bb6f60eafb87ff8c5b5fe38f68080fad836e2c9b97152b -MD5 dcaf4cdf2ddd57b83b601b34152a169c ChangeLog 2055 -RMD160 0f5d1a2d2abd2fc441f25f40f7673854ff518f8c ChangeLog 2055 -SHA256 001e6b6bfcdba1d641bb6f60eafb87ff8c5b5fe38f68080fad836e2c9b97152b ChangeLog 2055 +EBUILD wxchecksums-1.2.2.ebuild 1290 RMD160 fde05afdcd7722e6ead618e603711a687f3ab2e3 SHA1 a2c744749913664b051f5e658a398ffe70a9dfce SHA256 b94b29cf8873d8e08ab4be98eb6169fc70c7b19982236ab7383c19cbef96b678 +MD5 948db24c2152a6fb6c8059ec86ddd22a wxchecksums-1.2.2.ebuild 1290 +RMD160 fde05afdcd7722e6ead618e603711a687f3ab2e3 wxchecksums-1.2.2.ebuild 1290 +SHA256 b94b29cf8873d8e08ab4be98eb6169fc70c7b19982236ab7383c19cbef96b678 wxchecksums-1.2.2.ebuild 1290 +MISC ChangeLog 2246 RMD160 c39030c29be22ca5a995c804612dd5e29e8c918b SHA1 2fd865040b636750ec0791f74caea6f0d3e1c14a SHA256 71ab21580241ebb9bc1a3fca1e21bda9c599d944d147d0f0c12ae02b472a1cf3 +MD5 a3af01a14ad461373449ffa5878f7554 ChangeLog 2246 +RMD160 c39030c29be22ca5a995c804612dd5e29e8c918b ChangeLog 2246 +SHA256 71ab21580241ebb9bc1a3fca1e21bda9c599d944d147d0f0c12ae02b472a1cf3 ChangeLog 2246 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162 diff --git a/app-crypt/wxchecksums/wxchecksums-1.2.2.ebuild b/app-crypt/wxchecksums/wxchecksums-1.2.2.ebuild index 235ab41f51e5..f9f8efcc34ad 100644 --- a/app-crypt/wxchecksums/wxchecksums-1.2.2.ebuild +++ b/app-crypt/wxchecksums/wxchecksums-1.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/wxchecksums/wxchecksums-1.2.2.ebuild,v 1.5 2007/01/03 03:10:34 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/wxchecksums/wxchecksums-1.2.2.ebuild,v 1.6 2007/04/07 05:29:10 dirtyepic Exp $ inherit eutils wxwidgets @@ -15,18 +15,20 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="doc" -RDEPEND=">=x11-libs/wxGTK-2.6.1" -DEPEND="${RDEPEND}" +DEPEND="=x11-libs/wxGTK-2.6*" S="${WORKDIR}/${MY_P}/src" src_unpack() { - unpack "${A}" + unpack ${A} cd "${S}" - # Modify CXXFLAGS + export WX_GTK_VER="2.6" + need-wxwidgets unicode + sed -i \ -e "s:-O2:${CXXFLAGS}:" \ - -e "s:wx-config:wx-config-2.6:" \ + -e "s:wx-config:${WX_CONFIG}:g" \ + -e "s:\$(INSTALL) -s:\$(INSTALL):" \ makefile || die "sed makefile failed" epatch "${FILESDIR}/${PN}-gcc4.patch" @@ -34,11 +36,6 @@ src_unpack() { epatch "${FILESDIR}/${P}-wxdebug_build.patch" } -pkg_setup() { - export WX_GTK_VER="2.6" - need-wxwidgets unicode -} - src_compile() { emake || die "emake failed" }