diff options
| -rw-r--r-- | net-misc/networkmanager/Manifest | 5 | ||||
| -rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.7.1_rc2-as-needed.patch | 152 | ||||
| -rw-r--r-- | net-misc/networkmanager/networkmanager-0.7.1_rc3.ebuild (renamed from net-misc/networkmanager/networkmanager-0.7.1_rc2.ebuild) | 3 |
3 files changed, 3 insertions, 157 deletions
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 21496dd..44c7f9c 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,11 +1,10 @@ AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382fad56c7d8e21d4 SHA1 35706e9807e923732e3ac1db9c1e7d7a9f0bcc8f SHA256 ffd4fdf452a5791d938406d33b432aff591ab7e475583a66343a5c98ee6091af -AUX networkmanager-0.7.1_rc2-as-needed.patch 4708 RMD160 ef6df7c74e713a1a604dc70ad68e5f3929894c87 SHA1 7bbc58e8ce1cbab1dfa58568d5f1da7521abdc11 SHA256 e4b2b03911cb06061f5f54ac392d384305314c8c83c75ce47d90e7de99c40da1 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21 -DIST NetworkManager-0.7.0.98.tar.bz2 1203770 RMD160 824ac03c83694cc34a0b04971ca917e628722c18 SHA1 ea5ff81de6952e15bf8ef48083ec67abc6695da2 SHA256 1ec4d7fe0ef4da34b172a582dcf2c1968583c87b3557da4f18f4ab25cd27ca7d +DIST NetworkManager-0.7.0.99.tar.bz2 1220493 RMD160 895fc36fd0ab8fa4ba9973ce4a0567596712bae9 SHA1 0a6817eb273bf8e611fae38c43898bf3af1d4d25 SHA256 fc8fc0dcf75b48697e1b8dd7dd543b37be4cc1816b4b2ea1ff40defef0a7cf7f DIST NetworkManager-0.7.0.tar.bz2 1139665 RMD160 d727cf71fec20797fce7d75e75f9fbc7292e990e SHA1 c661e95867c0cb231d3ef3e911b285ebb1e02310 SHA256 281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659 DIST modem-manager-patches.tar.bz2 38126 RMD160 cad4501e43404890079018243fadeb86885a21f3 SHA1 13ee77388d0f510a069f9b68100d328d8e93cc0b SHA256 7d80d18a140ec2927559464bedba3c4e7a5da84a2bfc47dd9472cd15f82b4ca8 DIST networkmanager-patches1.tar.bz2 22756 RMD160 419b330ba9011040254043bb4f66a6b67823ab58 SHA1 168d62bfc0d59f54fae102f71f3bf48f49724ea3 SHA256 598fdf48716f147669f2ff7e30e8a9d8b382abaa0cefc006f0c9d83074ed9f01 EBUILD networkmanager-0.7.0-r2.ebuild 3999 RMD160 f1c74923dc71c2b187e8dedea8f376c7bd3bb704 SHA1 8b111230af016d2e0f6aeabaf9783cb041271f31 SHA256 69f2aed55416eb91aedd38a19f96c895f7bba8f35d3b954aa81e8d9a39c0840b -EBUILD networkmanager-0.7.1_rc2.ebuild 3895 RMD160 08342ab45740d92df9c1f241d241f6fdc628d5ab SHA1 b679fcbba07c8f4e13c8bc48ca9444fb68419575 SHA256 bf04b84c16a70181cc8c46d2f252cb44545e29f01df3c787279a36ec2f1cd112 +EBUILD networkmanager-0.7.1_rc3.ebuild 3852 RMD160 af82c365629844e8aa3c0add501147c46ba1f673 SHA1 4bf9ca488dbb286016080ed45393a1abf62bdfb4 SHA256 603b519262be2724f1ed549d5d9248bc40973bf9b0541015c6969bb95a4f638b EBUILD networkmanager-9999.ebuild 3811 RMD160 e5f4c6a0c55fce91c0d8f53548413048c23e0153 SHA1 cf8efdef173979c07df1ea48b61aa8bb668384ea SHA256 d3d4f45a9fc6c6988868052a3ba4a5d4f67c97234adc747771b94190e0146247 MISC metadata.xml 942 RMD160 d7fbb33279cb272b0e362a910b44398a893f6025 SHA1 e94ee026e4fe5701573f12afd0df09d3287c013f SHA256 7d34a1d393ce3d1a52f506abe55c226e5d5d25174198e0c04e2a3e20ce130c07 diff --git a/net-misc/networkmanager/files/networkmanager-0.7.1_rc2-as-needed.patch b/net-misc/networkmanager/files/networkmanager-0.7.1_rc2-as-needed.patch deleted file mode 100644 index 5e27829..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.7.1_rc2-as-needed.patch +++ /dev/null @@ -1,152 +0,0 @@ ---- system-settings/plugins/keyfile/tests/Makefile.am.orig 2009-02-27 17:04:25.000000000 +0000 -+++ system-settings/plugins/keyfile/tests/Makefile.am 2009-02-27 17:04:33.000000000 +0000 -@@ -19,9 +19,9 @@ - - test_keyfile_LDADD = \ - $(DBUS_LIBS) \ -+ $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ - $(top_builddir)/libnm-glib/libnm_glib.la \ -- $(top_builddir)/libnm-util/libnm-util.la \ -- $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la -+ $(top_builddir)/libnm-util/libnm-util.la - - if WITH_TESTS - ---- system-settings/plugins/keyfile/tests/Makefile.in.org 2009-02-27 17:23:47.000000000 +0000 -+++ system-settings/plugins/keyfile/tests/Makefile.in 2009-02-27 17:24:05.000000000 +0000 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.10.1 from Makefile.am. -+# Makefile.in generated by automake 1.10.2 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -47,9 +47,9 @@ - test_keyfile_OBJECTS = $(am_test_keyfile_OBJECTS) - am__DEPENDENCIES_1 = - test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ - $(top_builddir)/libnm-glib/libnm_glib.la \ -- $(top_builddir)/libnm-util/libnm-util.la \ -- $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la -+ $(top_builddir)/libnm-util/libnm-util.la - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -93,10 +93,6 @@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DATADIRNAME = @DATADIRNAME@ - DBUS_CFLAGS = @DBUS_CFLAGS@ -@@ -107,14 +103,14 @@ - DHCP_CLIENT = @DHCP_CLIENT@ - DHCP_CLIENT_PATH = @DHCP_CLIENT_PATH@ - DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ --ECHO = @ECHO@ -+DSYMUTIL = @DSYMUTIL@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GIO_CFLAGS = @GIO_CFLAGS@ - GIO_LIBS = @GIO_LIBS@ -@@ -162,6 +158,7 @@ - INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ - INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ - INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -@@ -173,6 +170,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@ - LIBUDEV_LIBS = @LIBUDEV_LIBS@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -@@ -182,9 +180,14 @@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ - MSGMERGE = @MSGMERGE@ -+NM = @NM@ -+NMEDIT = @NMEDIT@ - NSS_CFLAGS = @NSS_CFLAGS@ - NSS_LIBS = @NSS_LIBS@ -+OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -219,8 +222,7 @@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -251,6 +253,7 @@ - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -@@ -263,6 +266,7 @@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - SUBDIRS = keyfiles -@@ -283,9 +287,9 @@ - - test_keyfile_LDADD = \ - $(DBUS_LIBS) \ -+ $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \ - $(top_builddir)/libnm-glib/libnm_glib.la \ -- $(top_builddir)/libnm-util/libnm-util.la \ -- $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la -+ $(top_builddir)/libnm-util/libnm-util.la - - all: all-recursive - -@@ -295,8 +299,8 @@ - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ -+ && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ -@@ -458,7 +462,7 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS diff --git a/net-misc/networkmanager/networkmanager-0.7.1_rc2.ebuild b/net-misc/networkmanager/networkmanager-0.7.1_rc3.ebuild index 020cf77..aa0cebc 100644 --- a/net-misc/networkmanager/networkmanager-0.7.1_rc2.ebuild +++ b/net-misc/networkmanager/networkmanager-0.7.1_rc3.ebuild @@ -7,7 +7,7 @@ inherit eutils autotools # NetworkManager likes itself with capital letters MY_PN=${PN/networkmanager/NetworkManager} -MY_P=${MY_PN}-${PV/0.7.1_rc2/0.7.0.98} +MY_P=${MY_PN}-${PV/0.7.1_rc3/0.7.0.99} DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" @@ -58,7 +58,6 @@ src_prepare() { # Fix up the dbus conf file to use plugdev group epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch" - epatch "${FILESDIR}/${P}-as-needed.patch" # EPATCH_SOURCE="${WORKDIR}/modem-manager-patchset-0.7.1" # EPATCH_SUFFIX="patch" |