diff options
author | Yixun Lan <dlan@gentoo.org> | 2015-03-20 14:47:48 +0000 |
---|---|---|
committer | Yixun Lan <dlan@gentoo.org> | 2015-03-20 14:47:48 +0000 |
commit | 2114e0090f6b6ba5be158cf1a9f326d808f273b3 (patch) | |
tree | 6f3022714535cac7a651dc1ce7bfea5dedce1806 /sys-boot | |
parent | Fix ebuild layout (diff) | |
download | historical-2114e0090f6b6ba5be158cf1a9f326d808f273b3.tar.gz historical-2114e0090f6b6ba5be158cf1a9f326d808f273b3.tar.bz2 historical-2114e0090f6b6ba5be158cf1a9f326d808f273b3.zip |
version bump, update to gtk3 dep, add systemdunit patch, proxy for Enrico Tagliavini
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55
Diffstat (limited to 'sys-boot')
-rw-r--r-- | sys-boot/plymouth/ChangeLog | 11 | ||||
-rw-r--r-- | sys-boot/plymouth/Manifest | 31 | ||||
-rw-r--r-- | sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch | 18 | ||||
-rw-r--r-- | sys-boot/plymouth/plymouth-0.9.2.ebuild | 101 | ||||
-rw-r--r-- | sys-boot/plymouth/plymouth-9999.ebuild | 8 |
5 files changed, 153 insertions, 16 deletions
diff --git a/sys-boot/plymouth/ChangeLog b/sys-boot/plymouth/ChangeLog index 4116a5c6a6a6..ce228a7ff9d5 100644 --- a/sys-boot/plymouth/ChangeLog +++ b/sys-boot/plymouth/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-boot/plymouth -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.52 2014/07/06 18:16:51 maksbotan Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.53 2015/03/20 14:47:36 dlan Exp $ + +*plymouth-0.9.2 (20 Mar 2015) + + 20 Mar 2015; Yixun Lan <dlan@gentoo.org> +plymouth-0.9.2.ebuild, + plymouth-9999.ebuild, +files/0.9.2-systemdsystemunitdir.patch: + version bump, update to gtk3 dep, add systemdunit patch, proxy for Enrico + Tagliavini *plymouth-0.9.0 (06 Jul 2014) *plymouth-9999 (06 Jul 2014) diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest index fe75d97d63d7..9d56d4334c69 100644 --- a/sys-boot/plymouth/Manifest +++ b/sys-boot/plymouth/Manifest @@ -5,23 +5,34 @@ AUX 0.8.3-drm-reduce-minimum-build-requirements.patch 16071 SHA256 4a953c22c211f AUX 0.8.3-gentoo-fb-path.patch 804 SHA256 5496471c4ace51561054aadce35b7772ac65b54ace04329386d2b2dfc1ef8c8f SHA512 c3a06a0420bd629a55575651dc84745202baa539e55f8723eef4d87f58861776d3c4bc566c5d9d14b267ac32c484a2281416c60a5e2bf9c4b77972d43e44a0c4 WHIRLPOOL c0961c703a38f20e6ba0acbc162712c0c11f1b813ff68c171988b8e5643f5e46e55847c668f82c789e4d898f51699e4ad4caae9824ebbae53f4b512bd9b8c7a2 AUX 0.8.3-image-replace-deprecated-libpng-function.patch 962 SHA256 37df9d046cfba685c6447a1f9360c941bf7b9e8dc80970d06486054d34c6fd86 SHA512 dbf4418d1a9dddcfcdd35a51cabd181dc04424f0d4c74962a9e865a9856531d6bbb74bb4b8870ae7fe571f03f55c853319f8c5374ff3994b9da8a2738bd7520c WHIRLPOOL 262d338d7d7ab8ec44c85fcf62324455ad59ffbc7778757ff922369900dad9dd0f6c70f6d3658753eeca00ce50b9a7c18111ad6ddefb5c4d5307d2a1c8856964 AUX 0.8.8-initrd-binaries-paths.patch 1371 SHA256 ee9f981240f0a6de5159ee6f6c8a1110aefce7ccec93944bbd209102346c80e2 SHA512 9400b7d9b62c15acd4c9af9ce695e43117719ba311c26af773bd6a878db81458d5e3f2f89b15f9f85e78d0540fd717985f7efafb0113150aa15f25d2af947a63 WHIRLPOOL cd14830ad0617a4b70937be98ef84a89deae39d3671b058ed172f948e4e3d740535b84d0169b35cb31cbce9a12f151f4d8d7e5e8bfbb9ce58b6464bb1774d215 +AUX 0.9.2-systemdsystemunitdir.patch 798 SHA256 634295951d39df12cc1e282f175ed992a0a559640b1ba6c54539d7b03e614f32 SHA512 5855dfdbd2031b2b0c91991261eda01f310f55ef5526d6a29ae77ae7a6fa1d9431201f05db4cc0ae9f2f4b31575c19316e36a8d4fd9596505fbe0d8d8b847ac7 WHIRLPOOL cd898e9c85469423fdba0de9d893841726b9b360ffea0677f9a9629f5973f7ac28b5dfeeac3c8692a74dc5d307e44b74869e9b74fdcc1b8036e16c240a4a23d0 DIST gentoo-logo.png 14501 SHA256 79ebc1d66693371a90e218ad421cfed05066b51a6645bd967bb7da356a0881fa SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c WHIRLPOOL 65496223badb9a96cc72ba6a2432860af0756eea57f67946d2466ff1c3c1171c84568c502aa576613b77767c41cf251856728b509c72003567d4cebd1943375e DIST plymouth-0.8.8.tar.bz2 1143549 SHA256 1bada4e1d3a31a5a99adc2db83f5452d9818839cda51a6e430f044f6281d759b SHA512 97a20a8622c7ea51000e9b6d88a25fd84d7001fb2727527a72344b555f389c74954bd0be0bffd9cc9175b5c5a0d28e95af058fce79ec7531f736619ee74d8d94 WHIRLPOOL badb44a6c1eb004772e67cfe3cda601d22590d813ebd4bce5f0fcb325c445246916ba30e083c6aa98b73b460ddf4f2caf9bf2727d22bbbc5414f11a5cf0e5ddf DIST plymouth-0.9.0.tar.bz2 1159218 SHA256 d3e22e750a8a83de7377e9fa88975f146f875bbd030055411a2faf74c2e6cd4d SHA512 046e7fb20d3a65cc2b8b378026fae6619417557502426d944e4f06078eacfa37cb5fcf886d8bdb598921bbef87ce3ec92daa16a57075a180d5f427443100c232 WHIRLPOOL 3b2e327a02c18cd436f895aa38719acd07ed06f3cbd846181190144784325e8561c1ebd97516beaa396733e9981e76f3029dc29b27f3ae32f646c087529ada0d +DIST plymouth-0.9.2.tar.bz2 1231336 SHA256 2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f SHA512 89356eb8326504fbf3155de262ce15de0847f0a0e6d157d873cf1dea9af464a6cb9e11d7143ee9a595b217a2487060b5835eba5ac142c3cd6d66689deb272e60 WHIRLPOOL 5f9e662dec633bb606cf4246611b442a0eb9eaa92942b37c53d1c48b6ca8ef96c5f4330d574b82de6a026ca175a770c1a45f52c7809c80d026126d805e707eba EBUILD plymouth-0.8.8-r4.ebuild 2767 SHA256 16bf4b6f9e433fa95914e02b97da1e9e0d2a179ee03a43cb5f2b454f0f0f794f SHA512 18d7e6e6ea691eec0c96463d551ae6ba84576e2dcbcb84ef74854175cae420379b4cdaef1f456225399c77d4fc104cf342182ffa0a21eb6f9831b8e84d05c204 WHIRLPOOL c9ec9c5133ed01fd02bd80986a0d41e63f6732ca2d4dba4ddc35aa431b24ab2d6794637335c18f7d8b17ab21a2b07abd38a16b7a41bbcae03724f2df3295d27f EBUILD plymouth-0.8.8-r5.ebuild 2843 SHA256 b7435ec143131eb79c982eb1bb4e6de8f6cacbe7c0a47b2c4adef1858dcbf419 SHA512 8d4ca729ba17e9c4fc8fdea5f0f09cb3e76db1296bcf2a7a212b65110665ecf049851ed58a20cd98dbd62b04fd6500bc252fcfa8af54d2b3d5e0eae308267c69 WHIRLPOOL 054044da45ffda4a53745fe95223e4ecf20570cc68002a8e5034cd20bf53cff265dc4ad6c4fa99c691dbf590310894dfcf19b9db37a94d7cd6643bd0663283fd EBUILD plymouth-0.9.0.ebuild 2519 SHA256 894f1068ff9222f142c7e3dafb2dadb1fa8b8398970bd5c2fbc9daf1d8f39242 SHA512 2c96160ef86bbeced065b16e7954c0d88e25d32b723685356442faa2a6676013e7af879e4104590a2b8c4f4c7821d66606ebab20843f1e68fbdd536a93248130 WHIRLPOOL e5467208474f6e374d366ef74fa73a549140cabe0215af87dd907e5c894b1e2db5e7d1d29d088acaf1c01ed3d3b73894c1c597147ee52c52c6f2ef60a00f0ab5 -EBUILD plymouth-9999.ebuild 2518 SHA256 3e9fda7a34ac7fd0becb4def3ca98455a206e42afb5a5720f68c187d6e5abd3b SHA512 894db982c30ee8847189c309472ba30605ce4cf8adc35325dc0e09b8d7d7383d2b47ab7034fc130ac93959b806b1515e72def462f602cd05e89fcf3f8ae45b66 WHIRLPOOL 12118159aae198ef53659715d507404f89658a5bf1f0c365f0ebd6c6c224d86dd05d99beb17f8688f898ed0d441462012e45ad9fcc32e3bc0554bd89c9a04277 -MISC ChangeLog 10296 SHA256 c8603527257454c5e08f3a86fac4ffbe8dc452109086a86a7094a688bdfe4e67 SHA512 18f07c9a474748b481a94f0858ca982d3febcd3ae05778ca178425cf4a82e128d299ecf043603b2b1d589f633df2ca6ba985c1855bead7ff237093ad3ff60e6c WHIRLPOOL 7471adba0b9d4b28edd515d15b826b730b148292d47e8f89b4ea05a909f72b12119f1aa2181f642edb6cff178607eeffe87661df05f94b6a0a4a37b766fcc55d +EBUILD plymouth-0.9.2.ebuild 2604 SHA256 834b271c8f93199e07713fc880df8ba2384c69f23e561409238c0297de958c67 SHA512 f36a55d216f004e3b92fd7eb65a01378ef8cadc2d3c51d4a3f54065097f29ac013d4ad7840abb2bd9acdc012fb8688fd8a953a313deee5ad559a0cbea2aa1736 WHIRLPOOL 93e35795c74e53445a0338c51501016b03b8931a84d84c1eeced3451b9a62820d30e9da7df5ff6b4d74118325d91a557394685be009b5ba29c10dc106e20a0f2 +EBUILD plymouth-9999.ebuild 2515 SHA256 04118e9b6d0ca0eae76d24555901870ddb44a542bb8bc7e5dc569e473c2aa84e SHA512 6b82024134d7a79cc678b95037ae2295ec4aad90025ce0048bb35e662c4d015c65817b0bc7c567bd4c05ad87734c56c5044101e93df7589114ad07daf468a29f WHIRLPOOL 5e351182e75fa2dc5a5f508d0f41b37fbe84a430927c9da3205381a747a276e37542f7b933bb9f13de4710fce622db7e92ed3a09c31df65371df0a469faef054 +MISC ChangeLog 10544 SHA256 1e42382bdaf5fa53efdf389f360cfada021b92c267f28af814ac31ad21475599 SHA512 f8664d02298e458a9d36a488ad326b0aaac01b6b7455072db4d09f434eaefb09cc49ee4d269c9cceae4598f5955152b2d354eeaa4393c54f4a162f1a111b1fec WHIRLPOOL 85cf2965aad31d43f14e615341fc833bb46969ac370856e8c3aa4eda0ebcc04e80cae516cfddad50ecc5726ec03d32494876901784cec30a19527ab033ea6bea MISC metadata.xml 1061 SHA256 dcc87e1d3565267896b8ae74521002fcca80215b75a234852c1dbe1835412250 SHA512 ead1b3ff73ce874e9d31bc0b7ed0b60857b718bd52dbecba32c64a5666b6fc25945098d48be450be1025ebb8d4ae4d9120e308accc4b41b4f87366e2160c8e4f WHIRLPOOL eb302cf205855390ac171c3f35b635e6a610cc76b7b038a07e4726dd12400adce77ca456a7fd66bce8ea121fac5d42fd10cfae57fea1b22dedcf4781cd47cab1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQEcBAEBCAAGBQJTuZIdAAoJEAmJmMX429reeJwH/ivqFnv0HgBWEcxGd4yIGN9P -XHRzsGotf9fmZ7LGxGacmE4vYcWz7sHEBXC9l5n+CJYv0nNB/fE1z1xexNyZQoFh -m/n7TcqcpdlPx0s/lcVq/0kJvys6dxAHnkUChXO1mYHAawWN89rrbVwC7VJo1oXI -0tN5lNqPgjwUu35lq4gZaAu+Mqeb9tv8QkTcifTV8G1AIwZ9SwL+uvy1hErvihCy -VtWEdkS7EycOoSZ0Y8Z2QFRJJS7cKcRouoTZgygED6l2BuppwI47vCwmAvEY/dM9 -2pEXPAyO4SWPH4gV41RwQqhoFTdFDRaYRirXHsy+nw/nx6FGOUke8uWwSNSLWJ4= -=oLzn +iQJ8BAEBCABmBQJVDDMUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz +MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtBzQP/A0nIs/i6pneqPWO7ZNBF8x8 +N4uMkJYLMXxl8+YE0a+QM49UvmsLG1xF4TcnWDwDExTAhXeOZVFC6Ia9KHNs3csl +sMrii3LBxAoHW9tNDWzkUZo5JX+D2UFJQ+GdgWSA8PzMO1MTBCL2YrdrFNisIIvK +b5A8cOBZmoZqB+61uYaNdIjbUGyinufh1uGKnnPkINdMtRm326Y1qQxqU29YGpv3 +vOZvJfcEAkoSw8/Xm9lKNPOujXDvXepTRSQHetD3OQQvAVetqCdpkxn02qVJmQmA +1XHvnqrCLhyXC3ZjXbgout9sadu+e66elXDoCuHe6mc9OsRApnLL9cxfPpZB9qvd +w77a/Q+x891NXQqGK3fOQd4HfO/2lhx8PIGjULWZKUWNVf0yQbmAnl5PMGvsFo74 +W4CwkUdmtnyaA7O9Zxfn/FAy3Tp7GnY7wkOs8vmW7J6zqwR7KPVidn7FduhWi+Kl +S8GEVGLGMGBSBJnaeuKFoGglpQi+dXpWnao63oOlAtJ0Iw8qLF0B88FBbqBFH5nk +Y2EJbXV2XDrd3H/eUFKe4gOT7MdoXCxAB791RZ3Ui4HpDjaQK+pmqHIc+38ZBvSf +e2kiE6rG6UABsm8DDYJX/HQzi3+nX8PQNnjYUjB5GwYbva0vxJLjXlr4P8jRp9A+ +oIHv897v2MklgvkJ4wUP +=UZxE -----END PGP SIGNATURE----- diff --git a/sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch b/sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch new file mode 100644 index 000000000000..b5289244232a --- /dev/null +++ b/sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch @@ -0,0 +1,18 @@ +diff --git a/configure.ac b/configure.ac +index aad673e..592be5f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -122,7 +122,12 @@ AM_CONDITIONAL(ENABLE_SYSTEMD_INTEGRATION, [test "$enable_systemd_integration" = + + if test x$enable_systemd_integration = xyes; then + AC_DEFINE(PLY_ENABLE_SYSTEMD_INTEGRATION, 1, [Coordinate boot up with systemd]) +- SYSTEMD_UNIT_DIR=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) ++ AC_ARG_WITH([systemdsystemunitdir], AC_HELP_STRING([--with-systemdsystemunitdir=DIR], ++ [path to systemd service directory]), [path_systemdunit=${withval}], ++ [path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"]) ++ if (test -n "${path_systemdunit}"); then ++ SYSTEMD_UNIT_DIR="${path_systemdunit}" ++ fi + AC_SUBST(SYSTEMD_UNIT_DIR) + fi + diff --git a/sys-boot/plymouth/plymouth-0.9.2.ebuild b/sys-boot/plymouth/plymouth-0.9.2.ebuild new file mode 100644 index 000000000000..d41af507abb6 --- /dev/null +++ b/sys-boot/plymouth/plymouth-0.9.2.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.9.2.ebuild,v 1.1 2015/03/20 14:47:36 dlan Exp $ + +EAPI=5 + +SRC_URI=" + http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png" + +AUTOTOOLS_AUTORECONF="1" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth" + inherit git-r3 +else + SRC_URI="${SRC_URI} http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2" +fi + +inherit autotools-utils readme.gentoo systemd toolchain-funcs + +DESCRIPTION="Graphical boot animation (splash) and logger" +HOMEPAGE="http://cgit.freedesktop.org/plymouth/" + +LICENSE="GPL-2" +SLOT="0" +[[ ${PV} == 9999 ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug gdm +gtk +libkms +pango static-libs" + +CDEPEND=" + >=media-libs/libpng-1.2.16:= + gtk? ( + dev-libs/glib:2 + >=x11-libs/gtk+-3.14:3 + x11-libs/cairo ) + libkms? ( x11-libs/libdrm[libkms] ) + pango? ( >=x11-libs/pango-1.21 ) +" +DEPEND="${CDEPEND} + virtual/pkgconfig +" +# Block due bug #383067 +RDEPEND="${CDEPEND} + virtual/udev + !<sys-kernel/dracut-0.37-r3 +" + +DOC_CONTENTS=" + Follow the following instructions to set up Plymouth:\n + http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml +" + +PATCHES=( + "${FILESDIR}/0.9.2-systemdsystemunitdir.patch" +) + +src_prepare() { + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=( + --with-system-root-install=no + --localstatedir=/var + --without-rhgb-compat-link + --enable-systemd-integration + "$(systemd_with_unitdir)" + $(use_enable debug tracing) + $(use_enable gtk gtk) + $(use_enable libkms drm) + $(use_enable pango) + $(use_enable gdm gdm-transition) + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + insinto /usr/share/plymouth + newins "${DISTDIR}"/gentoo-logo.png bizcom.png + + # Install compatibility symlinks as some rdeps hardcode the paths + dosym /usr/bin/plymouth /bin/plymouth + dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme + dosym /usr/sbin/plymouthd /sbin/plymouthd + + readme.gentoo_create_doc + + # looks like make install create /var/run/plymouth + # this is not needed for systemd, same should hold for openrc + # so remove + rm -rf "${D}"/var/run +} + +pkg_postinst() { + readme.gentoo_print_elog + if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then + ewarn "If you want initramfs builder with plymouth support, please emerge" + ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]." + fi +} diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild index 11d6ce7427d0..3428ed871e5f 100644 --- a/sys-boot/plymouth/plymouth-9999.ebuild +++ b/sys-boot/plymouth/plymouth-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-9999.ebuild,v 1.1 2014/07/06 18:16:51 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-9999.ebuild,v 1.2 2015/03/20 14:47:36 dlan Exp $ EAPI=5 @@ -27,10 +27,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="debug gdm +gtk +libkms +pango static-libs" CDEPEND=" - >=media-libs/libpng-1.2.16 + >=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 - >=x11-libs/gtk+-2.12:2 + >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) |