From 38e49fd8b74263ba04302c1d35737f27f76f1dc2 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Wed, 10 Jun 2015 17:44:37 +0200 Subject: Move windowmaker live ebuild to main tree Add libmemcached dep in sogo, bug #551390 by xmw --- gnustep-apps/sogo/ChangeLog | 5 +- gnustep-apps/sogo/Manifest | 4 +- gnustep-apps/sogo/sogo-2.2.9a.ebuild | 3 +- metadata/md5-cache/gnustep-apps/sogo-2.2.9a | 8 +- metadata/md5-cache/gnustep-apps/thematic-9999 | 2 +- metadata/md5-cache/gnustep-libs/sope-2.2.9a | 2 +- .../md5-cache/x11-themes/gnustep-gtk-theme-9999 | 2 +- metadata/md5-cache/x11-wm/windowmaker-9999 | 12 --- x11-wm/windowmaker/ChangeLog | 35 ------- x11-wm/windowmaker/Manifest | 27 ----- x11-wm/windowmaker/files/wmaker.desktop | 8 -- x11-wm/windowmaker/metadata.xml | 12 --- x11-wm/windowmaker/windowmaker-9999.ebuild | 112 --------------------- 13 files changed, 15 insertions(+), 217 deletions(-) delete mode 100644 metadata/md5-cache/x11-wm/windowmaker-9999 delete mode 100644 x11-wm/windowmaker/ChangeLog delete mode 100644 x11-wm/windowmaker/Manifest delete mode 100644 x11-wm/windowmaker/files/wmaker.desktop delete mode 100644 x11-wm/windowmaker/metadata.xml delete mode 100644 x11-wm/windowmaker/windowmaker-9999.ebuild diff --git a/gnustep-apps/sogo/ChangeLog b/gnustep-apps/sogo/ChangeLog index ffd9e0b..7961074 100644 --- a/gnustep-apps/sogo/ChangeLog +++ b/gnustep-apps/sogo/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for gnustep-apps/sogo -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Jun 2015; Bernard Cafarelli sogo-2.2.9a.ebuild: + sogo also needs libmemcached, thanks xmw in bug #551390 + *sogo-2.1.1b (04 Feb 2014) 04 Feb 2014; Bernard Cafarelli -sogo-1.1.0-r1.ebuild, diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest index 11ea335..1910bba 100644 --- a/gnustep-apps/sogo/Manifest +++ b/gnustep-apps/sogo/Manifest @@ -1,6 +1,6 @@ AUX sogod.confd 117 SHA256 a556b2501155ebb9e2bd57fe8b32011ebca67530b4908d1cb0f87473ba80803a SHA512 d93bde8c500bf8452d5f32efc35ec12f436afc498d7cc6ac1f55769f8696c9b41cc5edec829a19ea01b24c0d3a2c7901fc797cb04ced371bc8e0c3e6e243f15b WHIRLPOOL 189dc32b8fa8f7ef2dbdec29515423ce4771ea18f1b3d539a85bb5e9b7148e26b2d37fd089ccccd4646793eaded6a01d43f2674fc98bd9537bc7b72053ec1355 AUX sogod.initd 693 SHA256 8987a106aae104d06b326a0db513a091fe1e2195e74050b70851bf450317254b SHA512 2ccf28bfa4f591532a289277659b9ee0240bc1dc338ac7e884acc24633cfb8a3a36b873cdce09bfacb5da20973dc45821b700eba60f5d5fe8c2eaddcddb7d8cf WHIRLPOOL 537ebb512940dcae7827a1baae38e67841eb680121eb11ca0538d55e3a8f06250be3d8bd95c5b5887c183799427d21de5eed9a6d95e306aabaf4475beb169f35 DIST SOGo-2.2.9a.tar.gz 11535574 SHA256 02ff02ff0b509981049e14f4fc2f2d4d9e5cb62a53e65145fd41ab653d262e46 SHA512 e618b1b4f0b3f374abd9ec5d18bd3f4252c5642beb8a7c81cc380df5508919dad9a9dbf9de3f55a12ae9d5e603388e9a148e5d01ae41f4599aa8c82ce016d67a WHIRLPOOL 710b8f3ad273aa2f3a8c898edc12cbf9ff8d0ab6c227e793e4842a376358ebd86651625f277d66267de330c9f7f60db7222fd54442692f3d851bd40b4a0ef117 -EBUILD sogo-2.2.9a.ebuild 1662 SHA256 2140ee19729f64a842c8322c55738f2bfa734adb14a88a0ba203130a472330c0 SHA512 357507529788cc8d0e388850c810df5d356f7fb5bd665191fc9a7517673c2293f9f4f45a04055aa25ab6c89445e803a0eee72f1118cdc55c93f59e87fbdd9cba WHIRLPOOL 4e4470606350560fbbc3f6f1524a05f04c3a57fabed28db01dea2bd72d77c62d33943805b3346db19f814fd6fb84229546d584ace1790ef744e3d79b6deb0c7e -MISC ChangeLog 1237 SHA256 c421b1a148701d1443fbb99309d5dc3f1029e5ce7cc3f0121df28050acabcc1d SHA512 a9a558bf53886230ad4ee742bd22a903f8f78939f1f09f11056ffb5473c738ef19641d0c6f4b16ba0636eab7f6261c6f192481509e8ca052b0e16d800b1256cd WHIRLPOOL 02e52b074e9786b174a4145778c3a5f9285a0b897e7747f30b831144a251b567866a52c141edc93fd80bec5ac529f47703a58f31461a4e4795c333650b0fcf7c +EBUILD sogo-2.2.9a.ebuild 1685 SHA256 04087d7f8b9ef19d6e18dba8d7de0e3949b4fef6b7b6a1fb37cb9f2809c9e7a6 SHA512 fad7539a2cf1402277991c97f2e5723d5b83b512e1575b4314ff1752790549bfe41c4534fc62990401d16e9d0eb04cc31edae67e0480077b31d327721a73af56 WHIRLPOOL 8c967a8240f4eb774fe3d14d5cb4e7f93d8ca4673920a68090bc77dae7b1f969c87367001b82417fd6e9a5f88afeaec97767c04759e56c922e0d293f767531cf +MISC ChangeLog 1371 SHA256 f03dcb18d22115f1a8af19c1c2b539f74f392dd4d8b9e70f985e41c77e01204d SHA512 0be1c0075dffd76f6af09525c5d882416aafa685aecd9eadf2966d3adba7ad3885833872a1d85f8cd86e04e4f80f1b58e7b9c2f410f5e5b7ab8f33374e26a919 WHIRLPOOL 741e48e5381b9e052bdddc539f8ba30324367954989f570777c4d368446a48df920c4ab5bb87985a0c69b0aa3209dd2abe1eea4b0369a4ee6d066568f1dbc808 MISC metadata.xml 693 SHA256 d1322d6e93af0ad7673b6afb5c174e28b6a136f37147608a215c40d16f66782c SHA512 d7ae27144c9128e80c43c91a24ce93039d85e60c249e03b27e862543622b2f87941c1f840b13e63e4efa9f3dd3124432f847459e9a4d93a8ea885672337d5bad WHIRLPOOL baef07409968607dee6e3a5071e3b6ae12d6f4179439143e8c6b9d1cdb721b6ce08a7023d8e2b7d646977409cd0e0feca65c35b6a30c5ec52edf910dfd5db63c diff --git a/gnustep-apps/sogo/sogo-2.2.9a.ebuild b/gnustep-apps/sogo/sogo-2.2.9a.ebuild index 88eeb1c..2ab32b7 100644 --- a/gnustep-apps/sogo/sogo-2.2.9a.ebuild +++ b/gnustep-apps/sogo/sogo-2.2.9a.ebuild @@ -17,7 +17,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="postgres mysql" -DEPEND="dev-libs/openssl:0= +DEPEND="dev-libs/libmemcached + dev-libs/openssl:0= >=gnustep-libs/sope-${PV}[mysql?,postgres?] net-misc/memcached net-nds/openldap" diff --git a/metadata/md5-cache/gnustep-apps/sogo-2.2.9a b/metadata/md5-cache/gnustep-apps/sogo-2.2.9a index e76a48d..cd7c33b 100644 --- a/metadata/md5-cache/gnustep-apps/sogo-2.2.9a +++ b/metadata/md5-cache/gnustep-apps/sogo-2.2.9a @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install postinst prepare setup -DEPEND=dev-libs/openssl:0= >=gnustep-libs/sope-2.2.9a[mysql?,postgres?] net-misc/memcached net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back +DEPEND=dev-libs/libmemcached dev-libs/openssl:0= >=gnustep-libs/sope-2.2.9a[mysql?,postgres?] net-misc/memcached net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back DESCRIPTION=Groupware server built around OpenGroupware.org and the SOPE application server EAPI=5 HOMEPAGE=http://www.sogo.nu IUSE=postgres mysql debug doc KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 -RDEPEND=dev-libs/openssl:0= >=gnustep-libs/sope-2.2.9a[mysql?,postgres?] net-misc/memcached net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=gnustep-libs/sope-2.2.9a[mysql?,postgres?] net-misc/memcached net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) imagemagick? ( media-gfx/imagemagick ) jpeg? ( virtual/jpeg:0= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1 -DESCRIPTION=The fast and light GNUstep window manager -EAPI=5 -HOMEPAGE=http://www.windowmaker.org/ -IUSE=gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr -LICENSE=GPL-2 -RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) imagemagick? ( media-gfx/imagemagick ) jpeg? ( virtual/jpeg:0= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 ) -SLOT=0 -SRC_URI=http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz -_eclasses_=autotools b49fe68f65ef8b751164926d42b30e60 eutils 9fb270e417e0e83d64ca52586c4a79de git-r3 3a2bd0ae504c33a50061885480f3def3 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 -_md5_=85dd5b8a9e7701f31f1e9af3b1ab86e7 diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog deleted file mode 100644 index 2a7f6b7..0000000 --- a/x11-wm/windowmaker/ChangeLog +++ /dev/null @@ -1,35 +0,0 @@ -# ChangeLog for x11-wm/windowmaker -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 27 May 2015; Bernard Cafarelli windowmaker-9999.ebuild: - Sync with current stable ebuild, switch to git-r3 and use upstream next - branch - - 13 Nov 2014; Bernard Cafarelli windowmaker-9999.ebuild: - Sync with current stable ebuild - - 10 Feb 2012; Bernard Cafarelli windowmaker-9999.ebuild: - Fix paths in generated menus and sed lines to evaluate EPREFIX - -*windowmaker-9999 (10 Feb 2012) - - 10 Feb 2012; Bernard Cafarelli - +windowmaker-9999.ebuild, +metadata.xml: - Rename crm to windowmaker, as this is the official version now - - 10 Feb 2012; Bernard Cafarelli - windowmaker-crm-9999.ebuild, metadata.xml: - Update live ebuild from main tree 0.95.1 - - 21 Apr 2011; Bernard Cafarelli - windowmaker-crm-9999.ebuild: - Use FHS layout for WPrefs, to keep in sync with the new default gnustep - layout - -*windowmaker-crm-9999 (01 Apr 2011) - - 01 Apr 2011; Bernard Cafarelli - +windowmaker-crm-9999.ebuild, +files/wmaker.desktop, +metadata.xml: - First version, based on cleaned windowmaker ebuild - diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest deleted file mode 100644 index 5d7bb43..0000000 --- a/x11-wm/windowmaker/Manifest +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX wmaker.desktop 221 SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 SHA512 1c1b24001e47a2af8f18a5f90675d095ba7f929ad9273ca82f61fd13ad35ff22dc9b777eec24fc3fd984790a5d494949d1dd5e0ca39780920017ea7971a3289d WHIRLPOOL 68ea31480ba1796e4243184deff38270963841c2bdb54bc85a606ecad0cdccc6815b11fa67158cbcc527ae3a17488b97a209283289922323ed42ea37a062ac2b -DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034 -EBUILD windowmaker-9999.ebuild 2814 SHA256 743721054f418cb18b325944f072fa79ead7831e2eb5732e55fc5d679269662c SHA512 7564d4929d1ce416b62c258ae8ec64e6c22c76a15d43f2fd9f2602c3db43005dcdf2b73c9c5174f9beb9db3b1c43c137fd377beef35be9132bddd3626fee9e4f WHIRLPOOL 0b4ed8f4f3ada3eba976c63adf3a98b7a5a31d6ab54a1fdf040086ef379578d50187155e8f1b16d10e8b1f818dc1401ee41eb6649667f616e94476a695cc7fc7 -MISC ChangeLog 1271 SHA256 ae2db52aef58d2510d639840bf3e513cf3d74acb035c5aedda2580d3b54361e5 SHA512 8f558b459fb522024d904da2deaa976756b1799bbdf25ff3cb489ab86433afebe7afb53dd64e22ddd1aacfce1434ca3a1c7270636cf0549cf39ff271d4b2e4eb WHIRLPOOL e27a0c54af628c9f13cb82368a05f550fa53a15f2b3c135ec8c6134d22e4be8452dc64c424060aa093bf9033472e00e162204037f70514816d2d8896c7be0054 -MISC metadata.xml 491 SHA256 adf20a574ac6c90560edc4581473bd340fe1002ac26d642199878d1fe39f9b70 SHA512 172a00ac05dcb64e3aa08c553f8e22d475f88541263fe139db3e486a96efa079aab82e8832f53d7d83039a12187b9094585c1e944f6a9af7bf82a1c8044d1e40 WHIRLPOOL 656c4648b292d58f8590d4a5c456ced8b52cf389253a42c2240add03a336e23a571f792275968dd20a131aaab0a30ed918a5849157dc5a9611204ebc4216af73 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.1 - -iQJ8BAEBCABmBQJVZctOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw -MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/9PgQAMJDiXHFaVsyyQJlvxv5oTnT -zhKHLvqB9bUqpQmjkziemh4wbevgZGrew2dJ7pGnv3UyYVDynXIVq+Q0zD3u15Dk -edDqrRV0NKTbyv60vT4Cpcgc22Ysy9u7HjEdd6L+dz+9hBVrW6qUKyPFh/Be+o14 -WB3PctDUB9O8rlv9kJby+jpzA6cyWjicDsYHt5Qe0AfNxckuU2ctJfo/Pjz1GHT+ -6/Zv6QXTFsnY3o5iPXcy4Jq2ETKzZjQRWK4pS1xj8DWPeLLW9c9gjS3Ui9YcS+VZ -7dtj7iiPNfvXcyjOJQSq6OboklDv95ltC91kUizkmr+FsvZtac2Edwr0GaWFqMsX -V2U1rTa3RLtPoWgHrF+msPjdvztzVKejp+6L0nUSzoDeCNnyCVnbIbu6+dEULs6b -YYWTPVvzSsW2Rdvi5uTxFZ5taEDinzm5RdOK74gNwL5SvBYUx9EZ7XUATlGJMwx7 -lGFBlzoy6kHrbRyYGc7EOqxyc9R4kRG47xqnLlVgPRVyMUNK93Vh9NUI8ON+/NcQ -+H5gyYGWs0UBdibAcM1TFOayZ88aLxaxLAeMKp2sLYIlPRP+Fukaq5v2HEwt3fog -9I9z2yJj0DLFcenG5tcL/eqbhvbJ8cJFUkMszHfBtnbShr3F4q5q4Jy1jmknd4mt -iYG9fFN2VUlO01/LyOUn -=nYmn ------END PGP SIGNATURE----- diff --git a/x11-wm/windowmaker/files/wmaker.desktop b/x11-wm/windowmaker/files/wmaker.desktop deleted file mode 100644 index 1bda476..0000000 --- a/x11-wm/windowmaker/files/wmaker.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -# The names/descriptions should really be better -Name=GNUStep WindowMaker -Comment=Use this session to run WindowMaker as your desktop environment -Exec=/usr/bin/wmaker -Icon= -Type=Application diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml deleted file mode 100644 index a30c77d..0000000 --- a/x11-wm/windowmaker/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - gnustep - - Enable XKB language status lock support. README - says: "If you don't know what it is you probably don't need - it." - Enable XRandR window extension support - Enables WebP image format support using media-libs/libwebp - - diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild deleted file mode 100644 index 0e25ecd..0000000 --- a/x11-wm/windowmaker/windowmaker-9999.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit autotools eutils git-r3 - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/" -SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" -EGIT_REPO_URI="git://repo.or.cz/wmaker-crm.git" -EGIT_BRANCH="next" - -SLOT="0" -LICENSE="GPL-2" -IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" -KEYWORDS="" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) - imagemagick? ( media-gfx/imagemagick ) - jpeg? ( virtual/jpeg:0= ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - webp? ( media-libs/libwebp ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -src_unpack() { - # wm-extras - unpack ${A} - - git-r3_src_unpack -} - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die - sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - fi; - done; - - eautoreconf -} - -src_configure() { - local myconf - - # image format types - myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)" - - # non required X capabilities - myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --localedir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} -- cgit v1.2.3-65-gdbad