From: Yixun Lan Date: Fri, 13 Mar 2015 02:02:42 +0000 (+0000) Subject: explicitly set PREFIX variable X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e0029d06be59fb106d1e9dac1245954eb3ee31a8;p=gentoo.git explicitly set PREFIX variable Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xAABEFD55 --- diff --git a/app-portage/deltup/ChangeLog b/app-portage/deltup/ChangeLog index 651453529085..05d311434793 100644 --- a/app-portage/deltup/ChangeLog +++ b/app-portage/deltup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/deltup # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.31 2015/03/12 23:03:03 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.32 2015/03/13 02:02:33 dlan Exp $ + + 13 Mar 2015; Yixun Lan deltup-0.4.6.ebuild, + -files/deltup-0.4.4-CFLAGS.patch, -files/deltup-0.4.6-fix-prefix.patch: + explicitly set PREFIX variable *deltup-0.4.6 (12 Mar 2015) diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest index 24f83a2e4be3..cef8fe0ccc56 100644 --- a/app-portage/deltup/Manifest +++ b/app-portage/deltup/Manifest @@ -1,31 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX deltup-0.4.4-CFLAGS.patch 914 SHA256 74934dd69f1e163430cf5d87f97fcd1f8ce0431ec4448ae68d5cedd73a58612c SHA512 0f683d4be3140ddc2d1bf61812b01682e40d5262e196135ee8fa16682c6a37724bc84411d4141a14ac5b8aa29ba5cc2e47e1d3bebed60993f0cd0482fa02c6aa WHIRLPOOL 329644fdf115bd224b9a40e0526a8b30f18e6b898b8534e38521acf7338fa09ab143892ce9ac0bce72801bdc349c017608fb2f0d3519b5e0dd621947e47e2cc9 AUX deltup-0.4.4-gcc47.patch 345 SHA256 68bbf0ec6a9c88e6fa07f477bd7183cf6adbfcb4d56a720b20de935f19337e21 SHA512 2f33117e0d2f48c2698e01a60d426d4200cab0daa9d0a725d52fef9a3e42e48c255d75e1b3871e86cf7b0b44f9d7bf19a081a4ae8ce5ce431939ddffd8ffe0c8 WHIRLPOOL 999487793eff5d6fb912aab7bfd6f0b3badb37c6ac7e6f0aa2b2e052e80c838439be331b07038e9b697fe71cd6ef99444534f7af2475b7bb083982c1034ccfd8 AUX deltup-0.4.4-zlib-1.2.5.2.patch 1063 SHA256 b423d613a677122c217103cf58aaf5abc3ea33785c956d504a5da220e48616fc SHA512 aa859d1a73ca7f15727a020026067488fda886fdcc3e3ceed0e891024367a7665435a2892582b4f6428e9cd2d102ddab472482fe53988b3b254aaf9de75cd883 WHIRLPOOL c6d578d80f60bfe8b3c037bf452e202ef782b4315347e9060c3da72888eda3bf2dfb8666e08f3f5afb224c875696bc3a9a481b79784b1d0840f985bbee3bbe55 AUX deltup-0.4.5-underlink.patch 356 SHA256 9cb681283c502fa66fcd541256b2f46af1de37799f8418511b06c04b5a880a72 SHA512 0534eb8da7b6b0fa1461a0ffbbf9172d86234bb98603e673eabc0a43f176f4160763ded466f22eb522b65e127360b8af1199d30182c519445fd4746a149d6a2f WHIRLPOOL 38261add2cf49d13f39f05a8bfed1920853a0221e9d5fafeec3c2828aa228cee2bbb853d5e45f373829e238cb7ad5ad8da56654da349e0e758656053393b9250 -AUX deltup-0.4.6-fix-prefix.patch 202 SHA256 e3b5869a1f6f6fcdf6bbb7952e46dd55bc78a344a417fb7ff4c166e7c1e642c9 SHA512 ac4a2618d877b9a08e82073961e72d985fc266101efe8b30521b83ca0ddceb43572d4f49f5f0becfd7569b007793c1c56c8b14076fd8928ad04bcb87238645e6 WHIRLPOOL 20a790d0f037e4261d39a0af9fc8331b956973d4430da5bd110eb7e6a7e98d308029d4b670628cbad1087d2bfeb999fdc278467c82d104b919d65bfd2f1b1b3a DIST deltup-0.4.5.tar.gz 14728 SHA256 9c8597780513e5231eb07b05cb1a1ee07b0fec71a4be2dd4a5cb2dd1011fc795 SHA512 fae6814f74fd62eee45701eed4df45ed5f6b6da50cff53d7a04ff3f6e11553ad526c3b3262048e210b1d932b6d30cba69ac1962b867b01aed90de58b45bf6c37 WHIRLPOOL a91994aa049ec25fc1b5d3a816595354114ef37e9655b5d91aea973fdfa187b77aa33aa620de3c38c5888bd2d9c89f376a3de8dd43104515961b3ffc128ab77e DIST deltup-0.4.6.tar.gz 14869 SHA256 f86b304dcdadc864cd347d382dc2c9c249e399f22408d6d7d68490374386c365 SHA512 196be319f31860d89654c23241edde503d4194064617970d87cb0d0a66544959bc666dd34a3bf1a42e69ddb5927420728a1e208b7bb848e935e99f3a090ffa7a WHIRLPOOL 4186c446ea3bcbd28577119e56ca2fe5ce8b479f80ebc48ca34727481385d0e854714a6aad34a466b933279e3f3709cc1b78607cc216c81acee800e480e37b26 EBUILD deltup-0.4.5-r1.ebuild 965 SHA256 2dca15c6a4af3927f9d77dd9f68dfb7cff8bc6cfadd8ec04fe9b9e76da46fa4e SHA512 5a58d7c95d0a110e5d9999b59986119481229aae5950ced0328c5b59c3eef3c47baff3f064fd2e6086e93f9de78f89af208bdecf10ca60f103308d21fa743f3b WHIRLPOOL 3b72f5ae4fd3aff0f45d35f9f862c094dca121974488b44dcf3687f093ccc2ee0fc67848885e153bce923d9593db119dbf737c96dfcad67f02eea593b0639858 -EBUILD deltup-0.4.6.ebuild 916 SHA256 fe616a02d441df65449a9918a9babbb38260949c1d76387f8a51e6efafd1e008 SHA512 2773dadce69b4b2ec86c502dd017258e6dda4250f5fbecb83042209f46a01821d8af63f1ada205f8c85eeaf98d55e72224417ae4d4b19218c508d058f5b43fe4 WHIRLPOOL edc1a45bfb0430ff4bcdb831e4a6af97433a503a9884db46df1799526d27a1cc5fc70a12b947a7c4a695e016c8b0605deb80b1a4d922549a262b32dd76786c47 -MISC ChangeLog 4850 SHA256 51aa090fb76453f74e3b2922617b036032a79e9eb8884eb5a3fc0f5a0c69b51c SHA512 676431b3a20c45f751029041b426a6c494575fb0a326279d2f965e79d6882d9f7edf6318db9cf829677a114f5c2b02683e73ddd4acc58355ef06624b1d54d474 WHIRLPOOL f6205a601f17c80530a23b8e829cb509eec4a27a9d51882b1427fe8b32bb4a27fc5298fa08c1da87f938d6371bc803f44ec080664fe5840da2f7b40295023b21 +EBUILD deltup-0.4.6.ebuild 914 SHA256 3eb4f1067dade8d513a9d301cdb00c7e3e7d85265497a64aa7858e9de482723e SHA512 3497427e236120f54b13cd94abb907f56458a4582eabf16235b37e234120569a238a4926d9523979b190522c8df5aec9b1779ea846fb1c9104debceaae455667 WHIRLPOOL 971bd3d28f27954f4a02d1449143ffa06589543625b82b58349bcdedfef0a50172ab05dc2729b9f6c9e912a2e66417363915bd57122944c393aefa879bf77112 +MISC ChangeLog 5022 SHA256 d47892f5279f0639a331b8bd49ef74cb5e565fd767fb2a11cc1fb692f3146317 SHA512 cf54613470222facba9dcac9cecb7040f0a01826e825cf9b416d3abac2f2c7254df97c9a206a4d60531b7948f64dfa130f92aff57fcaf772595c8fb3b27d2712 WHIRLPOOL 2d6541361eddfa04b2398a9456f7aa562a6f6f39d2e4cbf197d2e41af33acbe0916c77064ab5542f9d3c2879e8252c78922f8247d889d0dfa67aa2b35c9e1723 MISC metadata.xml 335 SHA256 c499c8aa8de5d9c0ac76b4a3d88f16186aa47ffecdf356c37a09070e3153b65a SHA512 54db1d8741feaed8bd638571fe913f657936fe9657cb1291fbbd9639225f176a278094f2bf6ac66eb69781818db46ad657023ebffd5cb7c0615349a7caa0af58 WHIRLPOOL 9a7c20c8fd9eda9aeb571c9d84fa454050e75a7b5e2f09faa31836b3651296d8ea9e246998dd41b96c17267a1714b839bfc2ad05438456c3da4968d5e3a3165f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVAhs+AAoJEJIMDbyqvv1V7k0P/2Cr41v+RtGN+sbAJyoPuVqo -xjQa0pFb5aDXEscj66mz8PDuHuUhN4hhb15bwDiBOZ/5nz3dDGOooNinnaKKMbFs -2doZdCq8PoKJVGTNIf3uLD0XCDjEqMDp3ULH5ZVxLks6ugSzOrpIO6bZnsGntTz9 -sjsWHxyBYYCfBxsA4ke/XGRAoMxLzY0HPHS9XZqxU4oMbPRj3/LC9NMivWDyq7Sq -asIPp3n/8uDqk/hWckcnaIMN4e6tD0qEKqXYAnCqFIK7GxCJDpdkLez6xg/d6pv+ -IjoBM9ZmQIiGeAr5wk0P9udW1rCP+ZW/So6IUrpQkhsTsr2GsC/Kq2nuSb+1nqyA -PV7Lq7Q6oG+rXaKCYlWW3pk4euyPBmCqrIcU4xzB6ElrTosmLqS3re5xeabgbSpS -N+USPmcK6RznFP2hQLm9xinLx+dQb31fVwSn+JvO12EFDK3agbqIkM8uaWjUfYkr -6WwFYaqAOaFAh3X3XJwDr2CfXum+17Lpp8j1uVqW2G/JuioaeziPobGevhMfCOWf -IFHg+3T7ortgffW4Hdzb1RLW2d6qHJdhK4Ni0eoRg5IWlHwCokzzOudCWZfn5FlV -5xhHkCDN5PgJ1+8PumVJRPyUFZRfbgvZir3SC7FLTe/Ml+gdFEt5zBk+8mP8U4RF -x6C4vvDQoDtPYOmAdHpg -=TFiP +iQIcBAEBCAAGBQJVAkVEAAoJEJIMDbyqvv1Vv5AP/1GTp1C2wAuHALWbJd8E9lAV +FAquNQiaopJYxCjMej6azmS4gK17JhpeVq6zPHQli7Rl60EjFlHizmr+vEcQFkLa +QL7UARO7EjKuUvtZcQehO3q4hLKhfBBiUs3OpcPK9gAGbi4mvKRVoFKP8E80lbrj +f0MChsW6pjB8Onav11InWd2THBSDZHWCdg90E3vnyajNY9UNFJNje+n4E4uG1NX5 +6pgI/RDF3PeN2MNBECTlNNg+QzhzJ72ogDQ3f6llWxlSdmQKXo86/HjCfWV8LjKZ +WucmeHh4VsEPQ4Hw6hNQmrrETi8IPiyN/fvWxhUq4njj0LcvjFsvZemdmwCfdoKp +VtcC9Edrp5IT4zU59JGE+acYlcG6DQOiOBUMb3khHzBWgk0I2/g4r69u1hbphtlb +2UsLb9HHFlOtByIElJtHqWgwyIYwbaYzcaIy0Mp972hjkPus5ucGhDQk4CLJpUkZ +2VLK34ohnM8Gf1Alebcis2ysQLJ99RM7F4HkjjL/Em/+GVVWo2IL6edkZkhY+jzZ +kis0dN9L3kw0Bnw0GZ78Esh/tziO7ZbMwq3XK+h4jpXOGRvMpao/bEIpRNmFy6Xh +9tbqcVaENe+M3ee9UKQQOpPc1fnsMrgnb0uda1d1YIEsqkIZCNG8RF1CjkXu+a6s +0+XNegINyChmfsF73hau +=gqDh -----END PGP SIGNATURE----- diff --git a/app-portage/deltup/deltup-0.4.6.ebuild b/app-portage/deltup/deltup-0.4.6.ebuild index fd8b3706ddf9..8aaa6f9cc133 100644 --- a/app-portage/deltup/deltup-0.4.6.ebuild +++ b/app-portage/deltup/deltup-0.4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/deltup-0.4.6.ebuild,v 1.1 2015/03/12 23:03:03 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/deltup-0.4.6.ebuild,v 1.2 2015/03/13 02:02:33 dlan Exp $ EAPI=5 @@ -25,7 +25,7 @@ RDEPEND="${DEPEND} || ( dev-util/bdelta =dev-util/xdelta-1* )" src_prepare () { - epatch "${FILESDIR}"/${P}-fix-prefix.patch + default epatch_user } @@ -34,7 +34,7 @@ src_compile () { } src_install () { - default + emake DESTDIR="${D}" PREFIX=/usr install dodoc "${S}"/../{README,ChangeLog} doman "${S}"/../deltup.1 } diff --git a/app-portage/deltup/files/deltup-0.4.4-CFLAGS.patch b/app-portage/deltup/files/deltup-0.4.4-CFLAGS.patch deleted file mode 100644 index 31d14d6df7db..000000000000 --- a/app-portage/deltup/files/deltup-0.4.4-CFLAGS.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -NrU5 deltup-0.4.4.original/Makefile deltup-0.4.4/Makefile ---- deltup-0.4.4.original/Makefile 2009-08-02 13:41:03.000000000 -0600 -+++ deltup-0.4.4/Makefile 2009-08-02 15:29:10.000000000 -0600 -@@ -1,26 +1,26 @@ - DESTDIR= - PREFIX=/usr - BINDIR=$(PREFIX)/bin - --CC = g++ -+CXX = g++ - - objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o - libs=-lstdc++ -lz -lbz2 -lssl - - #edelta: edelta.cpp deltup - # gcc edelta.cpp ${CXXFLAGS} -o edelta - %.o : %.cpp -- ${CC} -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE -+ $(CXX) $(CFLAGS) $(LDFLAGS) -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE - - all: deltup - - depend: -- gcc -MM *.cpp > .depend -+ $(CXX) -MM *.cpp > .depend - - deltup: $(objfiles) -- ${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs) -+ $(CXX) $(objfiles) $(CFLAGS) $(LDFLAGS) -o deltup $(libs) - - install: deltup - mkdir -p $(DESTDIR)$(BINDIR) - install -m 755 deltup $(DESTDIR)$(BINDIR) - diff --git a/app-portage/deltup/files/deltup-0.4.6-fix-prefix.patch b/app-portage/deltup/files/deltup-0.4.6-fix-prefix.patch deleted file mode 100644 index 7104b834e006..000000000000 --- a/app-portage/deltup/files/deltup-0.4.6-fix-prefix.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- src/Makefile 2014-08-12 21:27:16.000000000 +0430 -+++ src/Makefile.new 2015-03-12 13:31:03.119500449 +0330 -@@ -1,5 +1,5 @@ - DESTDIR= --PREFIX=%%PREFIX%% -+PREFIX=/usr - BINDIR=$(PREFIX)/bin - - CC = g++