diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2015-02-05 10:28:42 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2015-02-05 10:28:42 +0000 |
| commit | 7a1e299460e31ea9d977f97f1b7e693370969e97 (patch) | |
| tree | 85c71659d1a85318912ea3e347cb19000a12ae66 /app-admin/xstow | |
| parent | dev-vcs/git-cola: Version BUmp (diff) | |
| download | historical-7a1e299460e31ea9d977f97f1b7e693370969e97.tar.gz historical-7a1e299460e31ea9d977f97f1b7e693370969e97.tar.bz2 historical-7a1e299460e31ea9d977f97f1b7e693370969e97.zip | |
Fix linker calls (bug #538702 by Toralf Förster).
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'app-admin/xstow')
| -rw-r--r-- | app-admin/xstow/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/xstow/Manifest | 12 | ||||
| -rw-r--r-- | app-admin/xstow/files/xstow-1.0.1-ncurses.patch | 29 | ||||
| -rw-r--r-- | app-admin/xstow/xstow-1.0.1.ebuild | 5 |
4 files changed, 42 insertions, 10 deletions
diff --git a/app-admin/xstow/ChangeLog b/app-admin/xstow/ChangeLog index 69423b246dc3..0ed2f827308b 100644 --- a/app-admin/xstow/ChangeLog +++ b/app-admin/xstow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/xstow # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/ChangeLog,v 1.19 2015/01/26 18:20:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/ChangeLog,v 1.20 2015/02/05 10:28:40 jer Exp $ + + 05 Feb 2015; Jeroen Roovers <jer@gentoo.org> xstow-1.0.1.ebuild, + files/xstow-1.0.1-ncurses.patch: + Fix linker calls (bug #538702 by Toralf Förster). 26 Jan 2015; Jeroen Roovers <jer@gentoo.org> xstow-1.0.1.ebuild, +files/xstow-1.0.1-ncurses.patch: diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest index d57392d1cb92..32d24f282977 100644 --- a/app-admin/xstow/Manifest +++ b/app-admin/xstow/Manifest @@ -3,20 +3,20 @@ Hash: SHA256 AUX 99xstow 65 SHA256 68103af0c35467cf1a726d7a7ac7815d1e4f7ed5c62058d87904829b2081bd76 SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476 WHIRLPOOL 1eed3b955957af4e32417cb25919f17580ddbd10a2908bd3c8bf9f1ada619043ffda23fa5b71a64ff3287c01585103abe8a1ca79aef6d13534dea1a494dd15d3 AUX xstow-0.5.1-gcc43.patch 2015 SHA256 08d00d639f79bdfd4f4c81bea467f98bd6617ca6a47e5cee6ce2e91d1187e293 SHA512 3fba80df10f6627af74ef0c08f2ea3ba1fd76e04d8263bc4ed5735af57c7bb2e67eb4ed52cb40792932e9b317110c142bea29e060a9bf01d12aaf46f23cd5138 WHIRLPOOL 4de5054f363c39320e2a788900682c6ac0aaca07b0246381743264c0addc4302715462fd1557bcf11fb4f95ec6c2d6bedf82f0e42368bf18b488329fb2cd4c88 -AUX xstow-1.0.1-ncurses.patch 431 SHA256 dbe3916bbdcfda0ee208f3ad6d9ebdb3f7238e7bbd35eb369a8f5dc5f37d82aa SHA512 9c58a9e14df1eceeef22c35c2302fd39d99cf59d37e449447b5c476bd3412e386c6cb77f43229873b94c8fc0c0b500eefcffc6bb99c784d5b3a44f03ebe7f928 WHIRLPOOL 3755168ea9f0c114ce3e5aeb9cbfa23c488f1be263ad5c6504c71b33f4bd6029344543e9e872a6b33f0f1e13c52d0e0df704cda41d9c2f9cedb9891d0c34f16f +AUX xstow-1.0.1-ncurses.patch 1070 SHA256 823c85526d502c6cd5921b990f85110b7b6c67cee189b0e0895eeeec14f34bc0 SHA512 63fce626ad5b376a5aa2d335fdd4d73ce3a1b7fccc5a6ff5ab92182d6f3ca40417926b9d35f3447ed73f386d3022d6dc81ec39a2f790fea46b681d344fdad389 WHIRLPOOL d7e7a03840dc94da9244b009b2b68c444532ef24ccff75cafd669bfe4ecb3178bcfee943dcc998f29d97ad70cdf93f313dab1fb0161c01d349efe02f598e4307 DIST xstow-0.5.1.tar.gz 138091 SHA256 7543a46dd61a352647c74d60080d8a2c50db0c0b178316b6a367d7e60e2b38cf SHA512 edff535844066b0eb464a81e103d1717ca9c3fca8faaf7f92da607f4879cd0ef0fc7191b35ceb22f21c8e7747efede56a363f04a684e3aee66578c82227ff75c WHIRLPOOL 945eb5dba1cef0d25a036bc873b618dd87bb16f699774581bc26c0c91675e7a685ca613ff4226ec6c931860cdd0c81dc519a614495a3bcf17eb49dbb77120b8c DIST xstow-1.0.0.tar.bz2 153206 SHA256 0109f10fb25a474803ec357a38c17d806dd9a21eac39b21d79b48c2af571c0fe SHA512 1bc4d6d1c5bcc68c07ac9386c964878591e63e452f46ca974460005df385647937d689ce00221d81de54983036660107b36fce174ff4859bb597f32b60b02a6e WHIRLPOOL f5b0490deaf4be76109e81c55ac8f5588648c0bf5310b578211e402ec207617253cabeb7bf86279bb5df462be5d1b4be8df8ea093a73288d0dac9962bc75848c DIST xstow-1.0.1.tar.bz2 153530 SHA256 b25279134689519c15fa5caea3d437c0e8c49d9cfa0c91cc45fb842025b1bf35 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b WHIRLPOOL 052f3ed2ddf3b6612d898a596aec4547578253aca1e1fa2dc7b3209646c029d59b589ede80ad40586b5c926e6e7826591f98d0137feddfcd4aa5fea66218a23a EBUILD xstow-0.5.1.ebuild 862 SHA256 c11bed8a5112be4aa48def06351cf2f1df10513e4dc690103e72cfe5acec9b5c SHA512 bb3bcc6b6658f19b35df99788c9d5ccfccc2e16160b8b96ed13bb8358f5804cc1a326de88008fc417b8017bd98d159c86661ad6de39526cf578a8c93a0dcda85 WHIRLPOOL fa6df58ca7b45ebc6d1aeba157acc195658b80c6918394fe4a5fbf48d2bc0d4598910da17665ed21702a57ca6ed923833db3bd2a9345d69addaf518f8750879c EBUILD xstow-1.0.0-r1.ebuild 1380 SHA256 9fc6430c7401ee3d1e5384d8c625f5115eeb539516c555c60865846f6cd726ac SHA512 c69280c0969ea28c0e2aeb1a840c08172c001f94287a689cd68c510212d185c04690fe082bd597113c3e74e65843f9a4499cee080083f58f24431880e42dab87 WHIRLPOOL f19c40a5346214d40f2c5cb328f5d840e85c9a6d42a19a6321bf7bf45fca6ee6c78f6a4af3fd6441fa2a4038b3a134a47861ac5800e16fef1f94bed41cef3fdf EBUILD xstow-1.0.0.ebuild 1384 SHA256 f8e4f5e77cc59b416133513a25f4081b3ec12e4514b37fcb40ca395c0a0c30ab SHA512 eebfcfdfa19597b4896d22e70529b59b9dbee84de8b8d8b614e465d95e553eb94577d5dd2f78775b102694fc72d0f9b72c951c660d56b4c8fa8f9022cd66bd48 WHIRLPOOL cd45e18132f22038b616a0367166720d0aa89d80c4498d0a828638750ac4a48d8889c13389b18851645cf3943334c99b7f39defdd5a1053f1ccf822a7940d262 -EBUILD xstow-1.0.1.ebuild 1374 SHA256 a776e342933bc5926476cf06a9c43ab065e0681c6e66f6cb1f045e03e8e3dc20 SHA512 9cc42e419f8e8a23553715866110b7d66a81c62920b5db8a0f22c311eaee5f6903c4e4bcfb8f8715310e4fbbc84a8ec581fe17d4b24b54b0aa713da3df3d4d36 WHIRLPOOL b7f509abd34cde4d699a23f902442dce47dba8b0aa71d60ad3bf9a04222264982edf3dc95d331bcf79b9b47a53578a4866571c4a28e85b2b1bcb433e57bf906c -MISC ChangeLog 2584 SHA256 56d9e06d6981ed9b2d7f4e40f2f3dc28d1093edb6a01bc8a06906be186c26aa0 SHA512 3f2dc398abeeb495165ef57e9bb027ba4b91d01b83730f6626bc953ed500389dbbd0e5f9d14d7be1c81363f36fb8fa23a1d86d57c5191b6acd790b2e089c61b1 WHIRLPOOL 276103ca5196dac0d1f82733f6390ac87c89dd0e16f6efa4ccd0648aa735cc3d8c26b8225d51a644806386816a2d27699a0c01e192a8f1b7abaebf824ae271ef +EBUILD xstow-1.0.1.ebuild 1339 SHA256 ed777c46c75198888e654de0ce6e19da28a19cd3b9491e96a7543412b9387272 SHA512 fafb55fde9d08b6afef2b150a1694aa71d979683a38bed126043f6d33b2de5b2a44d0d70da9bba2e4e318f21a7ba8c57ba50787f005d61b6df9b6a4cdb321d7a WHIRLPOOL c2fafe8a6d30f2c05e113b94b4f575faa6f995aaf7ec4a16235cc19b08040fcd5415999ab569c84a3454abf65758c0a9e0031f1c195924f83d8a371e3594f109 +MISC ChangeLog 2740 SHA256 a980f20316eb96937c604f21e7f4ad662e5d7a2acd2e88930816d0135c2b4ba7 SHA512 d4ada24240efd84a641d165fabd3dca7b4704bdf2a9901b868510fc45ef1cc2d2bc8aace0534fac1c05c4e80ac3ef79f2783cfbf81bee511d787109b8b0a8afb WHIRLPOOL 65672e364bb29d4246da2b19aa3687b1f3540b6b190ffb891a02dc1fe6cb1b732a0b0c2a47af22bc53d62706243d558f555ae8bfa640606131cba70310465bd6 MISC metadata.xml 455 SHA256 701b5ef876bdbda4a537ebfd08a88d1a520ddc18450e98c64dade05eed4ce6b0 SHA512 fdd8956c673afbe327edbfdddf869c370b1545c2b808135a67ba6e4d8f5dc89cbd09ae6ee2f5bb54bd8f6d38cddfc1bfb264cc9af40e123f5f63fb4fc061e273 WHIRLPOOL 68a4034fb743b5b8dcccdf51c96da08b6b7f381fd3340719912f1790eada5a6b842f9961464b0b64108ad518a65809844e35503f9638cad7a74188132a4f7408 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlTGhX0ACgkQVWmRsqeSphOK6gCfTcBR5FQ8RgVMYf0CpFxrEc11 -UbwAnRPRPAHnE0ZfiY30XxH92We5FWPp -=aYky +iEYEAREIAAYFAlTTRdoACgkQVWmRsqeSphOrogCcC7eZe9IBFaKOGvD/XB9Vr0uj +oUEAnAzRKvY9XX/ZIloZYSgPB1uL/F56 +=HfQg -----END PGP SIGNATURE----- diff --git a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch index a3f0becfd287..b7d29f287e7f 100644 --- a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch +++ b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch @@ -15,6 +15,15 @@ AC_CHECK_HEADER([curses.h], [ # test which libraray to use +@@ -146,7 +147,7 @@ + fi + + if test $support_curses -eq 1; then +- AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib") ++ AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib") + AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used]) + fi + @@ -154,8 +155,7 @@ [ support_curses=0 @@ -25,3 +34,23 @@ NO_STL_SSTREAM=0 NO_STL_STRSTREAM=0 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -46,7 +46,7 @@ + backtrace.h \ + backtrace.cpp + +-xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC) ++xstow_LDADD= $(LDFLAGS_DYNAMIC) + + if ENABLE_MERGE + +@@ -63,7 +63,7 @@ + backtrace.h \ + backtrace.cpp + +-merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC) ++merge_info_LDADD= $(LDFLAGS_DYNAMIC) + + endif + diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild index 5440022f77f9..4fc35014176c 100644 --- a/app-admin/xstow/xstow-1.0.1.ebuild +++ b/app-admin/xstow/xstow-1.0.1.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-admin/xstow/xstow-1.0.1.ebuild,v 1.3 2015/01/26 18:20:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.1.ebuild,v 1.4 2015/02/05 10:28:40 jer Exp $ EAPI=5 @@ -28,8 +28,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" \ - install || die "emake install failed." + emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install dodoc AUTHORS ChangeLog NEWS README TODO # create new STOWDIR |