diff options
author | 2015-02-01 08:55:08 +0000 | |
---|---|---|
committer | 2015-02-01 08:55:08 +0000 | |
commit | d3e3c981c2ce87dfebd172f0e8086808d67acb15 (patch) | |
tree | 048f7624a17f3c9ac74cf828e0013059dd9c291d /media-gfx | |
parent | Update to 3.18.5, fix compile failure in IP27 RTC platform driver, update to ... (diff) | |
download | historical-d3e3c981c2ce87dfebd172f0e8086808d67acb15.tar.gz historical-d3e3c981c2ce87dfebd172f0e8086808d67acb15.tar.bz2 historical-d3e3c981c2ce87dfebd172f0e8086808d67acb15.zip |
Drop old
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42
Diffstat (limited to 'media-gfx')
18 files changed, 28 insertions, 1184 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 6a427850b7f2..de68cce26cda 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,24 @@ # ChangeLog for media-gfx/splashutils -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.225 2014/12/30 22:22:01 dilfridge Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.226 2015/02/01 08:55:01 pinkbyte Exp $ + + 01 Feb 2015; Sergey Popov <pinkbyte@gentoo.org> + -splashutils-1.5.4.4-r2.ebuild, -splashutils-1.5.4.4-r3.ebuild, + -files/splashutils-openrc-0.4.3-runlevel-fix.patch, + -files/splashutils-openrc-0.4-fix.patch, + -files/splashutils-1.5.4.3-daemon-exit-signal.patch, + -files/splashutils-1.5.4.3-fix_rc_var.patch, + -files/splashutils-1.5.4.3-libjpeg.patch, + -files/splashutils-1.5.4.3-libpng15_compat.patch, + -files/splashutils-1.5.4.3-makefile.patch, + -files/splashutils-1.5.4.3-nondefault-runlevel.patch, + -files/splashutils-1.5.4.3-openrc-effects.patch, + -files/splashutils-1.5.4.3-openrc-umount-fix.patch, + -files/splashutils-1.5.4.3-splash-functions.patch, + -files/splashutils-1.5.4.3-splash_geninitramfs.patch, + -files/splashutils-1.5.4.3-splash_util.patch, + -files/initrd.splash-cmp-str-instead-of-int.patch: + Drop old 30 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> splashutils-1.5.4.4-r1.ebuild, splashutils-1.5.4.4-r2.ebuild, diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest index 420d286d0755..e5e998953350 100644 --- a/media-gfx/splashutils/Manifest +++ b/media-gfx/splashutils/Manifest @@ -1,26 +1,12 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX initrd.splash-cmp-str-instead-of-int.patch 452 SHA256 a87df58a23b12eee65058f9bd326e354cdccf32048cbc8446b2ad72942da2f30 SHA512 9743953c07d010b98dfb827b750ab05c7c164da807f8d14b5159647b71220b1d58674f14c584aa2f207b175585aee4130a659dc246ea0af9984a1fb257346bb2 WHIRLPOOL cf3ce7d4516eee0e01052f7d3453c13a89e2ef49c50c26570237c8387f1ff42d3a0f19b98e815265323df6075e9795390ee8901d4758d508bd41398225ef397b -AUX splashutils-1.5.4.3-daemon-exit-signal.patch 2764 SHA256 8d7d17ae6591f3de0bde18c537166710b1eac0f6aeb1507aecdf8d6a3d1553eb SHA512 f6d3c63d6d7eb58795a80fa66a1b96f37cf294034d9a135fd0c6a429b6e10771874b77f43cd49ef300fa2f44571660501ecc3a7998fe8ae35765c381043efcb6 WHIRLPOOL 0eece031b487ddd6adf7b74a285c4464a7513c737fcc2f6aa2e9fe4e27acb2306b4b546c6148161cc11c6c458df6baa6d70f9669a62aa673670ea450734c3ce1 -AUX splashutils-1.5.4.3-fix_rc_var.patch 1084 SHA256 c51b29f3c6191ac6259db52f56050a34872f07a78463a1ac1e4fbaf89d2f81d8 SHA512 53522bcaeff5c2add29336d8e997e9725c5dd5e13b3f207f6de78b9d16da381954f9f55d2cf497e39a8f621b8566057a6b2540c60a95bdf858995c7211e5ac86 WHIRLPOOL 16d7f1600f42c33ea9c383b9691f17b25a35377493814c6080fafe0f6234bd2c52e9221acfa5fee5d21dc525385c1b0219dc588a4c144b7e2d06a1d4d7f0d4ca -AUX splashutils-1.5.4.3-libjpeg.patch 1693 SHA256 83d9a0ededa96c213a3120c45969d6b8f00e97f2104a221541badd67f82259c7 SHA512 be86a48790a50550615bac6e7226982ac9f6b5768d9f9e3b3be86610f64ebecd9fa29d095bc87cc912b6ddeadec28a8fcff4adb04af049d506844d37db473ed4 WHIRLPOOL 65df4d0dded18c1f80cbc13851efd63afcf0b853a8cb45d8f6d026dc92c7741aba638a8a3afe14da9f84094c2a08b42a4d63fb942eb65cb7e5b94636b7bef2ec -AUX splashutils-1.5.4.3-libpng15_compat.patch 3925 SHA256 bbecf8f385c59bf4dbe0f760ff59996c37facb0f05f7c960701ad2c496e8956b SHA512 8280f37dc7fdf53c34804917340fc8383379e51d13b289e1168f6b0a3cc209ffe71920cfbec2ec95dfbb09d578e8d4c34b657f8c457220b1745a19d715cb265f WHIRLPOOL b6d90e22c28d7afa09ef41023536e08373976730cf00d8bf699d63d3c525d9299f1543629e914befd66d1c326a30e2835573ccaebcb16ca4f8781016ac91556e -AUX splashutils-1.5.4.3-makefile.patch 1257 SHA256 6ca31fc77f75bda368642da7effbaa0fd3c69bce86c9e04bfe55b9ab4d259cf3 SHA512 1b0fe836eb665415046b84bc6563fd3928b791660535a75dd0aabfb848cdf59c206127fab7f917123c4329e93820ba904b079f9ae9bf4fa56a699ef2795b10f2 WHIRLPOOL c924f08102a1c32bc3fe5b82f0fdf300cca72fe29dc13f02bacbd6aa576ad2c52c8b2314c81262ffeb3be927ebb096d9ae4dd729c40baa05572ee88d91cb4ba1 -AUX splashutils-1.5.4.3-nondefault-runlevel.patch 894 SHA256 c462ef5e4c2514bad9a5aca78cce923109bcb0cff5a292286e74b2f1e8ec457f SHA512 f2c56326294bbffc6e75b2680599a85e4044d8d46d28386e96ca9975e44468547bc3013fe53b7fb19af1ab612680bbd38bc2f89a04647299675e207c7e1fff28 WHIRLPOOL 50ca31e73bdcf70ede0a629b9982ca61bb28a1199b6ef114b41947a2e40cf4518c1455f34273bde78cc76276895037c999b34ecfc760259ff97b0452cb6e879b -AUX splashutils-1.5.4.3-openrc-effects.patch 2261 SHA256 ea416ce53c805241b05bfff48439c4c26dbbb717001356ec08f8820ff8baec09 SHA512 a50c2e6d8b34f00c80e37866989fb60992be00919c8ae3d916d0329fdc8831d37a30f345f0382f3a4d462355f6f7ba29d2d8780a9799d75f6428cb248d5315a9 WHIRLPOOL 992e9179b291b29b456aa02597ead5678a4b155132a25c2a041d2e1129f7c7a7837bb0d0fd3f50ea50862423b2c966f9042a1cfb389d8406c25eeeeacb642eb4 -AUX splashutils-1.5.4.3-openrc-umount-fix.patch 1152 SHA256 56f48bd31c0d405abbb2d320c131f109fcf6ee7a2ef5bed00b024dd872ef31ea SHA512 472f35f9d177cc451953f15e4ccdb8b942500490500efda57c0a873eb709f23a7ad66ce20818efd7cb383cc67beb89b91714e0759f5cb7528b092783ab66ac5e WHIRLPOOL ab6235aa7a2165db21160215628bc1dcefaba5044344d504bbd6a4878b7b8fd7b364ca86a43ae76903501c3e7ca663cfeb9c50d4eb9d18dac9d7feaa60c80174 -AUX splashutils-1.5.4.3-splash-functions.patch 680 SHA256 2ff9a645513187264af92b16e4ed10bf97edc1cc46b800ed8ae7b4027d407554 SHA512 a46bd5c3134eea2ee4d15a3e53dccd2d46643375e282b2c1e292cea4d9f07458a442c91068488f6ae346976362636dd090a8c25d0e22e7c6108d41dca656f3dd WHIRLPOOL db2942de766ec33a55b1f2cfddf55826a759d9f9d0454b8901c1f6a7ba56bb04a6c9d3dddd9f1e7956b993772c905de6fbc6b2ae9c364ccac790a385d83ce271 -AUX splashutils-1.5.4.3-splash_geninitramfs.patch 606 SHA256 9fe2d8c232a58089e902af3aebeba569669310fc1219da5d2c8775d4e10929ca SHA512 a027134e9de2688340cd1692982749af02813542a364ad82975c8cc1f67fc74d79cb4f4e3e2deed6aa330fc894541a0691b47288a4a8ac2430d5f5f4ba0838aa WHIRLPOOL 9472f1b2448feaf276323ef6ca9a7168c3db904c04163d57e2e8745eaf2a7763a066ed5927867e23e95c145a877a2807d1abb0f2316284b1c203b2e58b2b9d1f -AUX splashutils-1.5.4.3-splash_util.patch 1335 SHA256 25b64a8bcb49f660a18dbd30bbd0e368675cf6cde122378a94521966d5b3f928 SHA512 ca0830403e304647b49f0131e452cbe51490fdf8ad50cb8b21713e6fd9af5a9871f7fd65ac9b935273f217d89fe3618da567fb144017a275a5c5058e82dcdb30 WHIRLPOOL ee9e992a71751311a60e521cd965de3a60874bb971ac1e091b3798934267a7a9d482a6a34e599525ac4a05f4ea7e5a7cb131b4bccedea4d2fdcf7aa7674766f1 AUX splashutils-1.5.4.4-bzip2.patch 1539 SHA256 9596a410eb5fcadab850ac8f1d54c14d60287333a204212cfcdb1dc2dfa608ac SHA512 c42a967361b4ebe9673eb41cb3d8d120edf95708892422bed0b2a46ea501d852c6c43b9405c90b69469a9b0eb07a5159e1547d168ef04b0de8a6c7bae0651317 WHIRLPOOL 4f28bec7ffac7caa4b5fc8e931ae579bf8041b8fcf6c6b571dc9c59a329285d6a6c5943313bedfc3144a3f0848eecbe0784a27bdaf395715c57909bd5e90447c AUX splashutils-1.5.4.4-freetype-bz2.patch 515 SHA256 06a9f6d9d9206d09115abf3d8c86692908530f11168a51d99dd43a465e7092c0 SHA512 880cc0703de76c3c145680f1e85e461473df3dd41817757878bd18dc4c0d10484d1f93f995e6818ddcf3309e6b9febc1447ce7880006df8e08626bac5aae2e5c WHIRLPOOL 50c58afaacfd2594c1bc402c07680d742809e2af694b98acb3656f7dbc50cc85a537bec4b362c443f9dbe1054307c397cdba9613392ef6c508760d2487095265 AUX splashutils-1.5.4.4-ft25.patch 411 SHA256 868e50d46aeb4c6440ba48c6eab8f4ec41274381539791ac589c36892e08fa16 SHA512 e28e6dfbee21b73ef6fb60dcdd498fc2b4cdf7830b2d3c47f0b337cd58d2c204c294b72235e2df2ba0475ee6ce2a21431b492daa755b4a6c0c5959d44eb1b759 WHIRLPOOL 7ce671d977a219adb4ffdfa137588b5a3b595bb0546ca8fb6db73b4968ded25ae153da663a42cb4dbb6b44784a987dd70df80e101761bff4ff178da10dd280a0 AUX splashutils-1.5.4.4-gentoo-typo-fix.patch 567 SHA256 92ee0727bfd9fe6f9565d09546ea63079467f67c2d57385713a62d0b617bb1bf SHA512 f5d5fd222b5dea9906e5a7541ad2ab1ff161061c6bb5e013929767d3f6aa9fe245092e201b8d42a086938be3320b77384301c22bc307cf7872daac33184127f2 WHIRLPOOL f971453383c1abf28c912a49c426c7da92ba6d44580981e89bedd4ef7df9940236e53842bd31ecb85c44c2ff31230569a33e7233498269aefc8caeacb84b9caa AUX splashutils-1.5.4.4-multi-keyboard.patch 10158 SHA256 95a0de0a666c29c7d80fe653659191770d359f62d1edac00dc3ad97ac14d6dac SHA512 71056d599f4465ef424444d717ce1597295e0228f548c69cb36ef617075af430b1ac50f5be27bca65a50ed9e7d0169ceb256dbc66cf4b635fd9f8310d32baeae WHIRLPOOL ce782d0a6a21350fd9b00792f0eb247907b3bcf900c0e5aa8f6304d4d3c05ee59f1b036d623f25262484bd8d48ddd95a5ef086644d369c6190570be8db432112 AUX splashutils-1.5.4.4-r3-bzip2.patch 1808 SHA256 9622dc7721e0c36538e8a1321ff59e224231578675831909d1c68f3eb9f46434 SHA512 8c1ea0bef43c4c829615db010a958ffa7c4ab8c84786a39e702be677745e47004ee59bdb1d7c80bfc637ff7c0f9a129f225e024251492b45aec7c42e1bd73da0 WHIRLPOOL 2522dcc049d68269764c9254f8884d62aa16d08fe5fa917b7c89db46617c1694c73c79f3af30c361cdd22b4d68c07b0b52c70c3243c15b263c6b5cdb6e2ef457 -AUX splashutils-openrc-0.4-fix.patch 2750 SHA256 9da0e841d23b07b262b4f49e25986dce24f73f554f25bc4219024414ccdd9846 SHA512 df844cdb4c1d418390031a669a0907db9e2833e5a87cebfc822e0e43e9ea43f4aaa8ab594f1c7527e056688fc96b38cefbacb2310ba9c6ee3cb06782137f6a76 WHIRLPOOL 59c9336da412c4aadea1fdb69cdd5fa4332284ce482923d392535e1833aa6e8f21981cb33c5bed3dd65b08e65e835fd7f71ba2dcf14e35575c97208d429235df -AUX splashutils-openrc-0.4.3-runlevel-fix.patch 3472 SHA256 9e122dc031acee6996375170ae8954a0ea78cc99ba9265ab2e4ba540da25cb94 SHA512 e040fbe69908050aa378b5292d7d66f9dabda2961067a8c0ed644026a8d4677a33a8ddb709fd4b85059d8676c12c5b29379f851f6737addbc3a43eded9f70587 WHIRLPOOL 5468fa781a2932a89661130b2bbc0cfd301facac6daddb8977dbfba51eb9d77bc3dee301c18aeb3c70b8bb473cb29a06654825f2255f7581c7ffc609025a5858 DIST freetype-2.3.12.tar.bz2 1453034 SHA256 3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92 SHA512 becb0f138ee13181513d3f03b943f0a474e492cab151992fa78d0c84127819dc91ec6d2bd1528af7e111ab150b3a29104f2f7ab79650cebc35ce4d966b19f34b WHIRLPOOL 1a7363b8e1cc1b4597077e6cdf7e978b80cc76e1428124312d139ee81fe5247eed5ec0243352b721c28a25a179bceb901700d0766c1a5110b19f8fe53c303a89 DIST jpegsrc.v8a.tar.gz 962018 SHA256 bf86a5eaafa79b5d60feb27bee08df2db4c9ca2fb40d453e7a2080f7663a713b SHA512 4020e82e16b99189b1a50bad18b09616775559740b94a988692aa33f9302d4b5abe3ccaa30895b49e6950fb3d9a830deeb7df750d128ec5c7e1844583db4524d WHIRLPOOL 46e0c98f30c8d975b85b8e86b69e9c5c64632f579502b1b3c54902706d7e08b86582a85b49a0d3bfffd03cd90946fbd20171324504a5ff521eb89e6ce11d568b DIST libpng-1.4.3.tar.bz2 658335 SHA256 2b022f39f4788505ad62a4b1f4a33286228d544719680da40f3626393ecde4a2 SHA512 aaa137ebc2312805d58caf19702d24a34ee81593d4250c4e807ce66ba7edb829926919cd0a2b0e5975421451c8eb6674798c06dbaf745175b16c9d3c92b63f61 WHIRLPOOL d383e01e6080166816991650183b47d15938aa269c0a85e234846b9c5a7ec04a1ba7620779b4ddae639ca64440772ce8dd1b3a596f6eb32124c4d6c55592fb0a @@ -29,25 +15,17 @@ DIST splashutils-gentoo-1.0.17.tar.bz2 15814 SHA256 6877263d0b6f5a3532db0d6a531c DIST splashutils-lite-1.5.4.4.tar.bz2 441340 SHA256 bc0e22293d4550281d2289672da3acb42594c18a75b9d00ba75526e05162ec6b SHA512 1a78216a1de1fdccff514494d7301640e447c65466e1fe02428e5114485507f67fe4394094880d927d074a8ab2d9c786ba03f9fb0371eb7ab6ef4e3b01aa4613 WHIRLPOOL f861a1673fd9e1fe32e417da48be8c472c5c3cc06844eb0886a66b498ca38cb04a6e51708821eefe3e15f66004bb6a4ef76df7242643b34090035bffdf1f87d7 DIST zlib-1.2.3.tar.bz2 425209 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 WHIRLPOOL e874b123296f5d77daf60617501b30f4beebccb64b3910c2539f75f6c194a2cf4885dc7a3904bf790e1651120ec33b55c48e95970dd6bfd6c4d0a2ea48d7d0f4 EBUILD splashutils-1.5.4.4-r1.ebuild 7509 SHA256 b5e3bfc1e41388f4e2ff7fd324ec40689341eedc6780fa7dcd800698d98c9e2c SHA512 02a623a4ad53d52001be282f32b14a65f38e5ff9e0d0867f8c564b54415015677a70155c12f445fecfb27883dbe7d56078ecd3dacb840d18dd92704b7fbf0c65 WHIRLPOOL 0205614273c9bbda6aa4371af5a889a758bc99e7ebbd6b55638ceb8a5d72538dfdcbf41d55e18f597627bc8e595d7096eeb9c17cb6d2bcf81897e155b5b23de8 -EBUILD splashutils-1.5.4.4-r2.ebuild 7302 SHA256 4913ab279ec56d55affa2df5fcd871f3bbe4c40a89a5c5522d4444e0c4fe787a SHA512 7143e0c98f3c635c43e4fda7fb98986bbf76a80d08ca0ca6a6431de41ff68e7d8d44e477cb867e3cec4c787047e6d058d9a840dd2b377a6af8369c9c7d598f8a WHIRLPOOL 4e927a263d2c7f71ea14909fd1158981c8995515bb31de9887ac748e0e87e5c1efccbd47548e9eee2731fabbe436376b9ceccaa45efcab0cee29d73e7021f2ba -EBUILD splashutils-1.5.4.4-r3.ebuild 6902 SHA256 5aa5a728d12b4e46d74eae0d671eab0953e55c392f0ae03f74bfae283ca74000 SHA512 f92ec7cf4814576af5f9c56604b4a8a81673f36e4d980b810eccc520d7a3ee33946bb8d9cb49cc86b7d47b65c47c32ae2047372d95c9e8aef7ed23418da033f3 WHIRLPOOL f2ff176ac46e3bcd1cc9ee4911c88f7c322a0c2e16f2b41c9c7c79826f095c74cbbb62b5ed5408300f9bd3c7b5bacee50f8b8192855407a9956df310ee576f37 EBUILD splashutils-1.5.4.4-r4.ebuild 6761 SHA256 d94ea2fa25ddc18ef168d2493f4df3f24ee656cc9610b1e2a08cc3926d95d67f SHA512 55db1569016b74d9bfd8228feee8a1de6109bfad5c0574e8a2685a23580e9c67298f552cbf43dc43a1c5c397059a73d70e9d203b0398764d02f43f183215f9b0 WHIRLPOOL 971e920825be2c39fe38064e177d234b4b719ad79b567973aa4c8440c03a0e6724e29ef6b7b63f7e2119b75663bee13be4ffa80b1c88179391041689041e9e49 -MISC ChangeLog 39892 SHA256 39390cd4f518734a26888913e1c9de10356c2f20e001f2e75ad19ba1feac5b89 SHA512 2a733c0338cf0e0b1fa112faba53dfd062dcb2aa952e23451921b927b3185ed3ffdb6fd1b3ba49d824d808595d4c26221e537515445f22628ce212957cf13b69 WHIRLPOOL 2fcde5cbc59bbc68e5591779329355275cb8e10b1e1ffc6b74fd410c6dbce481f301cfba5c303364f41d48354beaa9939412d79511ba3d60b376954bd1124b50 +MISC ChangeLog 40730 SHA256 c22eefd700a1c8ab10f3dcc4428b6e55ef5da1c3859ec6c7359726f85e0a0d30 SHA512 0eb550033efddfea51f4c98a9ed3b074191659deeb108f79f2c396eed5097fb7c38c38d27918addf2fe79249a64014cd012dc660b50c65bb80cef2eaa309c74b WHIRLPOOL 4932d02ee9f485f62429245f490271da729c7b0667d3d45514c8e2768e7ae04f5556c6e89d756fd505a24dbb42a4b1b6de3d2ddd9caa1ffccf82e0b3ade783e3 MISC metadata.xml 324 SHA256 51a25c570502116aa46bfe2bdfbb99be8a81290879563848978a9ee301a3dfa5 SHA512 4fccbcc1c6372560a0139262caf1f305cf658be6761e9703a0033da08af0d8a3dc310e1ceec52761b173fce2d6a94971fbde69ee0a419a7f00457f08691b233e WHIRLPOOL 60b68573116b7ef2a1a4fd87ab47172b56617c7d713ba44e9cdfce23283bf45ddf94ce0d4dd7d9d8ca7ab0c3af164557ec8f16ae872269b1b04b92d3a6e4781d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUoyXmAAoJEJS/30SErRQvnKAP/3lIH6RV4RdIEm/izW+ReZ+w -kYavnLCj/RdtbSYBvAQs8SKZtk4g+MFgn9nP227CLhUqAtilzZ4uIQ6SeWNfBiPk -0oGoarISaYyDuR+WD321+38sKr2hYiGsl8U77eunXw5sHnej01GYFgklGkJ9j4t5 -2MITulFgAV8wxvcEpfR5J6eAFI9289zUVIQNLEASIYN9s1MU6Ywn2kQyr4+bAfjQ -bQeGAb1f3Z6ZOT3A3OXQmeriXS/nk8NHLDITIjYVwdpAQDy2jsBWgSRWS5o4T97B -HQ32+S98Mbj1As5QbrAQuGzvzmG5x+vT3CH7AwiPv80iVCGyU0dh5KQ/NiESfG1H -bznnAOzByjOuJuZZhuJC5iNmRa+/LpwL/xIkijI32R37Hiq8y/NSvjnrYABZKjU4 -40u83uLjSjc//gx1ErXgLFkypmRzUoCTkVapgMHW45LqcsCr+z2bkkfjrUXIZ4J2 -W/XjTPNnSmN9SsujRjSzIAnirw2T2/8VVLF7bztSXqovbqq1vdjwzXodyu7DZwFe -2SYaaS5+/fBxxL7/pC9H0aD4X3Ao5OP+PY4OoGRrbzPFChS+vAwhnm5aLSDpzvH5 -lWOIareLvO/AsVnzukzfr4uGMm/zu5G7BfqfIDZYwUIeaAw2YRquh+2fzs/aOxdQ -EIhbQINZM9NRjPjs6NuX -=JIkn +iQEcBAEBCAAGBQJUzenrAAoJECo/aRed9267+UMH+gIwsbfR6fzV2pnYGH0bZIQc +BiETbcdycie6GY8UZ1oG9m/xSF7VQpHqIg6Icr0BRvMaeuQCihRkLp9X3tgigLPt +7EMFMqhFUCZSSATGzXMc9aYuel1brLGOfHPZBMTnuedlnp9IZWJXb4G1vS16Vjk8 +qNaEEt7eZfQgq/Jr01HYbDNL0wmD50E6qAmipvBap4fj0ieXqAr81pLSW73Y28Un +5sVLNni8sChX4e8N02D1MR9oSv7/a7oc7a90Eur0NYdtB0m5ctY98AgPBAlR6qkf +LQTWBpZxWD4oA43eiPJrfEZ1Ce9gVaYTyx6y7ad4HTk+xTYgk4XaZmelHepDnzE= +=5Kd3 -----END PGP SIGNATURE----- diff --git a/media-gfx/splashutils/files/initrd.splash-cmp-str-instead-of-int.patch b/media-gfx/splashutils/files/initrd.splash-cmp-str-instead-of-int.patch deleted file mode 100644 index 16bb2f5740fc..000000000000 --- a/media-gfx/splashutils/files/initrd.splash-cmp-str-instead-of-int.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- initrd.splash 2008-11-13 23:49:00.000000000 +0100 -+++ initrd.splash.new 2010-07-27 21:35:24.647912782 +0200 -@@ -26,7 +26,7 @@ - init) - if [ -n "$2" ]; then - export BOOT_MSG="$2" -- elif [ "${CDROOT}" -eq '1' ]; then -+ elif [ "${CDROOT}" = '1' ]; then - export BOOT_MSG="Preparing the LiveCD environment... Press Alt+F1 for verbose mode." - else - export BOOT_MSG="Preparing the system for boot... Press Alt+F1 for verbose mode." diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-daemon-exit-signal.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-daemon-exit-signal.patch deleted file mode 100644 index 82284f1d2125..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-daemon-exit-signal.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff --git a/core/src/daemon.c b/core/src/daemon.c -index e3463fc..eae23ec 100644 ---- a/core/src/daemon.c -+++ b/core/src/daemon.c -@@ -306,6 +306,35 @@ void handler_alarm(int unused) - return; - } - -+int process_switch_sig(int sig) -+{ -+ /* Switch from silent to verbose. */ -+ if (sig == SIGUSR1) { -+ pthread_mutex_lock(&mtx_paint); -+ pthread_mutex_lock(&mtx_tty); -+ ioctl(fd_tty[config.tty_s], VT_RELDISP, 1); -+ pthread_mutex_unlock(&mtx_tty); -+ -+ ctty = CTTY_VERBOSE; -+ pthread_mutex_unlock(&mtx_paint); -+ return 1; -+ /* Switch back to silent. */ -+ } else if (sig == SIGUSR2) { -+ pthread_mutex_lock(&mtx_paint); -+ pthread_mutex_lock(&mtx_tty); -+ ioctl(fd_tty[config.tty_s], VT_RELDISP, 2); -+ pthread_mutex_unlock(&mtx_tty); -+ -+ ctty = CTTY_SILENT; -+ pthread_mutex_unlock(&mtx_paint); -+ -+ switch_silent(); -+ return 2; -+ } -+ -+ return 0; -+} -+ - /* - * Signal handler. - * -@@ -315,7 +344,7 @@ void handler_alarm(int unused) - */ - void* thf_sighandler(void *unusued) - { -- sigset_t sigset; -+ sigset_t sigset, sigset_switch; - int sig; - - /* We don't handle SIGALRM. */ -@@ -329,31 +358,39 @@ void* thf_sighandler(void *unusued) - sigaddset(&sigset, SIGTERM); - sigaddset(&sigset, SIGINT); - -+ sigemptyset(&sigset_switch); -+ sigaddset(&sigset_switch, SIGUSR1); -+ sigaddset(&sigset_switch, SIGUSR2); -+ - while (1) { - sigwait(&sigset, &sig); - -- /* Switch from silent to verbose. */ -- if (sig == SIGUSR1) { -- pthread_mutex_lock(&mtx_paint); -- pthread_mutex_lock(&mtx_tty); -- ioctl(fd_tty[config.tty_s], VT_RELDISP, 1); -- pthread_mutex_unlock(&mtx_tty); -- -- ctty = CTTY_VERBOSE; -- pthread_mutex_unlock(&mtx_paint); -- /* Switch back to silent. */ -- } else if (sig == SIGUSR2) { -- pthread_mutex_lock(&mtx_paint); -- pthread_mutex_lock(&mtx_tty); -- ioctl(fd_tty[config.tty_s], VT_RELDISP, 2); -- pthread_mutex_unlock(&mtx_tty); -- -- ctty = CTTY_SILENT; -- pthread_mutex_unlock(&mtx_paint); -+ process_switch_sig(sig); -+ -+ /* Internally generated terminate signal */ -+ if (sig == SIGINT) { -+ struct timespec timeout; -+ timeout.tv_sec = 0; -+ timeout.tv_nsec = 0; -+ bool pending = true; -+ -+ /* -+ * Process any remaining signals. There are no guarantees as to the -+ * order in which the signals are delivered, so we have to make sure -+ * all pending signals are processed before exiting. -+ */ -+ while (pending) { -+ sig = sigtimedwait(&sigset_switch, NULL, &timeout); -+ -+ if (sig == -1) { -+ /* No more pending signals. */ -+ if (errno == EAGAIN) -+ pending = false; -+ } else { -+ process_switch_sig(sig); -+ } -+ } - -- switch_silent(); -- } else if (sig == SIGINT) { -- /* internally generated terminate signal */ - do_cleanup(); - pthread_exit(NULL); - } else if (sig == SIGTERM) { diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-fix_rc_var.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-fix_rc_var.patch deleted file mode 100644 index 3b9e06b41f21..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-fix_rc_var.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/gentoo/splash.c b/gentoo/splash.c -index b6fa774..726315f 100644 ---- a/gentoo/splash.c -+++ b/gentoo/splash.c -@@ -134,6 +134,19 @@ static void get_list(RC_STRINGLIST *list, const char *file) - } - } - -+static void fix_rc_variable(char *s) -+{ -+ do { -+ char *t = strstr(s, "\\$"); -+ -+ if (t) { -+ memmove(t, t+1, strlen(t)); -+ } else { -+ break; -+ } -+ } while(1); -+} -+ - /* - * Get splash settings from /etc/conf.d/splash - */ -@@ -189,21 +202,27 @@ static int splash_config_gentoo(fbspl_cfg_t *cfg, fbspl_type_t type) - switch(type) { - case fbspl_reboot: - t = rc_config_value(confd, "SPLASH_REBOOT_MESSAGE"); -- if (t) -+ if (t) { -+ fix_rc_variable(t); - fbsplash_acc_message_set(t); -+ } - break; - - case fbspl_shutdown: - t = rc_config_value(confd, "SPLASH_SHUTDOWN_MESSAGE"); -- if (t) -+ if (t) { -+ fix_rc_variable(t); - fbsplash_acc_message_set(t); -+ } - break; - - case fbspl_bootup: - default: - t = rc_config_value(confd, "SPLASH_BOOT_MESSAGE"); -- if (t) -+ if (t) { -+ fix_rc_variable(t); - fbsplash_acc_message_set(t); -+ } - break; - } - diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-libjpeg.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-libjpeg.patch deleted file mode 100644 index 16d7ac2080a8..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-libjpeg.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/core/libs/Makefile.am b/core/libs/Makefile.am -index d070b29..c0a9258 100644 ---- a/core/libs/Makefile.am -+++ b/core/libs/Makefile.am -@@ -53,7 +53,7 @@ libfreetype.a: klibc_compat.h - if ! $(MAKE) --question $(AM_MAKEFLAGS) CFLAGS="$(K_CFLAGS)" library ; then \ - $(call infmsg,MAKE,libfreetype.a) ; \ - fi ; \ -- $(MAKE) $(AM_MAKEFLAGS) CFLAGS="-c $(K_CFLAGS)" CCexe="$(BUILD_CC)" library $(OUTPUT) -+ $(MAKE) $(AM_MAKEFLAGS) CFLAGS="-c $(K_CFLAGS)" CCexe="$(BUILD_CC)" ANSIFLAGS="" library $(OUTPUT) - $(Q)$(MKDIR_P) $(@D) - $(Q)cp -f libfreetype/.libs/libfreetype.a $@ - -@@ -62,18 +62,18 @@ libjpeg.a: - $(Q)cd libjpeg ; \ - if test ! -e ./Makefile ; then \ - $(call infmsg,CONF,libjpeg.a) ; \ -- CC=$(KLCC) CFLAGS="$(K_CFLAGS) -I$(abs_top_builddir)/libs/libjpeg" $(LIBJPEG_SOURCE)/configure \ -+ CC=$(KLCC) CFLAGS="$(K_CFLAGS) -I$(abs_top_builddir)/libs/libjpeg -include $(abs_top_srcdir)/libs/klibc_compat.h" $(LIBJPEG_SOURCE)/configure \ - --host=$(host) --build=$(build_triplet) $(OUTPUT) ; \ - echo "#define NO_GETENV 1" >> jconfig.h ; \ - $(SED) -i "s#CFLAGS=.*#CFLAGS=$(K_CFLAGS) -I$(abs_top_builddir)/libs/libjpeg#" Makefile ; \ - $(SED) -i "s:#define JMESSAGE.*::" $(LIBJPEG_SOURCE)/jerror.c ; \ - fi ; \ -- if ! $(MAKE) --question $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.a ; then \ -+ if ! $(MAKE) --question $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.la ; then \ - $(call infmsg,MAKE,libjpeg.a) ; \ - fi ; \ -- $(MAKE) $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.a $(OUTPUT) -+ $(MAKE) $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.la $(OUTPUT) - $(Q)$(MKDIR_P) $(@D) -- $(Q)cp -f libjpeg/libjpeg.a $@ -+ $(Q)cp -f libjpeg/.libs/libjpeg.a $@ - - libpng.a: libz.a - $(Q)cd $(LIBPNG_SOURCE) ; \ diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-libpng15_compat.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-libpng15_compat.patch deleted file mode 100644 index fb962aefbcb2..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-libpng15_compat.patch +++ /dev/null @@ -1,96 +0,0 @@ -commit 1b760b583f1faa0d3114440a6746cbefa36dd797 -Author: AlphatPC <AlphatPC@gmail.com> -Date: Sun May 8 17:18:03 2011 +0200 - - Use libpng accessor functions (for libpng-1.5 compat). - -diff --git a/core/src/image.c b/core/src/image.c -index 6973575..4fb21a9 100644 ---- a/core/src/image.c -+++ b/core/src/image.c -@@ -61,27 +61,27 @@ static int load_png(stheme_t *theme, char *filename, u8 **data, struct fb_cmap * - png_init_io(png_ptr, fp); - png_read_info(png_ptr, info_ptr); - -- if (cmap && info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) -+ if (cmap && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE) - return -2; - -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY || -+ png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) - png_set_gray_to_rgb(png_ptr); - -- if (info_ptr->bit_depth == 16) -+ if (png_get_bit_depth(png_ptr, info_ptr) == 16) - png_set_strip_16(png_ptr); - -- if (!want_alpha && info_ptr->color_type & PNG_COLOR_MASK_ALPHA) -+ if (!want_alpha && png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA) - png_set_strip_alpha(png_ptr); - - #ifndef TARGET_KERNEL -- if (!(info_ptr->color_type & PNG_COLOR_MASK_ALPHA) & want_alpha) { -+ if (!(png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA) & want_alpha) { - png_set_add_alpha(png_ptr, 0xff, PNG_FILLER_AFTER); - } - #endif - png_read_update_info(png_ptr, info_ptr); - -- if (!cmap && info_ptr->color_type != PNG_COLOR_TYPE_RGB && info_ptr->color_type != PNG_COLOR_TYPE_RGBA) -+ if (!cmap && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGB && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGBA) - return -3; - - if (cmap) { -@@ -93,12 +93,12 @@ static int load_png(stheme_t *theme, char *filename, u8 **data, struct fb_cmap * - - rowbytes = png_get_rowbytes(png_ptr, info_ptr); - -- if ((width && *width && info_ptr->width != *width) || (height && *height && info_ptr->height != *height)) { -+ if ((width && *width && png_get_image_width(png_ptr, info_ptr) != *width) || (height && *height && png_get_image_height(png_ptr, info_ptr) != *height)) { - iprint(MSG_ERROR, "Image size mismatch: %s.\n", filename); - return -2; - } else { -- *width = info_ptr->width; -- *height = info_ptr->height; -+ *width = png_get_image_width(png_ptr, info_ptr); -+ *height = png_get_image_height(png_ptr, info_ptr); - } - - *data = malloc(theme->xres * theme->yres * fbd.bytespp); -@@ -114,11 +114,11 @@ static int load_png(stheme_t *theme, char *filename, u8 **data, struct fb_cmap * - return -4; - } - -- for (i = 0; i < info_ptr->height; i++) { -+ for (i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) { - if (cmap) { -- row_pointer = *data + info_ptr->width * i; -+ row_pointer = *data + png_get_image_width(png_ptr, info_ptr) * i; - } else if (want_alpha) { -- row_pointer = *data + info_ptr->width * i * 4; -+ row_pointer = *data + png_get_image_width(png_ptr, info_ptr) * i * 4; - } else { - row_pointer = buf; - } -@@ -127,7 +127,7 @@ static int load_png(stheme_t *theme, char *filename, u8 **data, struct fb_cmap * - - if (cmap) { - int h = 256 - cmap->len; -- t = *data + info_ptr->width * i; -+ t = *data + png_get_image_width(png_ptr, info_ptr) * i; - - if (h) { - /* Move the colors up by 'h' offset. This is used because fbcon -@@ -139,8 +139,8 @@ static int load_png(stheme_t *theme, char *filename, u8 **data, struct fb_cmap * - - /* We only need to convert the image if the alpha channel is not required */ - } else if (!want_alpha) { -- u8 *tmp = *data + info_ptr->width * bytespp * i; -- rgba2fb((rgbacolor*)buf, tmp, tmp, info_ptr->width, i, 0, 0xff); -+ u8 *tmp = *data + png_get_image_width(png_ptr, info_ptr) * bytespp * i; -+ rgba2fb((rgbacolor*)buf, tmp, tmp, png_get_image_width(png_ptr, info_ptr), i, 0, 0xff); - } - } - diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-makefile.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-makefile.patch deleted file mode 100644 index 060cc9d2b75d..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/core/src/Makefile.am b/core/src/Makefile.am -index 20cb03e..fa6919d 100644 ---- a/core/src/Makefile.am -+++ b/core/src/Makefile.am -@@ -119,7 +119,7 @@ libfbsplashrender_la_SOURCES = \ - fbsplash.h - libfbsplashrender_la_CFLAGS = $(AM_CFLAGS) - libfbsplashrender_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(libfbsplashrender_version) --libfbsplashrender_la_LIBADD = -lfbsplash -+libfbsplashrender_la_LIBADD = libfbsplash.la - - libfbsplashrender_la_CFLAGS += $(JPEG_CFLAGS) - libfbsplashrender_la_LIBADD += $(JPEG_LIBS) -@@ -258,10 +258,10 @@ fbcondecor_helper_LDFLAGS += -static - endif - - # Override automake's generation of target rules for building fbcondecor_helper. --fbcondecor_helper: $(fbcondecor_helper_LDADD) $(fbcondecor_helper_OBJECTS) -+fbcondecor_helper: $(fbcondecor_helper_LDADD) $(fbcondecor_helper_OBJECTS) $(lib_LTLIBRARIES) - @$(call infmsg,LD,$@) - $(Q)$(MKDIR_P) $(@D) -- $(Q)$(KLCC) $(fbcondecor_helper_CFLAGS) $(fbcondecor_helper_LDFLAGS) $+ $(fbcondecor_helper_LDADD) -o $@ -+ $(Q)$(KLCC) $(fbcondecor_helper_CFLAGS) $(fbcondecor_helper_LDFLAGS) $(fbcondecor_helper_OBJECTS) $(fbcondecor_helper_LDADD) -o $@ - $(Q)$(STRIP) $@ - - # Override automake's generation of target rules for building fbcondecor_helper object files. - diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-nondefault-runlevel.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-nondefault-runlevel.patch deleted file mode 100644 index f395eca3a6d2..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-nondefault-runlevel.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 6f9aa3a3bc11e539613facf3caba5dcdb43c0117 -Author: Michał Januszewski <spock@gentoo.org> -Date: Sun Nov 22 20:56:47 2009 +0100 - - gentoo: make sure the splash daemon works when boot goes through a named runlevel other than default - -diff --git a/gentoo/splash.c b/gentoo/splash.c -index d831d0c..4b9a5b9 100644 ---- a/gentoo/splash.c -+++ b/gentoo/splash.c -@@ -777,10 +777,12 @@ int rc_plugin_hook(RC_HOOK hook, const char *name) - hook != RC_HOOK_RUNLEVEL_START_OUT) - goto exit; - } else { -+ int pid; -+ - /* We're starting/stopping a runlevel. Check whether we're - * actually booting/rebooting. */ - if (rc_runlevel_starting() && strcmp(runlev, bootlevel) && -- strcmp(runlev, defaultlevel) && strcmp(runlev, RC_LEVEL_SYSINIT)) -+ strcmp(runlev, RC_LEVEL_SYSINIT) && fbsplash_check_daemon(&pid)) - goto exit; - - if (rc_runlevel_stopping() && strcmp(runlev, bootlevel) && diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-effects.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-effects.patch deleted file mode 100644 index ede28b05bdaf..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-effects.patch +++ /dev/null @@ -1,55 +0,0 @@ -commit 7cf5fd02bbc6422ddbc9af7185cc47657148deb0 -Author: Michał Januszewski <spock@gentoo.org> -Date: Sun Apr 4 16:19:40 2010 +0200 - - gentoo: only enable the effects that are actually selected. - -diff --git a/gentoo/splash.c b/gentoo/splash.c -index 4b9a5b9..5220571 100644 ---- a/gentoo/splash.c -+++ b/gentoo/splash.c -@@ -660,7 +660,7 @@ static int splash_start(const char *runlevel) - (config->type == fbspl_reboot) ? "reboot" : ((config->type == fbspl_shutdown) ? "shutdown" : "bootup"), - (config->kdmode == KD_GRAPHICS) ? "--kdgraphics" : "", - (config->textbox_visible) ? "--textbox" : "", -- (config->effects & (FBSPL_EFF_FADEOUT | FBSPL_EFF_FADEIN)) ? "--effects=fadeout,fadein" : -+ ((config->effects & (FBSPL_EFF_FADEOUT | FBSPL_EFF_FADEIN)) == (FBSPL_EFF_FADEOUT | FBSPL_EFF_FADEIN)) ? "--effects=fadeout,fadein" : - ((config->effects & FBSPL_EFF_FADEOUT) ? "--effects=fadeout" : - ((config->effects & FBSPL_EFF_FADEIN) ? "--effects=fadein" : ""))); - -@@ -716,11 +716,7 @@ static int splash_stop(const char *runlevel) - - /* If we don't get a runlevel argument, then we're being executed - * because of a rc-abort event and we don't save any data. */ -- if (runlevel == NULL) { -- return fbsplash_cache_cleanup(NULL); -- } else { -- return fbsplash_cache_cleanup(save); -- } -+ return fbsplash_cache_cleanup(save); - } - - int rc_plugin_hook(RC_HOOK hook, const char *name) - -commit d711147fc835cf408a9a4e7432fc565a6b952183 -Author: Michał Januszewski <spock@gentoo.org> -Date: Sun Apr 4 16:57:23 2010 +0200 - - gentoo: add some comments in splash.conf - -diff --git a/gentoo/splash.conf b/gentoo/splash.conf -index 4cf0a32..f056382 100644 ---- a/gentoo/splash.conf -+++ b/gentoo/splash.conf -@@ -21,7 +21,10 @@ SPLASH_TEXTBOX="no" - SPLASH_AUTOVERBOSE="0" - - # Name of the boot service starting X. Useful in cases when X is started --# by a custom initscript, other than the usual 'xdm'. -+# by a custom initscript, other than the usual 'xdm'. If you are using a -+# custom X initscript and do not set this variable correctly, do not be -+# surprised if you end up at tty1 at the end of the boot process (instead of -+# in an X session). - # SPLASH_XSERVICE="xdm" - - ######################################################################### diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch deleted file mode 100644 index dcb1ef99440c..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit ae4b5cc9c2d904e18db51876d9bd292504714600 -Author: Michał Januszewski <spock@gentoo.org> -Date: Mon Apr 6 20:59:48 2009 +0200 - - Prevent umounting of theme directories. - - Some themes dynamically modify themselves during boot. In order to be - able to do that, they mount a tmpfs in their main directory. Prevent - openrc from umounting this directory when rebooting. - -diff --git a/gentoo/splash.c b/gentoo/splash.c -index 048e0ec..d831d0c 100644 ---- a/gentoo/splash.c -+++ b/gentoo/splash.c -@@ -968,10 +968,10 @@ do_start: - if (name && !strcmp(name, "localmount")) { - char *umounts = getenv("RC_NO_UMOUNTS"); - -- if (umounts) -- fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s:%s", umounts, FBSPLASH_CACHEDIR); -- else -- fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s", FBSPLASH_CACHEDIR); -+ if (umounts) -+ fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s:" FBSPLASH_CACHEDIR ":/etc/splash/%s", umounts, config->theme); -+ else -+ fprintf(rc_environ_fd, "RC_NO_UMOUNTS=" FBSPLASH_CACHEDIR ":/etc/splash/%s", config->theme); - } - i = splash_svc_handle(name, "svc_stop", false); - break; diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch deleted file mode 100644 index ad5aab914638..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 7077483874a842c607d6e877696891ba4d5f1dd7 -Author: Michał Januszewski <spock@gentoo.org> -Date: Sat Oct 9 21:07:37 2010 +0200 - - Fix a bug in splash-functions.sh. - - This problem was reported in Gentoo bug #339767. - -diff --git a/core/scripts/splash-functions.sh.in b/core/scripts/splash-functions.sh.in -index 1a89486..2c39c6a 100644 ---- a/core/scripts/splash-functions.sh.in -+++ b/core/scripts/splash-functions.sh.in -@@ -341,7 +341,7 @@ splash_comm_send() { - - # Returns the current splash mode. - splash_get_mode() { -- local ctty="${spl_bindir}/fgconsole" -+ local ctty="$({spl_bindir}/fgconsole)" - local mode="$(${spl_util})" - - if [ "${mode}" = "silent" ]; then diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_geninitramfs.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_geninitramfs.patch deleted file mode 100644 index c7e0cd26bc4e..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_geninitramfs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/core/scripts/splash_geninitramfs.in b/core/scripts/splash_geninitramfs.in -index 9d75d21..ff9b75b 100644 ---- a/core/scripts/splash_geninitramfs.in -+++ b/core/scripts/splash_geninitramfs.in -@@ -149,7 +149,7 @@ if [ "$mode" == "a" ]; then - fi - - printv "o Creating directory structure.." --mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,lib/splash/proc,root,sbin,lib/splash/sys} -+mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,@libdir@/splash/proc,root,sbin,@libdir@/splash/sys} - - if [ $EUID == 0 ]; then - [[ ! -e "${imgdir}/dev/null" ]] && mknod "${imgdir}/dev/null" c 1 3 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch deleted file mode 100644 index a3566bdaf07f..000000000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naurp splashutils-1.5.4.3-orig//scripts/splash-functions.sh.in splashutils-1.5.4.3/scripts/splash-functions.sh.in ---- splashutils-1.5.4.3-orig//scripts/splash-functions.sh.in 2010-10-09 21:44:39.127691474 +0200 -+++ splashutils-1.5.4.3/scripts/splash-functions.sh.in 2010-10-09 21:44:54.678690080 +0200 -@@ -26,7 +26,7 @@ export spl_cachedir="@libdir@/splash/cac - export spl_tmpdir="@libdir@/splash/tmp" - export spl_fifo="${spl_cachedir}/.splash" - export spl_pidfile="${spl_cachedir}/daemon.pid" --export spl_util="@bindir@/splash_util.static" -+export spl_util="@sbindir@/splash_util.static" - export spl_daemon="@sbindir@/fbsplashd.static" - export spl_decor="@sbindir@/fbcondecor_ctl.static" - export spl_bindir="@libdir@/splash/bin" -diff -Naurp splashutils-1.5.4.3-orig//src/Makefile.am splashutils-1.5.4.3/src/Makefile.am ---- splashutils-1.5.4.3-orig//src/Makefile.am 2010-10-09 21:44:39.121691920 +0200 -+++ splashutils-1.5.4.3/src/Makefile.am 2010-10-09 21:45:10.934689775 +0200 -@@ -166,7 +166,7 @@ if CONFIG_FBCON_DECOR - sbin_PROGRAMS += fbcondecor_ctl - endif - sbin_PROGRAMS += fbsplashd --bin_PROGRAMS += splash_util -+sbin_PROGRAMS += fbsplashd splash_util - eexecsbin_PROGRAMS += fbsplashctl - - fbcondecor_ctl_SOURCES = fbcon_decor_ctl.c fbcon_decor.h ../include/console_decor.h ../include/fbcondecor.h common.h fbsplash.h diff --git a/media-gfx/splashutils/files/splashutils-openrc-0.4-fix.patch b/media-gfx/splashutils/files/splashutils-openrc-0.4-fix.patch deleted file mode 100644 index bc7b6ee05362..000000000000 --- a/media-gfx/splashutils/files/splashutils-openrc-0.4-fix.patch +++ /dev/null @@ -1,74 +0,0 @@ -commit a58099249acdce1fbdab19f5dfea0704c4c545f2 -Author: Michał Januszewski <spock@gentoo.org> -Date: Sun Dec 28 13:32:16 2008 +0100 - - gentoo: make the splash plugin work with OpenRC 0.4.* - -diff --git a/gentoo/splash.c b/gentoo/splash.c -index 26d0fa4..b6fa774 100644 ---- a/gentoo/splash.c -+++ b/gentoo/splash.c -@@ -593,7 +593,7 @@ static int splash_start(const char *runlevel) - - /* Get a list of services that we'll have to handle. */ - /* We're rebooting/shutting down. */ -- if (!strcmp(runlevel, RC_LEVEL_SHUTDOWN) || !strcmp(runlevel, RC_LEVEL_REBOOT)) { -+ if (!strcmp(runlevel, RC_LEVEL_SHUTDOWN)) { - if ((err = fbsplash_cache_prep())) - return err; - splash_svcs_stop(runlevel); -@@ -690,10 +690,14 @@ int rc_plugin_hook(RC_HOOK hook, const char *name) - int retval = 0; - - runlev = rc_runlevel_get(); -- if (!strcmp(runlev, RC_LEVEL_REBOOT)) -- type = fbspl_reboot; -- else if (!strcmp(runlev, RC_LEVEL_SHUTDOWN)) -- type = fbspl_shutdown; -+ if (!strcmp(runlev, RC_LEVEL_SHUTDOWN)) { -+ char *t = getenv("RUNLEVEL"); -+ if (t && !strcmp(t, "6")) { -+ type = fbspl_reboot; -+ } else { -+ type = fbspl_shutdown; -+ } -+ } - - /* Get boot and default levels from env variables exported by RC. - * If unavailable, use the default ones. */ -@@ -716,7 +720,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name) - list = rc_stringlist_new(); - get_list_fp(list, fp); - TAILQ_FOREACH(s, list, entries) -- rc_service_mark(s->value, RC_SERVICE_COLDPLUGGED); -+ rc_service_mark(s->value, RC_SERVICE_HOTPLUGGED); - pclose(fp); - rc_stringlist_free(list); - } -@@ -739,7 +743,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name) - goto exit; - - if (rc_runlevel_stopping() && strcmp(runlev, bootlevel) && -- strcmp(runlev, RC_LEVEL_REBOOT) && strcmp(runlev, RC_LEVEL_SHUTDOWN)) -+ strcmp(runlev, RC_LEVEL_SHUTDOWN)) - goto exit; - } - -@@ -763,7 +767,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name) - case RC_HOOK_RUNLEVEL_STOP_IN: - /* Start the splash daemon on reboot. The theme hook is called - * from splash_start(). */ -- if (strcmp(name, RC_LEVEL_REBOOT) == 0 || strcmp(name, RC_LEVEL_SHUTDOWN) == 0) { -+ if (strcmp(name, RC_LEVEL_SHUTDOWN) == 0) { - if ((i = splash_start(name))) { - fbsplash_set_verbose(0); - retval= i; -@@ -788,7 +792,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name) - case RC_HOOK_RUNLEVEL_STOP_OUT: - /* Make sure the progress indicator reaches 100%, even if - * something went wrong along the way. */ -- if (strcmp(name, RC_LEVEL_REBOOT) == 0 || strcmp(name, RC_LEVEL_SHUTDOWN) == 0) { -+ if (strcmp(name, RC_LEVEL_SHUTDOWN) == 0) { - config->verbosity = FBSPL_VERB_QUIET; - i = fbsplash_check_daemon(&pid_daemon); - config->verbosity = FBSPL_VERB_NORMAL; diff --git a/media-gfx/splashutils/files/splashutils-openrc-0.4.3-runlevel-fix.patch b/media-gfx/splashutils/files/splashutils-openrc-0.4.3-runlevel-fix.patch deleted file mode 100644 index 36d4ef02d697..000000000000 --- a/media-gfx/splashutils/files/splashutils-openrc-0.4.3-runlevel-fix.patch +++ /dev/null @@ -1,99 +0,0 @@ -commit 4bb63f7fb23b11591e2984ce87d4f36d80e29d65 -Author: Michał Januszewski <spock@gentoo.org> -Date: Wed Mar 25 22:26:04 2009 +0100 - - gentoo: export the sysvinit RUNLEVEL variable for compatibility reasons - - OpenRC 0.4.3+ no longer exports some sysvinit variables, including - RUNLEVEL. In order to avoid breaking themes and scripts which still - rely on this variable being present, we compute a suitable RUNLEVEL - value using the data available in OpenRC and then export it in - splash_call(). - -diff --git a/gentoo/splash.c b/gentoo/splash.c -index 726315f..048e0ec 100644 ---- a/gentoo/splash.c -+++ b/gentoo/splash.c -@@ -41,7 +41,7 @@ - #define SPLASH_CMD "export SPLASH_XRES='%d'; export SPLASH_YRES='%d';" \ - "export SOFTLEVEL='%s'; export BOOTLEVEL='%s';" \ - "export DEFAULTLEVEL='%s'; export svcdir=${RC_SVCDIR};" \ -- ". /sbin/splash-functions.sh; %s %s %s" -+ "export RUNLEVEL='%s'; . /sbin/splash-functions.sh; %s %s %s" - - static char *bootlevel = NULL; - static char *defaultlevel = NULL; -@@ -260,11 +260,32 @@ static int splash_config_gentoo(fbspl_cfg_t *cfg, fbspl_type_t type) - return 0; - } - -+static const char *splash_sysvinit_runlevel(const char *runlevel) -+{ -+ const char *runlev = runlevel ? runlevel : rc_runlevel_get(); -+ -+ if (!strcmp(runlev, RC_LEVEL_SHUTDOWN)) { -+ char *t = getenv("RC_REBOOT"); -+ if (t && !strcmp(t, "YES")) { -+ return "6"; -+ } else { -+ return "0"; -+ } -+ } else if (!strcmp(runlev, RC_LEVEL_SYSINIT)) { -+ return "S"; -+ } else if (!strcmp(runlev, RC_LEVEL_SINGLE)) { -+ return "1"; -+ } else { -+ return "3"; -+ } -+} -+ -+ - /* - * Call a function from /sbin/splash-functions.sh. - * This is rather slow, so use it only when really necessary. - */ --static int splash_call(const char *cmd, const char *arg1, const char *arg2) -+static int splash_call(const char *cmd, const char *arg1, const char *arg2, const char *runlevel) - { - char *c; - int l; -@@ -285,7 +306,8 @@ static int splash_call(const char *cmd, const char *arg1, const char *arg2) - - snprintf(c, l, SPLASH_CMD, xres, yres, - arg1 ? (strcmp(arg1, RC_LEVEL_SYSINIT) == 0 ? bootlevel : soft) : soft, -- bootlevel, defaultlevel, cmd, arg1 ? arg1 : "", arg2 ? arg2 : ""); -+ bootlevel, defaultlevel, runlevel, -+ cmd, arg1 ? arg1 : "", arg2 ? arg2 : ""); - l = system(c); - free(c); - return l; -@@ -316,15 +338,16 @@ static int splash_theme_hook(const char *name, const char *type, const char *arg - } - - if (!strcmp(name, "rc_init") || !strcmp(name, "rc_exit")) { -- l = splash_call(buf, arg1, getenv("RUNLEVEL")); -+ const char *t = splash_sysvinit_runlevel(arg1); -+ l = splash_call(buf, arg1, t, t); - } else if (!strcmp(name, "svc_started") || !strcmp(name, "svc_stopped")) { - /* - * Set the 2nd parameter to 0 so that we don't break themes using the - * legacy interface in which these events contained an error code. - */ -- l = splash_call(buf, arg1, "0"); -+ l = splash_call(buf, arg1, "0", splash_sysvinit_runlevel(NULL)); - } else { -- l = splash_call(buf, arg1, NULL); -+ l = splash_call(buf, arg1, NULL, splash_sysvinit_runlevel(NULL)); - } - free(buf); - return l; -@@ -710,8 +733,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name) - - runlev = rc_runlevel_get(); - if (!strcmp(runlev, RC_LEVEL_SHUTDOWN)) { -- char *t = getenv("RUNLEVEL"); -- if (t && !strcmp(t, "6")) { -+ if (!strcmp(splash_sysvinit_runlevel(NULL), "6")) { - type = fbspl_reboot; - } else { - type = fbspl_shutdown; diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild deleted file mode 100644 index 15f5c86f586a..000000000000 --- a/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild,v 1.11 2014/12/30 22:22:01 dilfridge Exp $ - -EAPI=4 - -inherit autotools eutils multilib toolchain-funcs - -MISCSPLASH="miscsplashutils-0.1.8" -GENTOOSPLASH="splashutils-gentoo-1.0.17" -V_JPEG="8a" -V_PNG="1.4.3" -V_ZLIB="1.2.3" -V_FT="2.3.12" - -ZLIBSRC="libs/zlib-${V_ZLIB}" -LPNGSRC="libs/libpng-${V_PNG}" -JPEGSRC="libs/jpeg-${V_JPEG}" -FT2SRC="libs/freetype-${V_FT}" - -RESTRICT="test" -IUSE="hardened +png +truetype gpm fbcondecor" - -DESCRIPTION="Framebuffer splash utilities" -HOMEPAGE="http://fbsplash.berlios.de" -SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2 - mirror://berlios/fbsplash/${GENTOOSPLASH}.tar.bz2 - mirror://gentoo/${MISCSPLASH}.tar.bz2 - mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2 - ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz - mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2 - http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -RDEPEND="gpm? ( sys-libs/gpm[static-libs(+)] ) - truetype? ( - >=media-libs/freetype-2[static-libs] - app-arch/bzip2[static-libs(+)] - sys-libs/zlib[static-libs(+)] - ) - png? ( - >=media-libs/libpng-1.4.3[static-libs] - sys-libs/zlib[static-libs(+)] - ) - virtual/jpeg:0[static-libs] - >=sys-apps/baselayout-1.9.4-r5 - app-arch/cpio - media-gfx/fbgrab - !sys-apps/lcdsplash" -DEPEND="${RDEPEND} - >=dev-libs/klibc-1.5 - virtual/pkgconfig" - -S="${WORKDIR}/${P/_/-}" -SG="${WORKDIR}/${GENTOOSPLASH}" -SM="${WORKDIR}/${MISCSPLASH}" - -pkg_setup() { - if use hardened; then - ewarn "Due to problems with klibc, it is currently impossible to compile splashutils" - ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with" - ewarn "-fno-stack-protector. Hardened GCC features will not be used while building" - ewarn "the splash kernel helper." - fi -} - -src_prepare() { - mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs" - # We need to delete the Makefile and let it be rebuilt when splashutils - # is being configured. Either that, or we end up with a segfaulting kernel - # helper. - rm "${S}/libs/zlib-${V_ZLIB}/Makefile" - - cd "${SG}" - epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch" - - if use truetype ; then - cd "${SM}" - epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch" - fi - - cd "${S}" - ln -sf "${S}/src" "${WORKDIR}/core" - - epatch "${FILESDIR}/${P}-bzip2.patch" - - if ! tc-is-cross-compiler && \ - has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then - ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile" - ewarn "splashutils, you're on your own, as this configuration is not supported." - else - # This should make splashutils compile on systems with hardened GCC. - sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in" - fi - - if ! use truetype ; then - sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile" - fi - - # Latest version of klibc defined its own version of ferror, so there is - # not need for the hack in klibc_compat.h - if has_version ">=dev-libs/klibc-1.5.20"; then - echo > "libs/klibc_compat.h" - fi - - rm -f m4/* - eautoreconf -} - -src_configure() { - tc-export CC - cd "${SM}" - emake CC="${CC}" LIB=$(get_libdir) STRIP=true - - cd "${S}" - econf \ - $(use_with png) \ - --without-mng \ - $(use_with gpm) \ - $(use_with truetype ttf) \ - $(use_with truetype ttf-kernel) \ - $(use_enable fbcondecor) \ - --docdir=/usr/share/doc/${PF} \ - --with-freetype2-src=${FT2SRC} \ - --with-jpeg-src=${JPEGSRC} \ - --with-lpng-src=${LPNGSRC} \ - --with-zlib-src=${ZLIBSRC} \ - --with-essential-libdir=/$(get_libdir) -} - -src_compile() { - emake CC="${CC}" STRIP="true" - - if has_version ">=sys-apps/baselayout-1.13.99"; then - cd "${SG}" - emake LIB=$(get_libdir) - fi -} - -src_install() { - local LIB=$(get_libdir) - - cd "${SM}" - make DESTDIR="${D}" LIB=${LIB} install - - cd "${S}" - make DESTDIR="${D}" STRIP="true" install - - mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/ - gen_usr_ldscript libfbsplash.so - - echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash - doenvd 99splash - - if use fbcondecor ; then - newinitd "${SG}"/init-fbcondecor fbcondecor - newconfd "${SG}"/fbcondecor.conf fbcondecor - fi - newconfd "${SG}"/splash.conf splash - - insinto /usr/share/${PN} - doins "${SG}"/initrd.splash - - insinto /etc/splash - doins "${SM}"/fbtruetype/luxisri.ttf - - if has_version ">=sys-apps/baselayout-1.13.99"; then - cd "${SG}" - make DESTDIR="${D}" LIB=${LIB} install - else - cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/ - fi - - sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh - keepdir /${LIB}/splash/{tmp,cache,bin,sys} - dosym /${LIB}/splash/bin/fbres /sbin/fbres -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-1.0" - previous_less_than_1_0=$? - - has_version "<${CATEGORY}/${PN}-1.5.3" - previous_less_than_1_5_3=$? -} - -pkg_postinst() { - if has_version sys-fs/devfsd || ! has_version virtual/udev ; then - elog "This package has been designed with udev in mind. Other solutions, such as" - elog "devfs or a static /dev tree might work, but are generally discouraged and" - elog "not supported. If you decide to switch to udev, you might want to have a" - elog "look at 'The Gentoo udev Guide', which can be found at" - elog " http://www.gentoo.org/doc/en/udev-guide.xml" - elog "" - fi - - if [[ $previous_less_than_1_0 = 0 ]] ; then - elog "Since you are upgrading from a pre-1.0 version, please make sure that you" - elog "rebuild your initrds. You can use the splash_geninitramfs script to do that." - elog "" - fi - - if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then - elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch" - elog "is optional and dependent on the the 'fbcondecor' USE flag. If you wish" - elog "to use fbcondecor, run:" - elog " echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use" - elog "and re-emerge splashutils." - fi - - if ! test -f /proc/cmdline || - ! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then - elog "It is required that you add 'console=tty1' to your kernel" - elog "command line parameters." - elog "" - elog "After these modifications, the relevant part of the kernel command" - elog "line might look like:" - elog " splash=silent,fadein,theme:emergence console=tty1" - elog "" - fi - - if ! has_version 'media-gfx/splash-themes-livecd' && - ! has_version 'media-gfx/splash-themes-gentoo'; then - elog "The sample Gentoo themes (emergence, gentoo) have been removed from the" - elog "core splashutils package. To get some themes you might want to emerge:" - elog " media-gfx/splash-themes-livecd" - elog " media-gfx/splash-themes-gentoo" - fi - - elog "Please note that the 'fbsplash' kernel patch has now been renamed to" - elog "'fbcondecor'. Accordingly, the old 'splash' initscript is now called" - elog "'fbcondecor'. Make sure you update your system. See:" - elog " http://dev.gentoo.org/~spock/projects/fbcondecor/#history" - elog "for further info about the name changes." - elog "" - elog "Also note that splash_util has now been split into splash_util, fbsplashd" - elog "and fbcondecor_ctl." -} diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild deleted file mode 100644 index 028b99717ce0..000000000000 --- a/media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild,v 1.5 2014/12/30 22:22:01 dilfridge Exp $ - -EAPI=5 -inherit autotools eutils multilib toolchain-funcs - -MISCSPLASH="miscsplashutils-0.1.8" -GENTOOSPLASH="splashutils-gentoo-1.0.17" -V_JPEG="8a" -V_PNG="1.4.3" -V_ZLIB="1.2.3" -V_FT="2.3.12" - -ZLIBSRC="libs/zlib-${V_ZLIB}" -LPNGSRC="libs/libpng-${V_PNG}" -JPEGSRC="libs/jpeg-${V_JPEG}" -FT2SRC="libs/freetype-${V_FT}" - -RESTRICT="test" -IUSE="hardened +png +truetype gpm fbcondecor" - -DESCRIPTION="Framebuffer splash utilities" -HOMEPAGE="http://fbsplash.berlios.de" -SRC_URI=" - mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2 - mirror://berlios/fbsplash/${GENTOOSPLASH}.tar.bz2 - mirror://gentoo/${MISCSPLASH}.tar.bz2 - mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2 - ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz - mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2 - http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2 -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=" - gpm? ( sys-libs/gpm[static-libs(+)] ) - truetype? ( - >=media-libs/freetype-2[static-libs] - app-arch/bzip2[static-libs(+)] - sys-libs/zlib[static-libs(+)] - ) - png? ( - >=media-libs/libpng-1.4.3[static-libs] - sys-libs/zlib[static-libs(+)] - ) - virtual/jpeg:0[static-libs] - >=sys-apps/baselayout-1.9.4-r5 - app-arch/cpio - media-gfx/fbgrab - !sys-apps/lcdsplash" - -DEPEND="${RDEPEND} - >=dev-libs/klibc-1.5 - virtual/pkgconfig -" - -S="${WORKDIR}/${P/_/-}" -SG="${WORKDIR}/${GENTOOSPLASH}" -SM="${WORKDIR}/${MISCSPLASH}" - -pkg_setup() { - if use hardened; then - ewarn "Due to problems with klibc, it is currently impossible to compile splashutils" - ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with" - ewarn "-fno-stack-protector. Hardened GCC features will not be used while building" - ewarn "the splash kernel helper." - fi -} - -src_prepare() { - mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs" - - # We need to delete the Makefile and let it be rebuilt when splashutils - # is being configured. Either that, or we end up with a segfaulting kernel - # helper. - rm "${S}/libs/zlib-${V_ZLIB}/Makefile" - - cd "${SG}" - epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch" - - if use truetype ; then - cd "${SM}" - epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch" - fi - - cd "${S}" - ln -sf "${S}/src" "${WORKDIR}/core" - - epatch "${FILESDIR}/${P}-bzip2.patch" - epatch "${FILESDIR}/${P}-multi-keyboard.patch" - - if ! tc-is-cross-compiler && \ - has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then - ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile" - ewarn "splashutils, you're on your own, as this configuration is not supported." - else - # This should make splashutils compile on systems with hardened GCC. - sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in" - fi - - if ! use truetype ; then - sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile" - fi - - # Latest version of klibc defined its own version of ferror, so there is - # not need for the hack in klibc_compat.h - if has_version ">=dev-libs/klibc-1.5.20"; then - echo > "libs/klibc_compat.h" - fi - - rm -f m4/* - eautoreconf -} - -src_configure() { - tc-export CC - cd "${SM}" - emake CC="${CC}" LIB=$(get_libdir) STRIP=true - - cd "${S}" - econf \ - $(use_with png) \ - --without-mng \ - $(use_with gpm) \ - $(use_with truetype ttf) \ - $(use_with truetype ttf-kernel) \ - $(use_enable fbcondecor) \ - --docdir=/usr/share/doc/${PF} \ - --with-freetype2-src=${FT2SRC} \ - --with-jpeg-src=${JPEGSRC} \ - --with-lpng-src=${LPNGSRC} \ - --with-zlib-src=${ZLIBSRC} \ - --with-essential-libdir=/$(get_libdir) -} - -src_compile() { - emake CC="${CC}" STRIP="true" - - if has_version ">=sys-apps/baselayout-1.13.99"; then - cd "${SG}" - emake LIB=$(get_libdir) - fi -} - -src_install() { - local LIB=$(get_libdir) - - cd "${SM}" - emake DESTDIR="${D}" LIB=${LIB} install - - cd "${S}" - emake DESTDIR="${D}" STRIP="true" install - - mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/ - gen_usr_ldscript libfbsplash.so - - echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash - doenvd 99splash - - if use fbcondecor ; then - newinitd "${SG}"/init-fbcondecor fbcondecor - newconfd "${SG}"/fbcondecor.conf fbcondecor - fi - newconfd "${SG}"/splash.conf splash - - insinto /usr/share/${PN} - doins "${SG}"/initrd.splash - - insinto /etc/splash - doins "${SM}"/fbtruetype/luxisri.ttf - - if has_version ">=sys-apps/baselayout-1.13.99"; then - cd "${SG}" - make DESTDIR="${D}" LIB=${LIB} install - else - cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/ - fi - - sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh - keepdir /${LIB}/splash/{tmp,cache,bin,sys} - dosym /${LIB}/splash/bin/fbres /sbin/fbres -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-1.0" - previous_less_than_1_0=$? - - has_version "<${CATEGORY}/${PN}-1.5.3" - previous_less_than_1_5_3=$? -} - -pkg_postinst() { - if has_version sys-fs/devfsd || ! has_version virtual/udev ; then - elog "This package has been designed with udev in mind. Other solutions, such as" - elog "devfs or a static /dev tree might work, but are generally discouraged and" - elog "not supported. If you decide to switch to udev, you might want to have a" - elog "look at 'The Gentoo udev Guide', which can be found at" - elog " http://www.gentoo.org/doc/en/udev-guide.xml" - elog "" - fi - - if [[ $previous_less_than_1_0 = 0 ]] ; then - elog "Since you are upgrading from a pre-1.0 version, please make sure that you" - elog "rebuild your initrds. You can use the splash_geninitramfs script to do that." - elog "" - fi - - if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then - elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch" - elog "is optional and dependent on the the 'fbcondecor' USE flag. If you wish" - elog "to use fbcondecor, run:" - elog " echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use" - elog "and re-emerge splashutils." - fi - - if ! test -f /proc/cmdline || - ! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then - elog "It is required that you add 'console=tty1' to your kernel" - elog "command line parameters." - elog "" - elog "After these modifications, the relevant part of the kernel command" - elog "line might look like:" - elog " splash=silent,fadein,theme:emergence console=tty1" - elog "" - fi - - if ! has_version 'media-gfx/splash-themes-livecd' && - ! has_version 'media-gfx/splash-themes-gentoo'; then - elog "The sample Gentoo themes (emergence, gentoo) have been removed from the" - elog "core splashutils package. To get some themes you might want to emerge:" - elog " media-gfx/splash-themes-livecd" - elog " media-gfx/splash-themes-gentoo" - fi -} |