From 78e45800fbd6d021c556558c24ca785168881fb4 Mon Sep 17 00:00:00 2001 From: Joe McCann Date: Wed, 15 Mar 2006 01:46:41 +0000 Subject: [PATCH] New version for gnome-2.14 Package-Manager: portage-2.1_pre5-r4 --- gnome-base/gnome-session/ChangeLog | 10 +- gnome-base/gnome-session/Manifest | 42 ++++- .../files/digest-gnome-session-2.14.0 | 6 + ...session-2.12.0-optional-tcp-wrappers.patch | 165 ++++++++++++++++++ .../gnome-session-2.14.0-no_libnotify.patch | 27 +++ .../gnome-session/gnome-session-2.14.0.ebuild | 79 +++++++++ 6 files changed, 327 insertions(+), 2 deletions(-) create mode 100644 gnome-base/gnome-session/files/digest-gnome-session-2.14.0 create mode 100644 gnome-base/gnome-session/files/gnome-session-2.12.0-optional-tcp-wrappers.patch create mode 100644 gnome-base/gnome-session/files/gnome-session-2.14.0-no_libnotify.patch create mode 100644 gnome-base/gnome-session/gnome-session-2.14.0.ebuild diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog index b8a05e8f9a62..6a81810ae26d 100644 --- a/gnome-base/gnome-session/ChangeLog +++ b/gnome-base/gnome-session/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-base/gnome-session # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.130 2006/02/03 18:17:34 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.131 2006/03/15 01:46:41 joem Exp $ + +*gnome-session-2.14.0 (15 Mar 2006) + + 15 Mar 2006; Joe McCann + +files/gnome-session-2.12.0-optional-tcp-wrappers.patch, + +files/gnome-session-2.14.0-no_libnotify.patch, + +gnome-session-2.14.0.ebuild: + New version for gnome-2.14 03 Feb 2006; Guy Martin gnome-session-2.12.0.ebuild: Stable on hppa. diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index 522c0b80ba9d..a0e2b8cdc14e 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -1,14 +1,54 @@ -MD5 bef67ea24d65504efeffe9af3c115386 ChangeLog 17105 +MD5 a6a1c43403abc94f241464c020840b26 ChangeLog 17355 +RMD160 f4e97813780217ed6fe9872f84d5254dcf912606 ChangeLog 17355 +SHA256 3dd4f3c7c078ec7cfeb21c0bdf0af9cf4f45052f389e4678ad5ad57d7ef5db29 ChangeLog 17355 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464 +RMD160 07fe125890d825fdf95fe532aeec07c2718cf64e files/Gnome 2464 +SHA256 a1214ba383eb6dbd32b34eb89c7e00df08f9284b7a2b8a82f291cb29e865ba02 files/Gnome 2464 MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0 134 +RMD160 571eeb8fc032aac872e4beab1b0bcb575e5744ca files/digest-gnome-session-2.10.0 134 +SHA256 61508adc793a43f5b23d69ea91474dcadaf5e34ea14c5b58db949cd40a46467e files/digest-gnome-session-2.10.0 134 MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r3 134 +RMD160 571eeb8fc032aac872e4beab1b0bcb575e5744ca files/digest-gnome-session-2.10.0-r3 134 +SHA256 61508adc793a43f5b23d69ea91474dcadaf5e34ea14c5b58db949cd40a46467e files/digest-gnome-session-2.10.0-r3 134 MD5 7e346fe4be949355b491daf958c06d56 files/digest-gnome-session-2.12.0 302 +RMD160 31592cf43af274f85d7727e6bb7826e647634737 files/digest-gnome-session-2.12.0 302 +SHA256 c0c05adee8d922e152499a2839f7a501daa38279a81cd770a2c5c5531f22aa53 files/digest-gnome-session-2.12.0 302 +MD5 08af2a2d98501d0db1af578e91958d48 files/digest-gnome-session-2.14.0 494 +RMD160 63d173cf06c80e06730186be10427006521bb67d files/digest-gnome-session-2.14.0 494 +SHA256 d6d3736541d99e4be7386cd4de8eac17cab9888f0f38cfda07c6f20bb7309145 files/digest-gnome-session-2.14.0 494 MD5 ef9c116121d03af45e5f6f00050da2d6 files/gnome-session-2.10.0-esd_switch.patch 1910 +RMD160 870e8e80ac52522ced619f18f262f81f5ee3ba8a files/gnome-session-2.10.0-esd_switch.patch 1910 +SHA256 25e41851fe5a80a7b61d0cc736492d7000a06cceddfc6b000f30e0d52027fe97 files/gnome-session-2.10.0-esd_switch.patch 1910 MD5 b3685e6ab1ec8736038735270ae11fb5 files/gnome-session-2.10.0-no_smproxy.patch 2103 +RMD160 d8c861ad408bf8ef53d4d8ac31eccd9b6edd25d9 files/gnome-session-2.10.0-no_smproxy.patch 2103 +SHA256 5d92d48cb40e4bf11a5eced31d59e102cc0e2b116c5c053ea263a3ec44ac4c25 files/gnome-session-2.10.0-no_smproxy.patch 2103 MD5 1472ffe4555c4aab66d8359a4031544d files/gnome-session-2.10.0-schema_defaults.patch 648 +RMD160 001a568191b6b95d3376f0f63af9cf8d67cd6604 files/gnome-session-2.10.0-schema_defaults.patch 648 +SHA256 96c458d9cbfa62a40f1ba2c1f795b761bb0289694866b03b04a31108268535d8 files/gnome-session-2.10.0-schema_defaults.patch 648 +MD5 d5ebc973517e1101a55b9e51f60dfae0 files/gnome-session-2.12.0-optional-tcp-wrappers.patch 5759 +RMD160 4848ed4e7016f359ee7d6c0d98d6071ed96e407a files/gnome-session-2.12.0-optional-tcp-wrappers.patch 5759 +SHA256 14f6dd6df875476902801e1de121a84d8c89cbb8ea109511c7f3e8c671e390c3 files/gnome-session-2.12.0-optional-tcp-wrappers.patch 5759 +MD5 9d2dced7d4f7bad481996be5eb94eb10 files/gnome-session-2.14.0-no_libnotify.patch 782 +RMD160 81f1222e31740cf20332d731702e53391ab3c104 files/gnome-session-2.14.0-no_libnotify.patch 782 +SHA256 837bd0ba7214d62c0ed5c6adf456c4dadf108b05688efb29b5dcf9699f39797d files/gnome-session-2.14.0-no_libnotify.patch 782 MD5 9c41a7c69837eba927f8d546d3c13b8d files/gnome-session-2.6-schema_defaults.patch 1484 +RMD160 25a96a56a0ee2ea3c17c64cb8f91c92ec789edfb files/gnome-session-2.6-schema_defaults.patch 1484 +SHA256 59997fe69ae6ef6933bc593936e02bec461ef5abf04b54d5248464c02fec1b9d files/gnome-session-2.6-schema_defaults.patch 1484 MD5 b6e2c49cdafa0d5d8fe9ab4e28f5fc3d files/gnome-session-2.8.1-hide_splash.patch 1469 +RMD160 b5a99ee67756cc42a2d45feeb5d7c04e0caa870a files/gnome-session-2.8.1-hide_splash.patch 1469 +SHA256 af5aa5cc34af2952f3b3c82a1e9ebaf189ec894d3345f9286e1d7c99a74b3e63 files/gnome-session-2.8.1-hide_splash.patch 1469 MD5 56aa74472b71a3a0189ff2ea99acd943 gnome-session-2.10.0-r3.ebuild 2124 +RMD160 48d19c71b4213693428c16a22b1a30560e2d653e gnome-session-2.10.0-r3.ebuild 2124 +SHA256 fa3c482a4f4443c4f40d43fff5213261f6e3724413b722045c51bfe3765857af gnome-session-2.10.0-r3.ebuild 2124 MD5 4499ec98ae9a50f5de83b8ce43411a80 gnome-session-2.10.0.ebuild 1586 +RMD160 982763e2dadae92b6b4ad8062acca5aa44e881a8 gnome-session-2.10.0.ebuild 1586 +SHA256 8248f0b4e7abeb93883378ccde059281bd9967c5430e01b83e878dd000bacd7f gnome-session-2.10.0.ebuild 1586 MD5 0a98b57bc02653aed9053602f513fab3 gnome-session-2.12.0.ebuild 1967 +RMD160 98103228a6a9cb90cace252c724c204a96e62929 gnome-session-2.12.0.ebuild 1967 +SHA256 5923e4c4fa00db4b2069baf8a67ea4853eaca66c27426c4a46c896bb06228014 gnome-session-2.12.0.ebuild 1967 +MD5 92fa88ede443f9e068a15365fe49839e gnome-session-2.14.0.ebuild 2353 +RMD160 ad24b5e7da28dd18b3868eb2b569612947d0e961 gnome-session-2.14.0.ebuild 2353 +SHA256 1d73f50599f0477dac4632b08129661a112554fd60c476d0c567eca8eaf80fcd gnome-session-2.14.0.ebuild 2353 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 +SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158 diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.14.0 b/gnome-base/gnome-session/files/digest-gnome-session-2.14.0 new file mode 100644 index 000000000000..fdc3be146605 --- /dev/null +++ b/gnome-base/gnome-session/files/digest-gnome-session-2.14.0 @@ -0,0 +1,6 @@ +MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064 +RMD160 e75052892920e1c919aae1f6e53853c27b2e063f gentoo-splash.png 78064 +SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179 gentoo-splash.png 78064 +MD5 def891553bda47cd660be80cf09fe0ee gnome-session-2.14.0.tar.bz2 652379 +RMD160 6082b9bd9ba84be849bcd365635e8f0733d4d6e3 gnome-session-2.14.0.tar.bz2 652379 +SHA256 08f5605dd33a56833b0b9db52ae120d8e950e676550e70bdf839ccc26b345187 gnome-session-2.14.0.tar.bz2 652379 diff --git a/gnome-base/gnome-session/files/gnome-session-2.12.0-optional-tcp-wrappers.patch b/gnome-base/gnome-session/files/gnome-session-2.12.0-optional-tcp-wrappers.patch new file mode 100644 index 000000000000..70e3842d9b49 --- /dev/null +++ b/gnome-base/gnome-session/files/gnome-session-2.12.0-optional-tcp-wrappers.patch @@ -0,0 +1,165 @@ +--- configure.in.orig 2006-01-05 18:39:53.000000000 -0600 ++++ configure.in 2006-01-05 18:59:19.000000000 -0600 +@@ -190,80 +190,89 @@ + dnl ------------------- + dnl | Use TCP Wrappers? |-------------------------------------- + dnl ------------------- +-AC_MSG_CHECKING(whether to use TCP wrappers) +-LIBWRAP_PATH="" +-for I in $LDFLAGS $LIBS -L/usr/lib -L/usr/local/lib; do +- case "$I" in +- -L*) +- THEFILE="`echo $I | sed -e 's,^-L,,'`" +- echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5 +- if test -f $THEFILE/libwrap.a; then +- LIBWRAP_PATH="$THEFILE" +- echo "Found in $LIBWRAP_PATH" 1>&5 +- break +- fi +- esac +-done +-if test -n "$LIBWRAP_PATH"; then +- AC_MSG_RESULT(yes) +-else +- AC_MSG_RESULT(no) ++AC_ARG_ENABLE(tcp-wrappers, ++ AC_HELP_STRING([--disable-tcp-wrappers],[disable tcp wrapper support]),, ++ [enable_tcp_wrappers=yes]) ++ ++if test x$enable_tcp_wrappers = xyes ; then ++ AC_MSG_CHECKING(for TCP wrappers) ++ LIBWRAP_PATH="" ++ for I in $LDFLAGS $LIBS -L/usr/lib -L/usr/local/lib; do ++ case "$I" in ++ -L*) ++ THEFILE="`echo $I | sed -e 's,^-L,,'`" ++ echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5 ++ if test -f $THEFILE/libwrap.a; then ++ LIBWRAP_PATH="$THEFILE" ++ echo "Found in $LIBWRAP_PATH" 1>&5 ++ break ++ fi ++ esac ++ done ++ ++ if test -n "$LIBWRAP_PATH"; then ++ AC_MSG_RESULT(yes) ++ else ++ AC_MSG_ERROR("libwrap not found!") ++ fi ++ ++ nm $LIBWRAP_PATH/libwrap.* | grep 'T setenv' && LIBWRAP_PATH="" ++ if test -z "$LIBWRAP_PATH"; then ++ echo "*********************************************************" ++ echo " You have a broken TCP wrappers library (setenv included)" ++ echo " Please get the latest TCP wrappers package from your OS" ++ echo " vendor, or recompile TCP wrappers to not include a" ++ echo " setenv() implementation." ++ echo ++ echo "Not using TCP wrappers after all." ++ echo "*********************************************************" ++ fi ++ ++ dnl We need the header files too! ++ if test "$ac_cv_header_syslog_h" != yes || test "$ac_cv_header_tcpd_h" != yes; then ++ echo "Resetting $LIBWRAP_PATH because syslog is $ac_cv_header_syslog_h and tcpd is $ac_cv_header_tcpd_h" 1>&5 ++ LIBWRAP_PATH="" ++ fi ++ ++ dnl find out if we need -lnsl or whatever ++ LIBWRAP_NSL= ++ if test -n "$LIBWRAP_PATH"; then ++ AC_MSG_CHECKING(whether -lwrap requires -lnsl) ++ ORIG_LIBS="$LIBS" ++ LIBS="-L$LIBWRAP_PATH -lwrap $LIBS" ++ AC_TRY_LINK([ ++ extern int hosts_access; ++ int allow_severity, deny_severity; ++ ], ++ [return hosts_access;],,[ ++ dnl try with -lnsl ++ OLD_LIBS="$LIBS" ++ LIBS="$LIBS -lnsl" ++ AC_TRY_LINK([ ++ extern int hosts_access; ++ int allow_severity, deny_severity; ++ ], ++ [return hosts_access;], ++ LIBWRAP_NSL="-lnsl", ++ LIBWRAP_PATH="") ++ LIBS="$OLD_LIBS" ++ ]) ++ LIBS="$ORIG_LIBS" ++ if test -n "$LIB_NSL"; then ++ AC_MSG_RESULT(yes) ++ LIBS="$LIBS $LIB_NSL" ++ else ++ AC_MSG_RESULT(no) ++ fi ++ fi ++ ++ LIBWRAP_LIBS= ++ if test -n "$LIBWRAP_PATH"; then ++ LIBWRAP_LIBS="-L$LIBWRAP_PATH -lwrap $LIBWRAP_NSL" ++ AC_DEFINE(HAVE_HOSTS_ACCESS, 1, [Define to true if host_access exists]) ++ fi ++ AC_SUBST(LIBWRAP_LIBS) + fi +- +-if test -n "$LIBWRAP_PATH"; then +- nm $LIBWRAP_PATH/libwrap.* | grep 'T setenv' && LIBWRAP_PATH="" +- if test -z "$LIBWRAP_PATH"; then +- echo "*********************************************************" +- echo " You have a broken TCP wrappers library (setenv included)" +- echo " Please get the latest TCP wrappers package from your OS" +- echo " vendor, or recompile TCP wrappers to not include a" +- echo " setenv() implementation." +- echo +- echo "Not using TCP wrappers after all." +- echo "*********************************************************" +- fi +-fi +-dnl We need the header files too! +-if test "$ac_cv_header_syslog_h" != yes || test "$ac_cv_header_tcpd_h" != yes; then +- echo "Resetting $LIBWRAP_PATH because syslog is $ac_cv_header_syslog_h and tcpd is $ac_cv_header_tcpd_h" 1>&5 +- LIBWRAP_PATH="" +-fi +- +-dnl find out if we need -lnsl or whatever +-LIBWRAP_NSL= +-if test -n "$LIBWRAP_PATH"; then +- AC_MSG_CHECKING(whether -lwrap requires -lnsl) +- ORIG_LIBS="$LIBS" +- LIBS="-L$LIBWRAP_PATH -lwrap $LIBS" +- AC_TRY_LINK([ +-extern int hosts_access; +-int allow_severity, deny_severity; +-], [return hosts_access;], ,[ +-dnl try with -lnsl +-OLD_LIBS="$LIBS" +-LIBS="$LIBS -lnsl" +-AC_TRY_LINK([ +-extern int hosts_access; +-int allow_severity, deny_severity; +-], [return hosts_access;], LIBWRAP_NSL="-lnsl", +-LIBWRAP_PATH="") +-LIBS="$OLD_LIBS" +-]) +- LIBS="$ORIG_LIBS" +-if test -n "$LIB_NSL"; then +- AC_MSG_RESULT(yes) +- LIBS="$LIBS $LIB_NSL" +-else +- AC_MSG_RESULT(no) +-fi +-fi +-LIBWRAP_LIBS= +-if test -n "$LIBWRAP_PATH"; then +- LIBWRAP_LIBS="-L$LIBWRAP_PATH -lwrap $LIBWRAP_NSL" +- AC_DEFINE(HAVE_HOSTS_ACCESS, 1, +- [Define to true if host_access exists]) +-fi +-AC_SUBST(LIBWRAP_LIBS) + dnl ----------------------------------------------------------- + + diff --git a/gnome-base/gnome-session/files/gnome-session-2.14.0-no_libnotify.patch b/gnome-base/gnome-session/files/gnome-session-2.14.0-no_libnotify.patch new file mode 100644 index 000000000000..7ab766393bd8 --- /dev/null +++ b/gnome-base/gnome-session/files/gnome-session-2.14.0-no_libnotify.patch @@ -0,0 +1,27 @@ +--- configure.in.orig 2006-03-14 20:01:25.000000000 -0500 ++++ configure.in 2006-03-14 20:02:56.000000000 -0500 +@@ -84,24 +84,6 @@ + + PKG_CHECK_MODULES(GNOME_SESSION, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $ESOUND_MODULE gnome-desktop-2.0) + +-dnl Check if libnotify is present +- +-LIBNOTIFY_REQUIRED=0.2.1 +-LIBNOTIFY_CFLAGS= +-LIBNOTIFY_LIBS= +-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED, +- HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no") +- +-if test "x$HAVE_LIBNOTIFY" = "xyes"; then +- AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available]) +- AC_MSG_RESULT(available) +-else +- AC_MSG_RESULT(no) +-fi +- +-AC_SUBST(LIBNOTIFY_CFLAGS) +-AC_SUBST(LIBNOTIFY_LIBS) +- + dnl gconf checks + AC_PATH_PROG(GCONFTOOL, gconftool-2, no) + diff --git a/gnome-base/gnome-session/gnome-session-2.14.0.ebuild b/gnome-base/gnome-session/gnome-session-2.14.0.ebuild new file mode 100644 index 000000000000..19be032d1660 --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-2.14.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.14.0.ebuild,v 1.1 2006/03/15 01:46:41 joem Exp $ + +inherit eutils gnome2 + +DESCRIPTION="Gnome session manager" +HOMEPAGE="http://www.gnome.org/" +SRC_URI="${SRC_URI} + branding? ( mirror://gentoo/gentoo-splash.png )" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="branding esd ipv6 tcpd" + +RDEPEND=">=x11-libs/gtk+-2.3.1 + >=gnome-base/gconf-2 + >=gnome-base/libgnomeui-2.2 + =gnome-base/gnome-desktop-2* + gnome-base/gnome-keyring + esd? ( >=media-sound/esound-0.2.26 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" +DEPEND="${RDEPEND} + >=sys-devel/gettext-0.10.40 + >=dev-util/pkgconfig-0.17 + dev-util/intltool + !gnome-base/gnome-core" + +# gnome-base/gnome-core overwrite /usr/bin/gnome-session +DOCS="AUTHORS ChangeLog HACKING NEWS README" +USE_DESTDIR="1" + +pkg_setup() { + # TODO: convert libnotify to a configure option + G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd) $(use_enable tcpd tcp-wrappers)" +} + +src_unpack() { + unpack ${A} + cd ${S} + + # Patch for Gentoo Branding (bug #42687) + use branding && epatch ${FILESDIR}/${PN}-2.10.0-schema_defaults.patch + + # Patch for optionalizing tcp-wrappers + epatch ${FILESDIR}/${PN}-2.12.0-optional-tcp-wrappers.patch + + # Implement switch to enable/disable esound support. See bug #6920. + epatch ${FILESDIR}/${PN}-2.10.0-esd_switch.patch + + # Hide the splash after defaults have been loaded, a temp workaround + # for http://bugzilla.gnome.org/show_bug.cgi?id=116814 + epatch ${FILESDIR}/${PN}-2.8.1-hide_splash.patch + + #Remove libnotify autocheck so we don't link against it ever. Upstream + #hasn't decided on any notification standards yet so we don't want to + #support notification support at this time + epatch ${FILESDIR}/${P}-no_libnotify.patch + + export WANT_AUTOMAKE=1.9.6 + cp aclocal.m4 old_macros.m4 + aclocal -I . || die "aclocal failed" + autoconf || die "autoconf failed" + automake || die "automake failed" + libtoolize --copy --force +} + +src_install() { + gnome2_src_install + + dodir /etc/X11/Sessions + exeinto /etc/X11/Sessions + doexe ${FILESDIR}/Gnome + + # Our own splash for world domination + insinto /usr/share/pixmaps/splash/ + doins ${DISTDIR}/gentoo-splash.png +} -- 2.26.2