From f694d5f5e1df71f458104dda413d85b949c4e417 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sun, 23 Oct 2011 11:49:12 +0000 Subject: [PATCH] Bump eapi, punt static libs and libtool archives. Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64 --- media-libs/smpeg/ChangeLog | 5 ++++- media-libs/smpeg/Manifest | 24 +++++++++++++++++++-- media-libs/smpeg/smpeg-0.4.4-r9.ebuild | 29 +++++++++++++------------- media-libs/vips/Manifest | 24 +++++++-------------- 4 files changed, 47 insertions(+), 35 deletions(-) diff --git a/media-libs/smpeg/ChangeLog b/media-libs/smpeg/ChangeLog index 7f8f37c666ee..7fb2e003df74 100644 --- a/media-libs/smpeg/ChangeLog +++ b/media-libs/smpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/smpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.57 2011/02/06 12:11:58 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.58 2011/10/23 11:49:12 scarabeus Exp $ + + 23 Oct 2011; Tomáš Chvátal smpeg-0.4.4-r9.ebuild: + Bump eapi, punt static libs and libtool archives. 06 Feb 2011; Mart Raudsepp smpeg-0.4.4-r9.ebuild: Drop to ~mips diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest index a3f3c8c625a4..483e8e631278 100644 --- a/media-libs/smpeg/Manifest +++ b/media-libs/smpeg/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX smpeg-0.4.4-PIC.patch 9472 RMD160 c0ee00ca02c1ed2f5ce1890065864175f6cb8eb1 SHA1 ca210893cfd50554730918e572dc6d48192aa3f4 SHA256 a9fd3b892e06a00e31fedf719df0ff2bccac0542da9d1008d90712086ccc310f AUX smpeg-0.4.4-automake.patch 320 RMD160 702a601b3dfc925b29d5c11926af56d6c9fa2578 SHA1 1c97efec70a88db7fe5498eab1f408fe203a758c SHA256 2d6d8fbc92e9f040d56ae597282385b5bd68d308931228dfe3a1a453b6c18eda AUX smpeg-0.4.4-config.patch 472 RMD160 4f4d726cfb127b5fa1de977f205e20ed14ef5947 SHA1 88a099bfa49f65e4c0006d7c8e2acfeb16f414f8 SHA256 e64c070d1e69900c76515bd79130473847a407bab14990862aeb2b84ac58848a @@ -10,6 +13,23 @@ AUX smpeg-0.4.4-missing-init.patch 266 RMD160 1f53a986425b9b5aeaf1cd8e6e5e5d273e AUX smpeg-0.4.4-mmx.patch 352 RMD160 b0be5ec35a0b3bfce513285bc346b70b1989e4a8 SHA1 23c5a0cb58952998fc8507406459703de742aac2 SHA256 2dbcce8253b16b8882e491787d28a3410eb8e0ec29a300fed258bd899ac24248 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 RMD160 fbef70da1b1a9f5d482c9506286c9f8e7ce764d8 SHA1 d899fc56c4f67459e8bb01a8313955804b821b45 SHA256 85c1c2126bd0e405092f3f08caace3503997fd0447989fdd175c7f39c3f6091b DIST smpeg-0.4.4.tar.gz 315054 RMD160 d55249ad53417fa0df3d925aed0e83d2204e28b7 SHA1 6d7f4449472e6270ab435b2224f3fad951c35259 SHA256 1efa7984d0aada0c2954cd0aaef357e9d7871dadd3368dbe742ab5f260523e57 -EBUILD smpeg-0.4.4-r9.ebuild 1735 RMD160 7f86ec3a2bb5eb2008d3584da0e3173fae8844fa SHA1 580cb3717d963c4970d5976ae1392b6994390e80 SHA256 192bbe5de241382fa29efce90436cff008613fc02aecb162d8fea0a304dd776e -MISC ChangeLog 7782 RMD160 a8d4b7eddfff7aa1d48f5016fc5fa5d9b73a0cac SHA1 f8adb98a8349629aa1af984c21b9d86d6e8b1920 SHA256 0222b5f7017ebb7c8f2f803c826c101863dfda9656316499c5c4eb6e04c9e6ca +EBUILD smpeg-0.4.4-r9.ebuild 1771 RMD160 c00d6cfed035a12ca233d31755204ffcd8a1333c SHA1 c62c865cf56741104ab339c7891194fcded5b258 SHA256 fea309421253afb91bfd8a01a08c23540c9bf91d91ccb64acedc55668ee2d9e3 +MISC ChangeLog 7918 RMD160 dc352e22c54477eaddbadeafa0a9deb90f6d8691 SHA1 d190a21ede08a698440a1bb5b8fa663b959501da SHA256 3abd449268697ae3b22a0f206f1d1ca27e9d28652bd25bf7f618cdbf0aef7a22 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQIcBAEBAgAGBQJOo/7pAAoJEOSiRoyO7jvoEKsP/2w4QmmAaFAULOsstdDfgpo6 +yy9j3JpelQTTuWKwfOND+mZk2VP5NyhKdinWKiLmciqV2UDTdTA73UuCB3c0mbn0 +62A+17W8fE+aELAGgs/iqxYMN1TOGQbYFuwMLQyr43bEniwA5uq9kSBcRyHiTuyR +TnMW7fWbParu/oXnhWFXnfNFVb5CXqdi7hC3hTv1K4ZAHRt4Hl2rqdMyNFmvcqlY +lEbdbkJ6E7npIM9dPQ8CPqGUbWW/g864HtPR70e3R6l4zU2In/a34jBF7noqZUZy +zKQRM2fBTZPkbMttW5yYfYYoVwN5XHikECOaci77ghjNNe+l8Z5nPcUi7u6g47iP +ONTHWnrSK/DcwwqZJseiVQavbt9jvvVRfaASpYuH+2rwF+558b0nihDNUCEJ8OYB +jv/5NcRXfuaA6kdnZQo6gRxu1BeukdR3nyAVFrl3t4Sd70e5uRcALkjjBTKsLCDk +AwPGUCn7cuTbHxr+Hdbhmf3jgi4T5ECTij2uL2S8+A2sb+rCtlGFLQf0kULa4sDR +4Wu0MC4ILS3OpnlwbyF7FfSbOcjSYPDdo0DJ4l8HLD5zwL+vaXj6rvpoydJi+9pl +FRQA1HMH6mZIBqqIrivrJ/t8isKBbKbWl/PbJ7acBP6yPodlTqLnVLqxBb9QB0uP +WNyRiVFSjqNZI1UdvUTe +=Dp2E +-----END PGP SIGNATURE----- diff --git a/media-libs/smpeg/smpeg-0.4.4-r9.ebuild b/media-libs/smpeg/smpeg-0.4.4-r9.ebuild index 8cdfb5f86214..4fcd8bd7b87a 100644 --- a/media-libs/smpeg/smpeg-0.4.4-r9.ebuild +++ b/media-libs/smpeg/smpeg-0.4.4-r9.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r9.ebuild,v 1.12 2011/02/06 12:11:58 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r9.ebuild,v 1.13 2011/10/23 11:49:12 scarabeus Exp $ + +EAPI=4 inherit eutils toolchain-funcs autotools @@ -12,21 +14,20 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz LICENSE="LGPL-2" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="X debug mmx opengl" +IUSE="X debug mmx opengl static-libs" DEPEND=">=media-libs/libsdl-1.2.0 - opengl? ( - virtual/opengl - virtual/glu ) + opengl? ( virtual/opengl ) X? ( x11-libs/libXext x11-libs/libXi x11-libs/libX11 )" +RDEPEND="${DEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" +DOCS=( CHANGES README README.SDL_mixer TODO ) + +src_prepare() { epatch "${FILESDIR}"/${P}-m4.patch \ "${FILESDIR}"/${P}-gnu-stack.patch \ "${FILESDIR}"/${P}-config.patch \ @@ -46,7 +47,7 @@ src_unpack() { AT_M4DIR="${S}/m4" eautoreconf } -src_compile() { +src_configure() { tc-export CC CXX RANLIB AR # the debug option is bogus ... all it does is add extra @@ -54,16 +55,14 @@ src_compile() { econf \ --enable-debug \ --disable-gtk-player \ + $(use_enable static-libs static) \ $(use_enable debug assertions) \ $(use_with X x) \ $(use_enable opengl opengl-player) \ - $(use_enable mmx) \ - || die - - emake || die "emake failed" + $(use_enable mmx) } src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc CHANGES README* TODO + default + use static-libs || find "${ED}" -name '*.la' -exec rm -f {} + } diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest index acb485441832..ba7a66e5cb12 100644 --- a/media-libs/vips/Manifest +++ b/media-libs/vips/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX vips-7.20.7-build.patch 1530 RMD160 ee1fee0007f55afc35bc68b2639677da0e985f76 SHA1 47eef2a75b34b53148bc7baa65efe8663e4bde4c SHA256 5e33c1c5f2419e2436fac28af98fcf28a38c411efaa43908609c81cac187dbae DIST vips-7.22.4.tar.gz 3226315 RMD160 9f31c01a6a757b51aff5e5bc05d2102f83fc2afd SHA1 77fb29e97b31b45ae62e163f379e5bd7397e703f SHA256 b46e261208d83fc79ca3a3c87c54ccac432d1d2117c3f789715491e35bb9a514 @@ -11,23 +11,13 @@ EBUILD vips-7.22.4.ebuild 1883 RMD160 253659658b5db687441894cf5fb12a985b25a095 S EBUILD vips-7.22.5.ebuild 1883 RMD160 59d8a65b23024a105c6770210b50931f03d7f176 SHA1 50f6baaa431498afa7e6d6e6204a9af74a07eea5 SHA256 cde1e94fa132c8cbe7714ce1fd4b17377371d748f4db53eb6306702ccd83cc92 EBUILD vips-7.24.7.ebuild 1985 RMD160 df7edbbd8163b518b8856786d69019c782d2b0b5 SHA1 5a61260248402663a67cf5ab3089cf4f2e8f520c SHA256 c600eed4d70b482467b906b0ef85ec6acbf4af5f908a8b6805ba10502cbf8afe EBUILD vips-7.26.2.ebuild 2063 RMD160 09926089b3dece97fa2fc9fd3c886294bc9b3e22 SHA1 9d86f4eb1aab32a154d62b734da9df1fd534ab92 SHA256 64ebd24142809732db5a9943eebef99c1ecebb79aed4f7952ea5904aaa15e3ec -EBUILD vips-7.26.3.ebuild 2067 RMD160 c744635475c5ef1c138fdf68f209a205ce6030bb SHA1 f55dae6b2cc868f18489a1a49629386db7152d49 SHA256 5e1b115a773468a7b438aea673a19bd7530b39dc00fe857e96c696957d029c0f -MISC ChangeLog 6560 RMD160 0206c606ba35eedb3543740106e439f4a23de03d SHA1 c5abcf5040d0bec0f45fb63bffe68d83db80bc34 SHA256 83f5e71fd14a2761cff1a1501b440ef96223db34c8ece16926b8d1c6626efce8 +EBUILD vips-7.26.3.ebuild 2064 RMD160 a1681860917200df9cb8ec1ac5d910b9687a3275 SHA1 37130477cf679c4a07e7a0555f09c704b990b830 SHA256 08a1839483fd0a1d8ca7cf7be1a68cbac64d1ed4d487e96a48971dfdf64a3a52 +MISC ChangeLog 6653 RMD160 b2da4c5661633fd31eb1f63bf1b3683d6b8b7ede SHA1 3aa1e356982b138b98fdc074ed9564f63a1681e9 SHA256 184572f97ad41d0047e5b40214cebf9674fdff4cb06d2bc4fa5c6068ca666c7f MISC metadata.xml 450 RMD160 6fccc503a4c8d2f4abcc38b61616dd565f10f832 SHA1 0f0d94707a55078717314b385d54aac238df65bf SHA256 c0d43d98cfd1cf3670bca6e24fffd72ebf99445c73a136af920b362c80e20ae4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOmeIqAAoJEPqDWhW0r/LCNT0P/RkTElLehylgPaofnu/Wa0Dm -XL+SZ04rrkaCcbfhATm40Uk+z9EN9TbiNxhwqp1fmCAP8CdHaxMYgoEWBgLk0fAl -rjc+BW3TCDLhk80wk0TYixyzAYDjgzl3/P3UWLBXSNL7NPSV4jStgAJIOp1Z0Va8 -B1bjNY8NDT0DnDJ7aBl++YJdVR5NYbydkr4uJzZsy2IDUV7YOzq+6WzLQuiqhVOU -K9rOmVCpRs/56hTsm+FRDl1V+lrslrJUaauKy6xcLOQpZexesSbtHoh934yW1McC -wfEdi/ALOZa2ueqcp+cupw4N0GAm2pk14mKX+aYSmZlv/+SyGOu9YUmvPshskCRH -dS9Fyw+1gWoW7fWyPopCoLnfkUedWzmUvSUxtaqjgEv0r+kgRsVzXk4MXy8xrZUB -L+6fwaxOEsMhRb+edPs2KwYqe1W8SvoW0omqzjcdNQ65i9MGgtPX5CcKhT3fdk18 -i+icTVAkc/b9bjytJY+p5kjUhCOKDTLeDv+8oYtK9ECnFDjnRw3CF6cJYCu6WXTR -4qXxXpfEXM++XzNnolMinrwxE4laPTTEWnh/k6iTWRW9laEuNEV6M9pwI+1tKR70 -dcMVeXz749fJV21LASIoyA1zPq3qe/VoSAW9uKNufdwqgw9ZKlo+moc3QAZIlDgd -mFVF1UOu9PccPwUsw0YV -=GKWM +iEYEARECAAYFAk6j/4cACgkQkKaRLQcq0GIckwCfflaiVEGNiP1KhzrUT9JH/8Gn +zSMAniJ58OLGxcpWoMM1JCLbWY1fIv+f +=t25W -----END PGP SIGNATURE----- -- 2.26.2