diff options
Diffstat (limited to 'x11-wm/awesome')
| -rw-r--r-- | x11-wm/awesome/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-wm/awesome/Manifest | 4 | ||||
| -rw-r--r-- | x11-wm/awesome/awesome-3.5_rc1-r1.ebuild (renamed from x11-wm/awesome/awesome-3.5_rc1.ebuild) | 21 |
3 files changed, 18 insertions, 16 deletions
diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog index 367ba969911a..2618c3f02053 100644 --- a/x11-wm/awesome/ChangeLog +++ b/x11-wm/awesome/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/awesome # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.139 2012/11/24 21:28:03 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.140 2012/11/28 00:20:30 robbat2 Exp $ + +*awesome-3.5_rc1-r1 (28 Nov 2012) + + 28 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> +awesome-3.5_rc1-r1.ebuild, + -awesome-3.5_rc1.ebuild: + Upstream added a new dep, lgi, that was underdocumented. Also block building + luadocs unless you have lua-5.2 per upstream emails on awesome ML. *awesome-3.5_rc1 (24 Nov 2012) diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest index 56969ebdabdc..8813cd7d174d 100644 --- a/x11-wm/awesome/Manifest +++ b/x11-wm/awesome/Manifest @@ -13,6 +13,6 @@ DIST awesome-3.4.13.tar.bz2 765638 SHA256 369334656b054e94a5e81d85f6484e6c6fe9fd DIST awesome-3.5-rc1.tar.xz 711840 SHA256 b63aa4672480382f591ac4cfc98a58f0169e8d31743182a37ac84f0ff99ef1c3 SHA512 955c77d901ca7c23f2193f8b7f7fa5a2b38128d7488d9aeb907ffad0717544362fb117c319ef5dd97d9cbed11a652c21bf0d23ec9275783ce75809ce2f0e899f WHIRLPOOL cac675fc8bd935088467eca348e0127dc3bf0fa82651ab0e6f2031f70e79ab936714175a904c0cb6444c04535cf6b4586c42c65ae2c41065dcbef4fa654872fa EBUILD awesome-3.4.11.ebuild 2737 SHA256 60430be3a096f2ce547fa0e79c40559b743dfeeee5a9681976138dafb0908240 SHA512 ae4576c8cabf0a3fbdae7c6cf717d94fb680f774be63a77f87d0b168ae102f9695d9f2510c0d9a132313cf50818ba4c8ea3420f38d85be4ad293a367d0a7d80a WHIRLPOOL cadd6d805c40d9f037923cf94c8fe4ca36f6edfc75a2c91cf8181177687cf3f43a56d712a072c3fa74a21076ba91eb161431c3fe2b3bd8fd27a96bcca046ee54 EBUILD awesome-3.4.13.ebuild 3075 SHA256 19bd33a25f18147bfbee24d833eef5bcf5d9278f8cdb4f6d8a97f457d5df7246 SHA512 469c5f4dc904201b8afbde394f9bb6492cb3596dcff3241256247da4ef8d5e9ee434096bffb9488ac9082442fb006f78ac0183bb9f4c874892e63ac86acadf1e WHIRLPOOL ed9cb365529127a914171f4fefa19aa5dd421c396b20cdbf5e71f6f21658ef6a70691a3dd3a34da9469eab07111c7be08e914fdc3bfc4511a1352876b57fae38 -EBUILD awesome-3.5_rc1.ebuild 3383 SHA256 c675f994f124fee9209e7a3b3cba03e3db6f6bcd4097f2f5acdd68bc0c78e9a6 SHA512 13a94f6b8fab59692603d3e3077a4de1a4eece4b588f7a0d05795b9b25f8241c3e90c382234f2585f012ee4a9310dcf8bb466e2ada2a3279fda1e89adcf5907e WHIRLPOOL 8ff0d15449fa91c06b2c8567ebae7596b96ac25130e57935fc4b7ff25e7039caa0250285b326a960d2163c399d8dedd43caebe0b70e0f33f009bc2bf04224f16 -MISC ChangeLog 21318 SHA256 0b94e9d5e3f226915b093390e04bbac3d9a3a1ea51e1d5921e7ea1698422b135 SHA512 abcdd4ec0b0073d1157c7d0ead48dd64cd2056a20c5a39abfc7b43700c32d523dc0f9337b3c9e8d1d53882c1c887cd4c177fbacc8c12f9e465633108f505a7d3 WHIRLPOOL 1c55a23af091741b4882e16e98f9c76e9e7faa098390e21e62ac1b030675b344d67a09b8ee09d1a4ffebedbebcd90eb52f0265a001ddfedc6786b279db3637d1 +EBUILD awesome-3.5_rc1-r1.ebuild 3310 SHA256 a9a55d06394bfa3c871d53d07f0cf1b0f3a03f5f467d890ac56786eb1770370f SHA512 07da6521d16e9e35e6b78d4b5236db08f35e816714b836c6ddf3306ab416f256cd6310ab22d5c4483b846a8e6384a537544bd57f85b6de8f179b952d84156a24 WHIRLPOOL 952900305ceb70a0d36ef1fb7ee87428bafb519d84fc11223123629d2d6329e9ba7cd949aa184d1c0b3517556d3ac81d1a19498269825a5f81666f0614391b94 +MISC ChangeLog 21610 SHA256 19693731e1866cfe44f51cc6f3265f71d2109f1dd219db707d333ff0622bf82e SHA512 fdde04898f2cab379aae6cca98cc41b810b92bfbc27295c3628832ee276b2bf6a46d76e0ff8404a7bc4176bec42c0e1bd60592a5efc6f88a0d24735aa614ef64 WHIRLPOOL 4688a49ce1f1bdb7119ded33d7bc83ee09b4db43542371216a08c3eb8df674457196c368d2211cc4290051ba55736b3a047e6882fffe9bac6724bed2eb796296 MISC metadata.xml 326 SHA256 4d23256553ae5f4f0e2b2ec2dc603fa7199160052eee9dbe58c61108afe4cd03 SHA512 1c6b5c561ac117a32b799c73b58fc115082e3205dd1f0432d2eb4c459eea73b6ef312e45f95ce05c9b95e2f9b71e228df05015d90f97fcabf8aea9936f6a409d WHIRLPOOL 1ef4575902be610459d78827f08c85cb641f9c7b287c89f690b7b2aa65a0fd828efe3983d2385d146be0256307564f078a8cfdb61297351e9b4a462a241d86f7 diff --git a/x11-wm/awesome/awesome-3.5_rc1.ebuild b/x11-wm/awesome/awesome-3.5_rc1-r1.ebuild index 48a448153e52..7ec19938a719 100644 --- a/x11-wm/awesome/awesome-3.5_rc1.ebuild +++ b/x11-wm/awesome/awesome-3.5_rc1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.5_rc1.ebuild,v 1.1 2012/11/24 21:28:03 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.5_rc1-r1.ebuild,v 1.1 2012/11/28 00:20:30 robbat2 Exp $ EAPI="3" CMAKE_MIN_VERSION="2.8" @@ -28,7 +28,8 @@ COMMON_DEPEND=">=dev-lang/lua-5.1 >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( dev-libs/libexecinfo ) + >=dev-lua/lgi-0.6.1" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${COMMON_DEPEND} @@ -81,14 +82,6 @@ src_prepare() { # bug #408025 epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch" - - # Fix luadoc build - epatch "${FILESDIR}/${PN}-3.5_rc1-luadoc-fix-patch" - - # Fix name of luadoc binary - sed -i \ - -e '/^a_find_program/{ /LDOC_EXECUTABLE/{ s/ldoc.lua/luadoc/; } }' \ - "${S}"/awesomeConfig.cmake || die } src_configure() { @@ -96,8 +89,11 @@ src_configure() { -DPREFIX="${EPREFIX}"/usr -DSYSCONFDIR="${EPREFIX}"/etc $(cmake-utils_use_with dbus DBUS) - $(cmake-utils_use doc GENERATE_LUADOC) ) + + # The lua docs now officially require ldoc.lua and NOT luadoc + # As the modules documentation has been updated to the Lua 5.2 style + has_version >=dev-lang/lua-5.2 && mycmakeargs+="$(cmake-utils_use doc GENERATE_LUADOC)" cmake-utils_src_configure } @@ -120,9 +116,8 @@ src_install() { mv html doxygen dohtml -r doxygen || die ) - mv "${ED}"/usr/share/doc/${PN}/doc/html "${ED}"/usr/share/doc/${PF}/html/luadoc || die fi - rm -rf "${ED}"/usr/share/doc/${PN} || die + rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed" exeinto /etc/X11/Sessions newexe "${FILESDIR}"/${PN}-session ${PN} || die |