diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2012-11-30 17:50:44 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2012-11-30 17:50:44 +0000 |
| commit | 4327958b583cfba81599d231914c153d7e486535 (patch) | |
| tree | b8be21966d19c20f3ffcdbdaf8fd52464dba8318 /www-misc/mergelog | |
| parent | Revision bump: EAPI 4, autotools-utils eclass, use default src_install, drop ... (diff) | |
| download | historical-4327958b583cfba81599d231914c153d7e486535.tar.gz historical-4327958b583cfba81599d231914c153d7e486535.tar.bz2 historical-4327958b583cfba81599d231914c153d7e486535.zip | |
Revert as-needed patch back for properly building in new revision
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Diffstat (limited to 'www-misc/mergelog')
| -rw-r--r-- | www-misc/mergelog/ChangeLog | 6 | ||||
| -rw-r--r-- | www-misc/mergelog/Manifest | 2 | ||||
| -rw-r--r-- | www-misc/mergelog/files/mergelog-4.5-asneeded.patch | 12 |
3 files changed, 18 insertions, 2 deletions
diff --git a/www-misc/mergelog/ChangeLog b/www-misc/mergelog/ChangeLog index 9b58f9661812..275522bdb416 100644 --- a/www-misc/mergelog/ChangeLog +++ b/www-misc/mergelog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-misc/mergelog # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/ChangeLog,v 1.13 2012/11/30 17:46:12 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/ChangeLog,v 1.14 2012/11/30 17:50:40 pinkbyte Exp $ + + 30 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> + files/mergelog-4.5-asneeded.patch: + Revert as-needed patch back for properly building in new revision *mergelog-4.5-r2 (30 Nov 2012) diff --git a/www-misc/mergelog/Manifest b/www-misc/mergelog/Manifest index 2eb685971b3c..88482fa6d4d6 100644 --- a/www-misc/mergelog/Manifest +++ b/www-misc/mergelog/Manifest @@ -3,5 +3,5 @@ AUX mergelog-4.5-splitlog.patch 13678 SHA256 904df097cb884fe497440dbd9a967d93349 DIST mergelog-4.5.tar.gz 39407 SHA256 fd97c5b9ae88fbbf57d3be8d81c479e0df081ed9c4a0ada48b1ab8248a82676d SHA512 f2259cb8981871c1f9d7cadc5414997789aa13eed0e18701673ffbddedc74954e137e282c1357cafaf515e18b39e256f890ec31568a305feefa1089a9347991f WHIRLPOOL 2c4382a3787c47ae5375492850fdb7cefff225537d4331fed2f97bdec76df6f324afae4888c341923709e9ea2b89199df6376ab5d738de974892dddaa722be2a EBUILD mergelog-4.5-r2.ebuild 651 SHA256 3630b56ddff97a58467538caae3290823b638452bb07104806faf02760b2c555 SHA512 97baf506aef5a056972c42544ce9f07dccd0aa89e87c1446f2c98d4294b7d6592213f8038e435327a45726ae8d41c92cab4269fc3f8c398ac40e73829d7d38f0 WHIRLPOOL 149819cb8eb4e6249c23a009ebca4d5061341abf39c1da660ec24b6171916a33b0e0b837ae2eda4202b2a4525e2ef749f05cd42979833814517dad1f25e174f0 EBUILD mergelog-4.5.ebuild 647 SHA256 cd356bcad06cb564cb65a52cd9ceeefd149fd38770ad9bcd16e71b0c6fadbcd2 SHA512 8b67357c360423d6c7b5132d315e2d45ce65cdd24a5040a3ffca3ee7bb141f6946fea9cc1e6176fc474a4924f0716dc8951d1ce576d16c95099a9e659142821f WHIRLPOOL 3f2fef0a4945ecd64bd296783299144ce7b9078da43823e4b3d0fd6faa4fe5f8966da02b73c55fd243ba6cbb282795bba0abd765c146a82fe2e1f7dbb251d37d -MISC ChangeLog 2317 SHA256 64bf3d2dd254a2a58ff683d3079997b6a9abbf8a11e1f4b004c2478765c5d76c SHA512 ae528558b135ac13ffb933da85f2136f18e88daeb9348f1a2cb50a4e1932ec6049792ff562776d6a632d31d03a780759418cd16bb082fe464e6cb61eb42ac2e4 WHIRLPOOL e2172e508e60d0673bfc3d754c60a1cee26eea0775952e17e4515f2fedd1840abd89e6adbac64ce9727255be284ef5f1e696aa1dda58d6b7b614a6f0f44831b7 +MISC ChangeLog 2473 SHA256 1e6776da2ef67c070762fab317c97460a1100e03026289f332b4739590700774 SHA512 38168573b3469426dd977b4a75836fa1712230abfab787c154b6588db1a895a426ec977f1fa3b24aba9b15aa2aa9c1580f9d40e95a649f87c25eef8ad5a285f2 WHIRLPOOL fb7b2b31e5d19c2c255e91134e7a9938ce0b5e2a39570563114054d6d440a4e00d20b52c3625e63f06666de6c2ad264945b37e1a64423db641b8100b90eed48e MISC metadata.xml 550 SHA256 5adfc349855e1e931158965803e183d6b2945c17b8c77291c17193d03e44b424 SHA512 11a20dbb5280d1c2f7ea24b19abb9a16f5331da7e103483cada9de00c06572fe7fc0e9bbd267c51914edd2d3634e0833111f45f97a0160c7e0da79638ec7898b WHIRLPOOL 78a84ba8cd0120c43c40dae9edafc580b2a98ca9cfd105cb11437a98a31d8a0f8ff139644c262c395ae4131eb9ae9f4e1c13797466675d70d6914116f462169a diff --git a/www-misc/mergelog/files/mergelog-4.5-asneeded.patch b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch index bfac735fed09..77573cc60f9e 100644 --- a/www-misc/mergelog/files/mergelog-4.5-asneeded.patch +++ b/www-misc/mergelog/files/mergelog-4.5-asneeded.patch @@ -1,3 +1,15 @@ +Index: mergelog-4.5/configure.in +=================================================================== +--- mergelog-4.5.orig/configure.in ++++ mergelog-4.5/configure.in +@@ -10,6 +10,7 @@ AC_PROG_INSTALL() + + dnl Checks for programs. + AC_PROG_CC ++AM_PROG_CC_C_O + + dnl Checks for libraries. + dnl Replace `main' with a function in -lz: Index: mergelog-4.5/src/Makefile.am =================================================================== --- mergelog-4.5.orig/src/Makefile.am |